diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index e0fcf6741..1f67a5313 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -250,6 +250,12 @@ STATIC_LDLIBS = $(STATIC_LDLIBS_$(STATIC_BUILD)) LIBRARY_SRCS=$(basename $(foreach lib,$(LIBRARY) $(LOADABLE_LIBRARY),$($(lib)_OBJS) $(LIBRARY_OBJS))) LIBRARY_SRC_CFLAGS=$($(patsubst $*,SHRLIB,$(findstring $*,$(LIBRARY_SRCS)))_CFLAGS) +#-------------------------------------------------- +# prefix, suffix, and ldflags for loadable shared libraries +TARGET_LIB_LDFLAGS=$($(patsubst $*,LOADABLE_,$(findstring $*,$(LOADABLE_LIBRARY)))SHRLIB_LDFLAGS) +LOADABLE_SHRLIB_PREFIX=$(SHRLIB_PREFIX) +LOADABLE_SHRLIB_SUFFIX=$(SHRLIB_SUFFIX) + #-------------------------------------------------- # Command-line input support default COMMANDLINE_LIBRARY = EPICS diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index 5dbf84497..ffe7b78ad 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -307,7 +307,8 @@ $(LOADABLE_SHRLIBNAME): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS) $(LOADABLE_SHRLIBNAME):$(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX): @$(RM) $@ - $(LINK.loadable_shrlib) + $(LINK.shrlib) + $(MT_DLL_COMMAND) # C++ munching for VxWorks %.nm : %$(EXE)