epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

configure: Fix the earlier DLLSTUBS change

Browse Source 
Turn on static library dependencies again in RULES_TARGET.
This commit is contained in:
Andrew Johnson
2013-02-13 17:09:54 -06:00
parent c29a8bd268
commit 76911e4ae9
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure/RULES_TARGET
View File

@@ -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