Removed LINK.loadable_shrlib and added TARGET_LIB_LDFLAGS.

This commit is contained in:
Janet B. Anderson
2008-07-03 15:01:09 +00:00
parent af569835c7
commit 37d6265427
2 changed files with 8 additions and 1 deletions

View File

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

View File

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