From 86055bce3d85c8b6d8b0833e6a441dedee31aaa5 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Wed, 29 Aug 2001 15:11:37 +0000 Subject: [PATCH] Changed SHRLIBNAME to SHRLIBNAME_YES. --- configure/CONFIG_COMMON | 2 ++ configure/os/CONFIG.Common.UnixCommon | 2 +- configure/os/CONFIG.win32-x86-borland.win32-x86-borland | 2 +- configure/os/CONFIG.win32-x86.win32-x86 | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index c3adb91d3..a086a50ea 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -97,6 +97,8 @@ OBJSNAME = $(addsuffix $(OBJ),$(basename $(OBJS))) PRODNAME = $(addsuffix $(EXE),$(basename $(PROD))) TESTPRODNAME = $(addsuffix $(EXE),$(basename $(TESTPROD))) +SHRLIBNAME = $(SHRLIBNAME_$(SHARED_LIBRARIES)) + #-------------------------------------------------- # obj files diff --git a/configure/os/CONFIG.Common.UnixCommon b/configure/os/CONFIG.Common.UnixCommon index 0a25438e1..bcf619703 100644 --- a/configure/os/CONFIG.Common.UnixCommon +++ b/configure/os/CONFIG.Common.UnixCommon @@ -30,7 +30,7 @@ SHRLIB_SUFFIX = .so$(addprefix .,$(SHRLIB_VERSION)) # -> lib.a LIBNAME = $(BUILD_LIBRARY:%=$(LIB_PREFIX)%$(LIB_SUFFIX)) # -> lib.so. -SHRLIBNAME = $(BUILD_LIBRARY:%=$(LIB_PREFIX)%$(SHRLIB_SUFFIX)) +SHRLIBNAME_YES = $(BUILD_LIBRARY:%=$(LIB_PREFIX)%$(SHRLIB_SUFFIX)) #------------------------------------------------------- # shrlib: dependancy definitions diff --git a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland index 2163ba518..5a2fb8822 100644 --- a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland +++ b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland @@ -210,7 +210,7 @@ LINK.shrlib+= $(DLL_DEF_FLAG),$(LIBRARY_LD_RESS) # in this library (may be for e.g. base/src/libCompat # on some archs), don't define (and build) any library! SHRLIB_SUFFIX=.dll -SHRLIBNAME = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) +SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) # diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86 index 8510e12b3..18d6c7284 100644 --- a/configure/os/CONFIG.win32-x86.win32-x86 +++ b/configure/os/CONFIG.win32-x86.win32-x86 @@ -216,7 +216,7 @@ LDCMD = $(CCC) /Fo $@ $^ # in this library (may be for e.g. base/src/libCompat # on some archs), don't define (and build) any library! SHRLIB_SUFFIX=.dll -SHRLIBNAME = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) +SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX)) #