diff --git a/configure/CONFIG_ADDONS b/configure/CONFIG_ADDONS index f86b30185..ffa3b3665 100644 --- a/configure/CONFIG_ADDONS +++ b/configure/CONFIG_ADDONS @@ -53,11 +53,15 @@ # TESTPROD products to build # TESTPROD_HOST products to build # TESTPROD_IOC products to build -# LIBRARY products to build and install -# LIBRARY_HOST products to build and install -# LIBRARY_IOC products to build and install -# LOADABLE_LIBRARY module to build and install -# LOADABLE_LIBRARY_HOST module to build and install +# LIBRARY libraries to build and install +# LIBRARY_HOST libraries to build and install +# LIBRARY_IOC libraries to build and install +# TESTLIBRARY libraries to build +# TESTLIBRARY_HOST libraries to build +# TESTLIBRARY_IOC libraries to build +# LOADABLE_LIBRARY libraries to build and install +# LOADABLE_LIBRARY_HOST libraries to build and install +# LOADABLE_LIBRARY_IOC libraries to build and install # SCRIPTS scripts and install # SCRIPTS_HOST host system scripts to install # SCRIPTS_IOC ioc system scripts to install @@ -326,6 +330,30 @@ LIBRARY_HOST+=$(LIBRARY_HOST_DEFAULT) endif endif +ifneq ($(strip $(TESTLIBRARY_$(OS_CLASS))),) +TESTLIBRARY+=$(subst -nil-,,$(TESTLIBRARY_$(OS_CLASS))) +else +ifneq (,$(strip $(TESTLIBRARY_DEFAULT))) +TESTLIBRARY+=$(TESTLIBRARY_DEFAULT) +endif +endif + +ifneq ($(strip $(TESTLIBRARY_IOC_$(OS_CLASS))),) +TESTLIBRARY_IOC+=$(subst -nil-,,$(TESTLIBRARY_IOC_$(OS_CLASS))) +else +ifneq (,$(strip $(TESTLIBRARY_IOC_DEFAULT))) +TESTLIBRARY_IOC+=$(TESTLIBRARY_IOC_DEFAULT) +endif +endif + +ifneq ($(strip $(TESTLIBRARY_HOST_$(OS_CLASS))),) +TESTLIBRARY_HOST+=$(subst -nil-,,$(TESTLIBRARY_HOST_$(OS_CLASS))) +else +ifneq (,$(strip $(TESTLIBRARY_HOST_DEFAULT))) +TESTLIBRARY_HOST+=$(TESTLIBRARY_HOST_DEFAULT) +endif +endif + ifneq ($(strip $(LOADABLE_LIBRARY_$(OS_CLASS))),) LOADABLE_LIBRARY+=$(subst -nil-,,$(LOADABLE_LIBRARY_$(OS_CLASS))) else @@ -342,6 +370,14 @@ LOADABLE_LIBRARY_HOST+=$(LOADABLE_LIBRARY_HOST_DEFAULT) endif endif +ifneq ($(strip $(LOADABLE_LIBRARY_IOC_$(OS_CLASS))),) +LOADABLE_LIBRARY_IOC+=$(subst -nil-,,$(LOADABLE_LIBRARY_IOC_$(OS_CLASS))) +else +ifneq (,$(strip $(LOADABLE_LIBRARY_IOC_DEFAULT))) +LOADABLE_LIBRARY_IOC+=$(LOADABLE_LIBRARY_IOC_DEFAULT) +endif +endif + ifneq ($(strip $(PROD_LIBS_$(OS_CLASS))),) PROD_LIBS += $(subst -nil-,,$(PROD_LIBS_$(OS_CLASS))) else diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index 7ea90a944..5c14e4e0d 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -148,6 +148,7 @@ PRODNAME = $(addsuffix $(EXE),$(basename $(PROD))) TESTPRODNAME = $(addsuffix $(EXE),$(basename $(TESTPROD))) SHRLIBNAME = $(SHRLIBNAME_$(SHARED_LIBRARIES)) +TESTSHRLIBNAME = $(TESTSHRLIBNAME_$(SHARED_LIBRARIES)) JAVA = JAR = @@ -244,7 +245,7 @@ STATIC_LDLIBS = $(STATIC_LDLIBS_$(STATIC_BUILD)) #-------------------------------------------------- # cflags for shared library src files (from SHRLIB_CFLAGS) -LIBRARY_SRCS=$(basename $(foreach lib,$(LIBRARY) $(LOADABLE_LIBRARY),$($(lib)_OBJSNAME) $(LIBRARY_OBJS))) +LIBRARY_SRCS=$(basename $(foreach lib,$(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRARY),$($(lib)_OBJSNAME) $(LIBRARY_OBJS))) LIBRARY_SRC_CFLAGS=$($(patsubst $*,SHRLIB,$(findstring $*,$(LIBRARY_SRCS)))_CFLAGS) #-------------------------------------------------- @@ -335,7 +336,7 @@ HDEPENDS_CFLAGS = $(HDEPENDS_CFLAGS_$(HDEPENDS)) #-------------------------------------------------- # depends definition -TARGET_SRCS = $(foreach name, $(TESTPROD) $(PROD) $(LIBRARY), $($(name)_SRCS)) +TARGET_SRCS = $(foreach name, $(TESTPROD) $(PROD) $(TESTLIBRARY) $(LIBRARY), $($(name)_SRCS)) SRC_FILES = $(LIB_SRCS) $(LIBSRCS) $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(TARGET_SRCS) HDEPENDS_FILES_YES = $(addsuffix $(DEP),$(notdir $(basename $(SRC_FILES)))) HDEPENDS_FILES = $(if $(filter NO,$(HDEPENDS)),,$(HDEPENDS_FILES_YES)) diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index 911587025..f6c2521b8 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -42,15 +42,18 @@ LOADABLE_LIBRARY += $(LOADABLE_LIBRARY_HOST) OBJS += $(OBJS_HOST) PROD += $(PROD_HOST) SCRIPTS += $(SCRIPTS_HOST) +TESTLIBRARY += $(TESTLIBRARY_HOST) TESTSCRIPTS += $(TESTSCRIPTS_HOST) TESTPROD += $(TESTPROD_HOST) endif ifeq ($(findstring Ioc,$(VALID_BUILDS)),Ioc) LIBRARY += $(LIBRARY_IOC) +LOADABLE_LIBRARY += $(LOADABLE_LIBRARY_IOC) OBJS += $(OBJS_IOC) PROD += $(PROD_IOC) SCRIPTS += $(SCRIPTS_IOC) +TESTLIBRARY += $(TESTLIBRARY_IOC) TESTSCRIPTS += $(TESTSCRIPTS_IOC) TESTPROD += $(TESTPROD_IOC) endif @@ -79,7 +82,7 @@ endif #--------------------------------------------------------------- # Included defines and rules for prod,testprod, and library targets -#ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY) $(LOADABLE_LIBRARY))) +#ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRARY) )) include $(CONFIG)/RULES_TARGET #endif @@ -99,10 +102,10 @@ endif # Libraries # -LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS) \ - $(SHRLIBNAME) $(INSTALL_SHRLIBS) \ - $(DLL_LINK_LIBNAME) $(INSTALL_DLL_LINK_LIBS) \ - $(LOADABLE_SHRLIBNAME) $(INSTALL_LOADABLE_SHRLIBS) +LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS) $(TESTLIBNAME) \ + $(SHRLIBNAME) $(INSTALL_SHRLIBS) $(TESTSHRLIBNAME) \ + $(DLL_LINK_LIBNAME) $(INSTALL_DLL_LINK_LIBS) $(TESTDLL_LINK_LIBNAME) \ + $(LOADABLE_SHRLIBNAME) $(INSTALL_LOADABLE_SHRLIBS) $(INSTALL_LIBS): $(INSTALL_SHRLIBS) $(INSTALL_DLL_LINK_LIBS) $(INSTALL_LOADABLE_SHRLIBS) @@ -138,9 +141,12 @@ buildInstall : \ clean:: $(ECHO) "Cleaning" - @$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) $(LIBNAME) $(SHRLIBNAME) \ - $(INC) $(TARGETS) $(DLL_LINK_LIBNAME) $(TDS) \ - *.out MakefileInclude $(LOADABLE_SHRLIBNAME) *.manifest *.exp \ + @$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) \ + $(LIBNAME) $(TESTLIBNAME) $(SHRLIBNAME) $(TESTSHRLIBNAME) \ + $(DLL_LINK_LIBNAME) $(TESTDLL_LINK_LIBNAME) \ + $(LOADABLE_SHRLIBNAME) \ + $(INC) $(TARGETS) $(TDS)\ + *.out MakefileInclude *.manifest *.exp \ $(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) $(TESTSCRIPTS) ifdef RES @$(RM) *$(RES) @@ -255,20 +261,20 @@ $(LIB_BAF): $(addsuffix $(BOF),$(basename $(LIBRARY_LD_OBJS))) endif -$(LIBNAME): $(LIBRARY_OBJS) +$(LIBNAME) $(TESTLIBNAME): $(LIBRARY_OBJS) -$(DLL_LINK_LIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS) +$(DLL_LINK_LIBNAME) $(TESTDLL_LINK_LIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS) -$(LIBNAME) $(DLL_LINK_LIBNAME): $(LIB_PREFIX)%$(LIB_SUFFIX): +$(LIBNAME) $(TESTLIBNAME) $(DLL_LINK_LIBNAME) $(TESTDLL_LINK_LIBNAME): $(LIB_PREFIX)%$(LIB_SUFFIX): @$(RM) $@ $(ARCMD) ifneq ($(strip $(RANLIB)),) $(RANLIB) $@ endif # RANLIB -$(SHRLIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS) +$(SHRLIBNAME) $(TESTSHRLIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS) -$(SHRLIBNAME):$(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX): +$(SHRLIBNAME) $(TESTSHRLIBNAME):$(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX): @$(RM) $@ $(LINK.shrlib) ifeq ($(SHRLIB_SUFFIX),.dll) diff --git a/configure/RULES_TARGET b/configure/RULES_TARGET index a073fafa8..936484513 100755 --- a/configure/RULES_TARGET +++ b/configure/RULES_TARGET @@ -23,7 +23,7 @@ $(1)_$(2) += $$(if $$(strip $$($(1)_$(2)_$$(OS_CLASS))), \ endef $(foreach type, SRCS RCS OBJS LDFLAGS OBJLIBS LDOBJS SYS_LIBS , \ -$(foreach target, $(PROD) $(TESTPROD) $(LIBRARY) $(LOADABLE_LIBRARY) , \ +$(foreach target, $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRARY) , \ $(eval $(call TARGET_template,$(strip $(target)),$(type))))) #----------------------------------------------------------------------- @@ -56,7 +56,7 @@ $(1)_DEPLIBS = $$(foreach lib, $$($(1)_LDLIBS),\ endef -$(foreach target, $(PROD) $(TESTPROD) $(LIBRARY) $(LOADABLE_LIBRARY) , \ +$(foreach target, $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRARY) , \ $(eval $(call TARGET2_template,$(strip $(target))))) #----------------------------------------------------------------------- @@ -72,7 +72,6 @@ $(foreach target, $(PROD) $(TESTPROD), \ #----------------------------------------------------------------------- define LIBRARY_template -BUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),) $(1)_DLL_DEPLIBS=$$(foreach lib, $$($(1)_DLL_LIBS),\ $$(firstword $$(wildcard $$(addsuffix /$$(LIB_PREFIX)$$(lib).*,\ @@ -87,11 +86,29 @@ $$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_DEPLIBS) $$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_DLL_DEPLIBS) endef -$(foreach target, $(LIBRARY), \ +$(foreach target, $(LIBRARY) $(TESTLIBRARY), \ $(eval $(call LIBRARY_template,$(strip $(target))))) #----------------------------------------------------------------------- +define LIBRARY2_template +BUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),) +endef + +$(foreach target, $(LIBRARY), \ + $(eval $(call LIBRARY2_template,$(strip $(target))))) + +#----------------------------------------------------------------------- + +define LIBRARY3_template +TESTBUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),) +endef + +$(foreach target, $(TESTLIBRARY), \ + $(eval $(call LIBRARY3_template,$(strip $(target))))) + +#----------------------------------------------------------------------- + define LOADABLE_LIBRARY_template LOADABLE_BUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),) @@ -109,3 +126,5 @@ endef $(foreach target, $(LOADABLE_LIBRARY), \ $(eval $(call LOADABLE_LIBRARY_template,$(strip $(target))))) +#----------------------------------------------------------------------- + diff --git a/configure/os/CONFIG.Common.UnixCommon b/configure/os/CONFIG.Common.UnixCommon index fff5a5ee5..3d3bb9c0f 100644 --- a/configure/os/CONFIG.Common.UnixCommon +++ b/configure/os/CONFIG.Common.UnixCommon @@ -27,8 +27,10 @@ LOADABLE_SHRLIB_PREFIX = lib # names of libraries to build # -> lib.a LIBNAME = $(BUILD_LIBRARY:%=$(LIB_PREFIX)%$(LIB_SUFFIX)) +TESTLIBNAME = $(TESTBUILD_LIBRARY:%=$(LIB_PREFIX)%$(LIB_SUFFIX)) # -> lib.so. SHRLIBNAME_YES = $(BUILD_LIBRARY:%=$(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX)) +TESTSHRLIBNAME_YES = $(TESTBUILD_LIBRARY:%=$(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX)) LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=$(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX)) #------------------------------------------------------- diff --git a/configure/os/CONFIG.Common.vxWorksCommon b/configure/os/CONFIG.Common.vxWorksCommon index e1adbe8f6..6f7af69c4 100644 --- a/configure/os/CONFIG.Common.vxWorksCommon +++ b/configure/os/CONFIG.Common.vxWorksCommon @@ -32,6 +32,7 @@ CCC = $(GNU_BIN)/$(CMPLR_PREFIX)cc$(CMPLR_SUFFIX) #------------------------------------------------------- # Library definitions LIBNAME = $(BUILD_LIBRARY:%=$(LIB_PREFIX)%$(LIB_SUFFIX)) +TESTLIBNAME = $(TESTBUILD_LIBRARY:%=$(LIB_PREFIX)%$(LIB_SUFFIX)) #-------------------------------------------------- # Prod: DEPLIBS, LDFLAGS, and LDLIBS definitions diff --git a/configure/os/CONFIG.Common.win32-x86-cygwin b/configure/os/CONFIG.Common.win32-x86-cygwin index 4ee133578..49029cf2e 100644 --- a/configure/os/CONFIG.Common.win32-x86-cygwin +++ b/configure/os/CONFIG.Common.win32-x86-cygwin @@ -58,6 +58,7 @@ STATIC_CXXFLAGS_NO= $(VISC_DLL) -D_DLL SHRLIB_PREFIX= SHRLIB_SUFFIX=.dll SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) +TESTSHRLIBNAME_YES = $(TESTBUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) LOADABLE_SHRLIB_PREFIX= LOADABLE_SHRLIB_SUFFIX=.dll LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(LOADABLE_SHRLIB_SUFFIX)) @@ -70,8 +71,12 @@ LIB_PREFIX= LIB_SUFFIX=.lib DLL_LINK_LIBNAME_YES = $(BUILD_LIBRARY:%=%$(LIB_SUFFIX)) DLL_LINK_LIBNAME = $(DLL_LINK_LIBNAME_$(SHARED_LIBRARIES)) +TESTDLL_LINK_LIBNAME_YES = $(TESTBUILD_LIBRARY:%=%$(LIB_SUFFIX)) +TESTDLL_LINK_LIBNAME = $(TESTDLL_LINK_LIBNAME_$(SHARED_LIBRARIES)) LIBNAME_NO = $(BUILD_LIBRARY:%=%$(LIB_SUFFIX)) LIBNAME = $(LIBNAME_$(SHARED_LIBRARIES)) +TESTLIBNAME_NO = $(TESTBUILD_LIBRARY:%=%$(LIB_SUFFIX)) +TESTLIBNAME = $(TESTLIBNAME_$(SHARED_LIBRARIES)) # dll install location INSTALL_SHRLIB = $(INSTALL_BIN) diff --git a/configure/os/CONFIG.Common.win32-x86-mingw b/configure/os/CONFIG.Common.win32-x86-mingw index 3eda940a8..f4ee2c1ff 100644 --- a/configure/os/CONFIG.Common.win32-x86-mingw +++ b/configure/os/CONFIG.Common.win32-x86-mingw @@ -52,6 +52,7 @@ STATIC_CXXFLAGS_NO= $(VISC_DLL) -D_DLL SHRLIB_PREFIX= SHRLIB_SUFFIX=.dll SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) +TESTSHRLIBNAME_YES = $(TESTBUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) LOADABLE_SHRLIB_PREFIX= LOADABLE_SHRLIB_SUFFIX=.dll LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(LOADABLE_SHRLIB_SUFFIX)) @@ -64,8 +65,10 @@ LIB_PREFIX= LIB_SUFFIX=.lib DLL_LINK_LIBNAME_YES = $(BUILD_LIBRARY:%=%$(LIB_SUFFIX)) DLL_LINK_LIBNAME = $(DLL_LINK_LIBNAME_$(SHARED_LIBRARIES)) -LIBNAME_NO = $(BUILD_LIBRARY:%=%$(LIB_SUFFIX)) -LIBNAME = $(LIBNAME_$(SHARED_LIBRARIES)) +TESTDLL_LINK_LIBNAME_YES = $(TESTBUILD_LIBRARY:%=%$(LIB_SUFFIX)) +TESTDLL_LINK_LIBNAME = $(TESTDLL_LINK_LIBNAME_$(SHARED_LIBRARIES)) +TESTLIBNAME_NO = $(TESTBUILD_LIBRARY:%=%$(LIB_SUFFIX)) +TESTLIBNAME = $(TESTLIBNAME_$(SHARED_LIBRARIES)) # dll install location INSTALL_SHRLIB = $(INSTALL_BIN) diff --git a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland index c2c93e106..8e7845192 100644 --- a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland +++ b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland @@ -179,6 +179,7 @@ LINK.shrlib+= $(DLL_DEF_FLAG),$(LIBRARY_LD_RESS) SHRLIB_SUFFIX=.dll SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) +TESTSHRLIBNAME_YES = $(TESTBUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) # When SHARED_LIBRARIES is YES we are building a DLL link library @@ -186,10 +187,14 @@ LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) # DLL_LINK_LIBNAME_YES = $(BUILD_LIBRARY:%=%.lib) DLL_LINK_LIBNAME = $(DLL_LINK_LIBNAME_$(SHARED_LIBRARIES)) +TESTDLL_LINK_LIBNAME_YES = $(TESTBUILD_LIBRARY:%=%.lib) +TESTDLL_LINK_LIBNAME = $(TESTDLL_LINK_LIBNAME_$(SHARED_LIBRARIES)) LIB_PREFIX= LIB_SUFFIX=.lib LIBNAME_NO = $(BUILD_LIBRARY:%=%.lib) LIBNAME = $(LIBNAME_$(SHARED_LIBRARIES)) +TESTLIBNAME_NO = $(TESTBUILD_LIBRARY:%=%.lib) +TESTLIBNAME = $(TESTLIBNAME_$(SHARED_LIBRARIES)) # dll install location INSTALL_SHRLIB = $(INSTALL_BIN) @@ -263,5 +268,5 @@ LINK.cpp += , $@ ,,$(LINKLIBS) $(subst /,\\,$(PROD_LDLIBS)) HDEPENDS_INCLUDES_MKMF = $(filter-out $(BORLAND_INC),$(subst -I,,$(INCLUDES))) -TDS = $(addsuffix .tds,$(basename $(PROD) $(TESTPROD) $(BUILD_LIBRARY))) +TDS = $(addsuffix .tds,$(basename $(PROD) $(TESTPROD) $(BUILD_LIBRARY) $(TESTBUILD_LIBRARY))) diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86 index 78482e73d..4f55f943d 100644 --- a/configure/os/CONFIG.win32-x86.win32-x86 +++ b/configure/os/CONFIG.win32-x86.win32-x86 @@ -213,6 +213,7 @@ MUNCH_CMD = $(CCC) /Fo $@ $^ SHRLIB_SUFFIX=.dll SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) +TESTSHRLIBNAME_YES = $(TESTBUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) # # When SHARED_LIBRARIES is YES we are building a DLL link library @@ -220,10 +221,14 @@ LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) # DLL_LINK_LIBNAME_YES = $(BUILD_LIBRARY:%=%.lib) DLL_LINK_LIBNAME = $(DLL_LINK_LIBNAME_$(SHARED_LIBRARIES)) +TESTDLL_LINK_LIBNAME_YES = $(TESTBUILD_LIBRARY:%=%.lib) +TESTDLL_LINK_LIBNAME = $(TESTDLL_LINK_LIBNAME_$(SHARED_LIBRARIES)) LIB_PREFIX= LIB_SUFFIX=.lib LIBNAME_NO = $(BUILD_LIBRARY:%=%.lib) LIBNAME = $(LIBNAME_$(SHARED_LIBRARIES)) +TESTLIBNAME_NO = $(TESTBUILD_LIBRARY:%=%.lib) +TESTLIBNAME = $(TESTLIBNAME_$(SHARED_LIBRARIES)) # dll install location INSTALL_SHRLIB = $(INSTALL_BIN) diff --git a/src/catools/Makefile b/src/catools/Makefile index 2d18c9411..e7efd2be0 100644 --- a/src/catools/Makefile +++ b/src/catools/Makefile @@ -15,8 +15,7 @@ include $(TOP)/configure/CONFIG SHARED_LIBRARIES = NO # Build but don't install catools as a static library -LIBRARY += catools -INSTALL_LIBS = +TESTLIBRARY += catools catools_SRCS += tool_lib.c catools_LIBS += ca Com