From 244355d63d4d04dcc0efd2b473f9e5ebb9ee1f06 Mon Sep 17 00:00:00 2001 From: Janet Anderson Date: Fri, 18 Feb 2011 16:16:56 -0600 Subject: [PATCH] Updated shared library dependancies needed for -j parallel build option. --- configure/RULES_BUILD | 2 -- configure/RULES_TARGET | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) mode change 100755 => 100644 configure/RULES_TARGET diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index f6c2521b8..f7247a5be 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -107,8 +107,6 @@ LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS) $(TESTLIBNAME) \ $(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) - -include $(CONFIG)/RULES_FILE_TYPE diff --git a/configure/RULES_TARGET b/configure/RULES_TARGET old mode 100755 new mode 100644 index 936484513..42aeff5f1 --- a/configure/RULES_TARGET +++ b/configure/RULES_TARGET @@ -84,6 +84,13 @@ $$(LIB_PREFIX)$(1)$$(LIB_SUFFIX):$$($(1)_DEPLIBS) $$(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 +ifeq ($$(SHARED_LIBRARIES),YES) +$$(INSTALL_LIB)/$$(LIB_PREFIX)$(1)$$(LIB_SUFFIX): \ + $$(INSTALL_SHRLIB)/$$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX) +endif + endef $(foreach target, $(LIBRARY) $(TESTLIBRARY), \