From 859024d1553558e012a6fdaac94bec91d1633f59 Mon Sep 17 00:00:00 2001 From: Janet Anderson Date: Fri, 26 Jul 2013 14:37:55 -0500 Subject: [PATCH] Stopped install of test libraries and removed version number in test library name. --- configure/RULES_BUILD | 7 ++++++- configure/RULES_TARGET | 12 ++++++++---- configure/os/CONFIG.Common.UnixCommon | 8 +++++--- configure/os/CONFIG.Common.cygwin-x86 | 4 +++- configure/os/CONFIG.Common.vxWorksCommon | 4 +++- configure/os/CONFIG.Common.win32-x86-mingw | 2 +- configure/os/CONFIG.win32-x86.win32-x86 | 10 +++++++--- 7 files changed, 33 insertions(+), 14 deletions(-) diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index 7520ff59f..be986e847 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -278,7 +278,12 @@ endif # RANLIB $(SHRLIBNAME) $(DLLSTUB_LIBNAME) $(TESTSHRLIBNAME) $(TESTDLLSTUB_LIBNAME): \ $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS) -$(SHRLIBNAME) $(TESTSHRLIBNAME): $(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX): +$(SHRLIBNAME): $(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX): + @$(RM) $@ + $(LINK.shrlib) + $(MT_DLL_COMMAND) + +$(TESTSHRLIBNAME): $(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX_BASE): @$(RM) $@ $(LINK.shrlib) $(MT_DLL_COMMAND) diff --git a/configure/RULES_TARGET b/configure/RULES_TARGET index d4dd0ea6b..8e7a1db8e 100644 --- a/configure/RULES_TARGET +++ b/configure/RULES_TARGET @@ -97,10 +97,6 @@ ifdef SHRLIB_SUFFIX $$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_OBJSNAME) $$($(1)_RESS) $$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_DEPLIBS) $$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_DLL_DEPLIBS) - -# Needed for -j parallel builds option -$$(INSTALL_LIB)/$$(DLLSTUB_PREFIX)$(1)$$(DLLSTUB_SUFFIX): \ - $$(INSTALL_SHRLIB)/$$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX) endif endif @@ -114,6 +110,14 @@ $(foreach target, $(LIBRARY) $(TESTLIBRARY), \ define LIBRARY2_template BUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),) + +# Needed for -j parallel builds option +ifeq ($$(SHARED_LIBRARIES),YES) +ifdef SHRLIB_SUFFIX +$$(INSTALL_LIB)/$$(DLLSTUB_PREFIX)$(1)$$(DLLSTUB_SUFFIX): \ + $$(INSTALL_SHRLIB)/$$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX) +endif +endif endef $(foreach target, $(LIBRARY), \ diff --git a/configure/os/CONFIG.Common.UnixCommon b/configure/os/CONFIG.Common.UnixCommon index b4357152f..43b29d08a 100644 --- a/configure/os/CONFIG.Common.UnixCommon +++ b/configure/os/CONFIG.Common.UnixCommon @@ -31,7 +31,7 @@ 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)) +TESTSHRLIBNAME_YES = $(TESTBUILD_LIBRARY:%=$(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX_BASE)) LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=$(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX)) #------------------------------------------------------- @@ -48,7 +48,8 @@ SHRLIB_DEPLIBS = $(foreach lib, $(LIB_LIBS) $(USR_LIBS), \ $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS)) \ $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \ $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS)) \ - ) $(addsuffix /$(BUILDLIB_PREFIX)$(lib)$(BUILDLIB_SUFFIX), $(INSTALL_LIB)))) + ) $(addsuffix /$(BUILDLIB_PREFIX)$(lib)$(BUILDLIB_SUFFIX), \ + $(if $(filter $(lib),$(TESTLIBRARY)),.,$(INSTALL_LIB))))) SHRLIB_LDLIBS = $(addprefix -l, $($*_LDLIBS) $(LIB_LIBS) $(USR_LIBS)) \ $(STATIC_LDLIBS) \ @@ -72,7 +73,8 @@ PROD_DEPLIBS = $(foreach lib, $(PROD_LIBS) $(USR_LIBS), \ $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS)) \ $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \ $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS)) \ - ) $(addsuffix /$(BUILDLIB_PREFIX)$(lib)$(BUILDLIB_SUFFIX), $(INSTALL_LIB)))) + ) $(addsuffix /$(BUILDLIB_PREFIX)$(lib)$(BUILDLIB_SUFFIX), \ + $(if $(filter $(lib),$(TESTLIBRARY)),.,$(INSTALL_LIB))))) PROD_LDLIBS = $(addprefix -l, $($*_LDLIBS) $(PROD_LIBS) $(USR_LIBS)) \ $(STATIC_LDLIBS) \ diff --git a/configure/os/CONFIG.Common.cygwin-x86 b/configure/os/CONFIG.Common.cygwin-x86 index b59e06af7..700f3ac73 100644 --- a/configure/os/CONFIG.Common.cygwin-x86 +++ b/configure/os/CONFIG.Common.cygwin-x86 @@ -61,7 +61,7 @@ SHRLIB_PREFIX = SHRLIB_SUFFIX_BASE = .dll SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE) SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) -TESTSHRLIBNAME_YES = $(TESTBUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) +TESTSHRLIBNAME_YES = $(TESTBUILD_LIBRARY:%=%$(SHRLIB_SUFFIX_BASE)) LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(LOADABLE_SHRLIB_SUFFIX)) # @@ -74,6 +74,8 @@ LIB_PREFIX_YES = lib LIB_SUFFIX_YES = .dll.a LIB_PREFIX = $(LIB_PREFIX_$(SHARED_LIBRARIES)) LIB_SUFFIX = $(LIB_SUFFIX_$(SHARED_LIBRARIES)) +DLLSTUB_PREFIX = lib +DLLSTUB_SUFFIX = .dll.a DLLSTUB_LIBNAME_YES = $(BUILD_LIBRARY:%=$(LIB_PREFIX)%$(LIB_SUFFIX)) DLLSTUB_LIBNAME = $(DLLSTUB_LIBNAME_$(SHARED_LIBRARIES)) diff --git a/configure/os/CONFIG.Common.vxWorksCommon b/configure/os/CONFIG.Common.vxWorksCommon index 3b5b2694f..56c533400 100644 --- a/configure/os/CONFIG.Common.vxWorksCommon +++ b/configure/os/CONFIG.Common.vxWorksCommon @@ -41,7 +41,9 @@ PROD_DEPLIBS = $(foreach lib,$(PROD_LIBS) $(USR_LIBS), \ $(firstword $(wildcard \ $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \ $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS))) \ - $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), $(INSTALL_LIB)))) + $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \ + $(if $(filter $(lib),$(TESTLIBRARY)),.,$(INSTALL_LIB))))) + PROD_LDLIBS = $(addprefix -l,$($*_LDLIBS) $(PROD_LIBS) $(USR_LIBS) \ $($*_SYS_LIBS) $(PROD_SYS_LIBS) $(USR_SYS_LIBS)) diff --git a/configure/os/CONFIG.Common.win32-x86-mingw b/configure/os/CONFIG.Common.win32-x86-mingw index cdbe3e2e1..0f66df17c 100644 --- a/configure/os/CONFIG.Common.win32-x86-mingw +++ b/configure/os/CONFIG.Common.win32-x86-mingw @@ -62,7 +62,7 @@ SHRLIB_PREFIX = SHRLIB_SUFFIX_BASE = .dll SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE) SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) -TESTSHRLIBNAME_YES = $(TESTBUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) +TESTSHRLIBNAME_YES = $(TESTBUILD_LIBRARY:%=%$(SHRLIB_SUFFIX_BASE)) LOADABLE_SHRLIB_PREFIX = LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE) LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(LOADABLE_SHRLIB_SUFFIX)) diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86 index 846710ef0..02b5c0143 100644 --- a/configure/os/CONFIG.win32-x86.win32-x86 +++ b/configure/os/CONFIG.win32-x86.win32-x86 @@ -200,12 +200,13 @@ SHRLIB_SUFFIX_BASE = .dll SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE) SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) -TESTSHRLIBNAME_YES = $(TESTBUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) +TESTSHRLIBNAME_YES = $(TESTBUILD_LIBRARY:%=%$(SHRLIB_SUFFIX_BASE)) # # When SHARED_LIBRARIES is YES we are building a DLL link library # and when SHARED_LIBRARIES is NO we are building an object library # +DLLSTUB_SUFFIX = .lib DLLSTUB_LIBNAME_YES = $(BUILD_LIBRARY:%=%.lib) DLLSTUB_LIBNAME = $(DLLSTUB_LIBNAME_$(SHARED_LIBRARIES)) TESTDLLSTUB_LIBNAME_YES = $(TESTBUILD_LIBRARY:%=%.lib) @@ -233,7 +234,9 @@ PROD_DEPLIBS = $(foreach lib, $(PROD_LIBS) $(USR_LIBS), \ $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS)) \ $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \ $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS)) \ - ) $(addsuffix /$(BUILDLIB_PREFIX)$(lib)$(BUILDLIB_SUFFIX), $(INSTALL_LIB)))) + ) $(addsuffix /$(BUILDLIB_PREFIX)$(lib)$(BUILDLIB_SUFFIX), \ + $(if $(filter $(lib),$(TESTLIBRARY)),.,$(INSTALL_LIB))))) + PROD_LDLIBS += $($*_DEPLIBS) $(PROD_DEPLIBS) PROD_LDLIBS += $(addsuffix .lib, \ @@ -259,7 +262,8 @@ SHRLIB_DEPLIBS = $(foreach lib, $(LIB_LIBS) $(USR_LIBS), \ $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS)) \ $(addsuffix /$(LIB_PREFIX)$(lib)$(LIB_SUFFIX), \ $($(lib)_DIR) $(SHRLIB_SEARCH_DIRS)) \ - ) $(addsuffix /$(BUILDLIB_PREFIX)$(lib)$(BUILDLIB_SUFFIX), $(INSTALL_LIB)))) + ) $(addsuffix /$(BUILDLIB_PREFIX)$(lib)$(BUILDLIB_SUFFIX), \ + $(if $(filter $(lib),$(TESTLIBRARY)),.,$(INSTALL_LIB))))) SHRLIB_LDLIBS += $($*_DLL_DEPLIBS) $($*_DEPLIBS) $(SHRLIB_DEPLIBS)