From fc018bab47886d487604e3a7e8eba4ce0de07133 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 23 Aug 2007 17:03:17 +0000 Subject: [PATCH] plugin-defs.mk: Add USE_PLUGIN_VERSION_LIB Make linkage of plugin against plugin version lib depend on $(USE_PLUGIN_VERSION_LIB) = true. This is the default. --- make/plugin-defs.mk | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/make/plugin-defs.mk b/make/plugin-defs.mk index 86851c95..e2015aed 100644 --- a/make/plugin-defs.mk +++ b/make/plugin-defs.mk @@ -1,21 +1,25 @@ IS_PLUGIN = true +USE_PLUGIN_VERSION_LIB ?= true PLUGIN_API ?= $(notdir $(shell cd ..; pwd)) PLUGIN_NAME ?= $(notdir $(shell pwd)) PLUGIN_PREFIX ?= feedfs + ifneq ($(TARGET),mingw) PLUGIN_SUFFIX ?= so else PLUGIN_SUFFIX ?= dll endif -PLUGIN_VERSION_AND_API = $(PLUGIN_PREFIX)_$(PLUGIN_API) -PLUGIN_VERSION_LIB_BASENAME = $(PLUGIN_VERSION_AND_API)_version -PLUGIN ?= $(PLUGIN_VERSION_AND_API)_$(PLUGIN_NAME).$(PLUGIN_SUFFIX) - -PLUGIN_VERSION_LIB = $(BUILD_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a -INSTALLED_PLUGIN_VERSION_LIB = $(INSTALL_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a +PLUGIN_PREFIX_AND_API = $(PLUGIN_PREFIX)_$(PLUGIN_API) +PLUGIN ?= $(PLUGIN_PREFIX_AND_API)_$(PLUGIN_NAME).$(PLUGIN_SUFFIX) CFLAGS += -D PLUGIN_NAME_STR=\"$(PLUGIN_NAME)\" CPPFLAGS += -D PLUGIN_NAME_STR=\"$(PLUGIN_NAME)\" -PROJECT_LDFLAGS += -Wl,--whole-archive -l$(PLUGIN_VERSION_LIB_BASENAME) -Wl,--no-whole-archive + +ifeq ($(USE_PLUGIN_VERSION_LIB),true) +PLUGIN_VERSION_LIB_BASENAME = $(PLUGIN_PREFIX_AND_API)_version +PLUGIN_VERSION_LIB = $(BUILD_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a +#INSTALLED_PLUGIN_VERSION_LIB = $(INSTALL_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a +PROJECT_LDFLAGS += -Wl,--whole-archive -l$(PLUGIN_VERSION_LIB_BASENAME) -Wl,--no-whole-archive +endif