From 76911e4ae901fd98651a64bb658bd363eafe8564 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 13 Feb 2013 17:09:54 -0600 Subject: [PATCH] configure: Fix the earlier DLLSTUBS change Turn on static library dependencies again in RULES_TARGET. --- configure/RULES_TARGET | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/configure/RULES_TARGET b/configure/RULES_TARGET index 165951142..d4dd0ea6b 100644 --- a/configure/RULES_TARGET +++ b/configure/RULES_TARGET @@ -88,6 +88,9 @@ $(1)_DLL_DEPLIBS=$$(foreach lib, $$($(1)_DLL_LIBS), \ ) $$(addsuffix /$(BUILDLIB_PREFIX)$$(lib)$(BUILDLIB_SUFFIX), \ $$(firstword $$($$(lib)_DIR) $$(SHRLIB_SEARCH_DIRS))))) +$$(LIB_PREFIX)$(1)$$(LIB_SUFFIX):$$($(1)_OBJSNAME) $$($(1)_RESS) +$$(LIB_PREFIX)$(1)$$(LIB_SUFFIX):$$($(1)_DEPLIBS) + ifeq ($$(SHARED_LIBRARIES),YES) ifdef SHRLIB_SUFFIX @@ -100,11 +103,6 @@ $$(INSTALL_LIB)/$$(DLLSTUB_PREFIX)$(1)$$(DLLSTUB_SUFFIX): \ $$(INSTALL_SHRLIB)/$$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX) endif -else # SHARED_LIBRARIES is NO - -$$(LIB_PREFIX)$(1)$$(LIB_SUFFIX):$$($(1)_OBJSNAME) $$($(1)_RESS) -$$(LIB_PREFIX)$(1)$$(LIB_SUFFIX):$$($(1)_DEPLIBS) - endif endef