Unify DLLPOSTFIX value on all platforms.

There is no justification for changing some shared library file names depending on the platform used.

Unify DLLPOSTFIX value on all platforms.
There is no justification for changing some shared library file names depending on the platform used.
eb5217de · Francois Tigeot · 1000d15c · eb5217de · eb5217de · eb5217de
Kaydet (Commit) eb5217de authored Haz 01, 2011 tarafından Francois Tigeot
47 changed files
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -143,6 +143,8 @@ $(eval $(call gb_Helper_init_registries))
 $(eval $(call gb_Helper_add_repositories,$(gb_REPOS)))
 $(eval $(call gb_Helper_collect_libtargets))

+gb_Library_DLLPOSTFIX := lo
+
 ifeq ($(OS),LINUX)
 include $(GBUILDDIR)/platform/linux-$(CPUNAME).mk
 else ifeq ($(OS),MACOSX)

--- a/solenv/gbuild/platform/dragonfly.mk
+++ b/solenv/gbuild/platform/dragonfly.mk
@@ -35,7 +35,6 @@ else
 gb_CPUDEFS := -D$(CPUNAME)
 endif

-gb_Library_DLLPOSTFIX := df
 gb_COMPILERDEFAULTOPTFLAGS := -O -g

 include $(GBUILDDIR)/platform/unxgcc.mk

--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -35,7 +35,6 @@ else
 gb_CPUDEFS := -D$(CPUNAME)
 endif

-gb_Library_DLLPOSTFIX := fb
 gb_COMPILERDEFAULTOPTFLAGS := -O2

 include $(GBUILDDIR)/platform/unxgcc.mk

--- a/solenv/gbuild/platform/linux-ARM.mk
+++ b/solenv/gbuild/platform/linux-ARM.mk
@@ -29,7 +29,6 @@

 #please make generic modifications to unxgcc.mk or linux.mk
 gb_CPUDEFS += -DARM32
-gb_Library_DLLPOSTFIX := lr
 gb_COMPILERDEFAULTOPTFLAGS := -Os
 gb_CXXFLAGS += -fno-omit-frame-pointer
 gb_CFLAGS += -fno-omit-frame-pointer

--- a/solenv/gbuild/platform/linux-AXP.mk
+++ b/solenv/gbuild/platform/linux-AXP.mk
@@ -29,7 +29,6 @@

 #please make generic modifications to unxgcc.mk or linux.mk
 gb_CPUDEFS += -D$(CPUNAME)
-gb_Library_DLLPOSTFIX := ll
 gb_COMPILERDEFAULTOPTFLAGS := -Os
 gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
 gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer

--- a/solenv/gbuild/platform/linux-GODSON.mk
+++ b/solenv/gbuild/platform/linux-GODSON.mk
@@ -29,7 +29,6 @@

 #please make generic modifications to unxgcc.mk or linux.mk
 gb_CPUDEFS += -DMIPS
-gb_Library_DLLPOSTFIX := lm
 gb_COMPILERDEFAULTOPTFLAGS := -Os

 include $(GBUILDDIR)/platform/unxgcc.mk

--- a/solenv/gbuild/platform/linux-HPPA.mk
+++ b/solenv/gbuild/platform/linux-HPPA.mk
@@ -29,7 +29,6 @@

 #please make generic modifications to unxgcc.mk or linux.mk
 gb_CPUDEFS += -D$(CPUNAME)
-gb_Library_DLLPOSTFIX := lh
 gb_COMPILERDEFAULTOPTFLAGS := -O2

 include $(GBUILDDIR)/platform/unxgcc.mk

--- a/solenv/gbuild/platform/linux-IA64.mk
+++ b/solenv/gbuild/platform/linux-IA64.mk
@@ -29,7 +29,6 @@

 #please make generic modifications to unxgcc.mk or linux.mk
 gb_CPUDEFS := -D$(CPUNAME)
-gb_Library_DLLPOSTFIX := la
 gb_COMPILERDEFAULTOPTFLAGS := -O2

 include $(GBUILDDIR)/platform/linux.mk

--- a/solenv/gbuild/platform/linux-INTEL.mk
+++ b/solenv/gbuild/platform/linux-INTEL.mk
@@ -29,7 +29,6 @@

 #please make generic modifications to unxgcc.mk or linux.mk
 gb_CPUDEFS := -DX86
-gb_Library_DLLPOSTFIX := li
 gb_COMPILERDEFAULTOPTFLAGS := -Os

 include $(GBUILDDIR)/platform/linux.mk

--- a/solenv/gbuild/platform/linux-M68K.mk
+++ b/solenv/gbuild/platform/linux-M68K.mk
@@ -29,7 +29,6 @@

 #please make generic modifications to unxgcc.mk or linux.mk
 gb_CPUDEFS += -D$(CPUNAME)
-gb_Library_DLLPOSTFIX := lm
 gb_COMPILERDEFAULTOPTFLAGS := -Os
 gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
 gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer

--- a/solenv/gbuild/platform/linux-POWERPC.mk
+++ b/solenv/gbuild/platform/linux-POWERPC.mk
@@ -29,7 +29,6 @@

 #please make generic modifications to unxgcc.mk or linux.mk
 gb_CPUDEFS += -DPOWERPC -DPPC
-gb_Library_DLLPOSTFIX := lp
 gb_COMPILERDEFAULTOPTFLAGS := -O2
 gb_CXXFLAGS += -fsigned-char
 gb_CFLAGS += -fsigned-char

--- a/solenv/gbuild/platform/linux-S390.mk
+++ b/solenv/gbuild/platform/linux-S390.mk
@@ -29,7 +29,6 @@

 #please make generic modifications to unxgcc.mk or linux.mk
 gb_CPUDEFS += -D$(CPUNAME)
-gb_Library_DLLPOSTFIX := l3
 gb_COMPILERDEFAULTOPTFLAGS := -O2
 gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
 gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer

--- a/solenv/gbuild/platform/linux-SPARC.mk
+++ b/solenv/gbuild/platform/linux-SPARC.mk
@@ -29,7 +29,6 @@

 #please make generic modifications to unxgcc.mk or linux.mk
 gb_CPUDEFS := -D$(CPUNAME)
-gb_Library_DLLPOSTFIX := ls
 gb_COMPILERDEFAULTOPTFLAGS := -Os

 include $(GBUILDDIR)/platform/linux.mk

--- a/solenv/gbuild/platform/linux-X86_64.mk
+++ b/solenv/gbuild/platform/linux-X86_64.mk
@@ -29,7 +29,6 @@

 #please make generic modifications to unxgcc.mk or linux.mk
 gb_CPUDEFS := -D$(CPUNAME)
-gb_Library_DLLPOSTFIX := lx
 gb_COMPILERDEFAULTOPTFLAGS := -O2

 include $(GBUILDDIR)/platform/linux.mk

--- a/solenv/gbuild/platform/netbsd.mk
+++ b/solenv/gbuild/platform/netbsd.mk
@@ -35,7 +35,6 @@ else
 gb_CPUDEFS := -D$(CPUNAME)
 endif

-gb_Library_DLLPOSTFIX := nb
 gb_COMPILERDEFAULTOPTFLAGS := -O2

 include $(GBUILDDIR)/platform/unxgcc.mk

--- a/solenv/gbuild/platform/openbsd.mk
+++ b/solenv/gbuild/platform/openbsd.mk
@@ -35,7 +35,6 @@ else
 gb_CPUDEFS := -D$(CPUNAME)
 endif

-gb_Library_DLLPOSTFIX := ob
 gb_COMPILERDEFAULTOPTFLAGS := -O2
 gb_STDLIBS := pthread


--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1023,6 +1023,8 @@ LNTFLAGSOUTOBJ=-os
 .INCLUDE : unx.mk
 .ENDIF

+DLLPOSTFIX=lo
+
 .IF "$(OOO_LIBRARY_PATH_VAR)" != ""
 # Add SOLARLIBDIR at the begin of a (potentially previously undefined) library
 # path (LD_LIBRARY_PATH, PATH, etc.; prepending avoids fetching libraries from

--- a/solenv/inc/unxaigppc.mk
+++ b/solenv/inc/unxaigppc.mk
@@ -62,7 +62,6 @@ STDSHLGUIMT:=-ldl -lpthread -lm
 STDSHLCUIMT:=-ldl -lpthread -lm
 X11LINK_DYNAMIC:=-lXext -lX11

-DLLPOSTFIX:=ap

 CFLAGSDEBUG:=


--- a/solenv/inc/unxaixp.mk
+++ b/solenv/inc/unxaixp.mk
@@ -101,10 +101,6 @@ RCLINK=
 RCLINKFLAGS=
 RCSETVERSION=

-DLLPOSTFIX=		ap
-.IF "$(WORK_STAMP)"=="MIX364"
-DLLPOSTFIX=
-.ENDIF
 DLLPRE=			lib
 DLLPOST=		.so


--- a/solenv/inc/unxandr.mk
+++ b/solenv/inc/unxandr.mk
@@ -31,4 +31,3 @@ CDEFAULTOPT=-Os
 .INCLUDE : unxgcc.mk
 CDEFS+=-DARM32
 CFLAGS+=-fno-omit-frame-pointer
-DLLPOSTFIX=ar
--- a/solenv/inc/unxdfly.mk
+++ b/solenv/inc/unxdfly.mk
@@ -43,6 +43,3 @@ CFLAGS_NO_EXCEPTIONS=-fno-exceptions

 # default linker flags
 LINKFLAGSDEFS:=
-
-# platform specific identifier for shared libs
-DLLPOSTFIX=df
--- a/solenv/inc/unxfbsdi.mk
+++ b/solenv/inc/unxfbsdi.mk
@@ -41,6 +41,3 @@ CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
 .ELSE 	# "$(PRODUCT)"!=""
 CFLAGSOPT= 					# no optimizing for non products
 .ENDIF	# "$(PRODUCT)"!=""
-
-# platform specific identifier for shared libs
-DLLPOSTFIX=fi
--- a/solenv/inc/unxfbsdx.mk
+++ b/solenv/inc/unxfbsdx.mk
@@ -44,6 +44,4 @@ CFLAGSOPT=-O2 -fno-strict-aliasing		# optimizing for products
 CFLAGSOPT=   					# no optimizing for non products
 .ENDIF	# "$(PRODUCT)"!=""

-# platform specific identifier for shared libs
-DLLPOSTFIX=fx
 BUILD64=1
--- a/solenv/inc/unxiosr.mk
+++ b/solenv/inc/unxiosr.mk
@@ -39,7 +39,6 @@ PROCESSOR_DEFINES=-DARM32

 DLLPRE=lib
 DLLPOST=.a
-DLLPOSTFIX=

 # flags to enable build with symbols
 CFLAGSENABLESYMBOLS=-g

--- a/solenv/inc/unxlnga.mk
+++ b/solenv/inc/unxlnga.mk
@@ -29,5 +29,4 @@

 .INCLUDE : unxlng.mk
 CFLAGS+=-DIA64
-DLLPOSTFIX=la
 BUILD64=1
--- a/solenv/inc/unxlngaxp.mk
+++ b/solenv/inc/unxlngaxp.mk
@@ -31,5 +31,4 @@ PICSWITCH:=-fPIC
 .INCLUDE : unxlng.mk
 CFLAGS+=-DAXP
 LINKFLAGS+=-Wl,--no-relax
-DLLPOSTFIX=ll
 BUILD64=1
--- a/solenv/inc/unxlnghppa.mk
+++ b/solenv/inc/unxlnghppa.mk
@@ -32,4 +32,3 @@ CDEFS+=-DHPPA
 CFLAGS+=
 CFLAGSCC+=
 CFLAGSCXX+=
-DLLPOSTFIX=lh
--- a/solenv/inc/unxlngi.mk
+++ b/solenv/inc/unxlngi.mk
@@ -35,4 +35,3 @@ ARCH_FLAGS*=-mtune=pentiumpro
 .INCLUDE : unxlng.mk
 CDEFS+=-DX86
 DLLPOST=.so
-DLLPOSTFIX=li
--- a/solenv/inc/unxlngm68k.mk
+++ b/solenv/inc/unxlngm68k.mk
@@ -34,4 +34,3 @@ CDEFS+=-DM68K
 CFLAGS+=-fsigned-char -fno-omit-frame-pointer
 CFLAGSCC+=-fsigned-char
 CFLAGSCXX+=-fsigned-char
-DLLPOSTFIX=lm
--- a/solenv/inc/unxlngmips.mk
+++ b/solenv/inc/unxlngmips.mk
@@ -30,4 +30,3 @@
 CDEFAULTOPT=-Os
 .INCLUDE : unxlng.mk
 CDEFS+=-DMIPS
-DLLPOSTFIX=lm
--- a/solenv/inc/unxlngppc.mk
+++ b/solenv/inc/unxlngppc.mk
@@ -31,4 +31,3 @@ DEFAULTOPT=-Os
 PICSWITCH:=-fPIC
 .INCLUDE : unxlng.mk
 CDEFS+=-DPOWERPC -DPPC
-DLLPOSTFIX=lp
--- a/solenv/inc/unxlngr.mk
+++ b/solenv/inc/unxlngr.mk
@@ -31,4 +31,3 @@ CDEFAULTOPT=-Os
 .INCLUDE : unxlng.mk
 CDEFS+=-DARM32
 CFLAGS+=-fno-omit-frame-pointer
-DLLPOSTFIX=lr
--- a/solenv/inc/unxlngs.mk
+++ b/solenv/inc/unxlngs.mk
@@ -33,4 +33,3 @@ CDEFAULTOPT=-Os
 PICSWITCH:=-fPIC
 .INCLUDE : unxlng.mk
 CDEFS+=-DSPARC
-DLLPOSTFIX=ls
--- a/solenv/inc/unxlngs390.mk
+++ b/solenv/inc/unxlngs390.mk
@@ -33,4 +33,3 @@ CDEFS+=-DS390
 CFLAGS+=-fsigned-char -fno-omit-frame-pointer
 CFLAGSCC+=-fsigned-char
 CFLAGSCXX+=-fsigned-char
-DLLPOSTFIX=l3
--- a/solenv/inc/unxlngx.mk
+++ b/solenv/inc/unxlngx.mk
@@ -29,5 +29,4 @@

 .INCLUDE : unxlng.mk
 CDEFS+=-DX86_64
-DLLPOSTFIX=lx
 BUILD64=1
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -29,7 +29,7 @@
 # Platform MAKEFILE for Mac OS X and Darwin on both PowerPC and Intel
 ##########################################################################

-# PROCESSOR_DEFINES and DLLPOSTFIX are defined in the particular platform file
+# PROCESSOR_DEFINES is defined in the particular platform file

 ASM=
 AFLAGS=

--- a/solenv/inc/unxmacxi.mk
+++ b/solenv/inc/unxmacxi.mk
@@ -31,8 +31,6 @@

 PROCESSOR_DEFINES=-DX86

-DLLPOSTFIX=mxi
-
 # special for SO build environment
 .IF "$(SYSBASE)"!=""
 .IF "$(EXTRA_CFLAGS)"!=""

--- a/solenv/inc/unxmacxp.mk
+++ b/solenv/inc/unxmacxp.mk
@@ -31,7 +31,5 @@

 PROCESSOR_DEFINES=-DPOWERPC -DPPC

-DLLPOSTFIX=mxp
-
 # Include generic Mac OS X makefile
 .INCLUDE : unxmacx.mk
--- a/solenv/inc/unxnbsd.mk
+++ b/solenv/inc/unxnbsd.mk
@@ -23,6 +23,3 @@ LINKFLAGSRUNPATH_BRAND=

 LINKFLAGSDEFS=-Wl,--ignore-unresolved-symbol,environ
 LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
-
-# platform specific identifier for shared libs
-DLLPOSTFIX=nb
--- a/solenv/inc/unxobsd.mk
+++ b/solenv/inc/unxobsd.mk
@@ -44,6 +44,3 @@ CFLAGS_NO_EXCEPTIONS+=-DBOOST_NO_EXCEPTIONS

 # default linker flags
 LINKFLAGSDEFS:=
-
-# platform specific identifier for shared libs
-DLLPOSTFIX=ob
--- a/solenv/inc/unxsogi.mk
+++ b/solenv/inc/unxsogi.mk
@@ -128,6 +128,5 @@ RCLINK=
 RCLINKFLAGS=
 RCSETVERSION=

-DLLPOSTFIX=sogi
 DLLPRE=lib
 DLLPOST=.so
--- a/solenv/inc/unxsogs.mk
+++ b/solenv/inc/unxsogs.mk
@@ -127,6 +127,5 @@ RCLINK=
 RCLINKFLAGS=
 RCSETVERSION=

-DLLPOSTFIX=sogs
 DLLPRE=lib
 DLLPOST=.so
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -216,8 +216,6 @@ RCLINK=
 RCLINKFLAGS=
 RCSETVERSION=

-DLLPOSTFIX=si
-
 DLLPRE=lib
 DLLPOST=.so


--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -222,8 +222,6 @@ RCLINK=
 RCLINKFLAGS=
 RCSETVERSION=

-DLLPOSTFIX=ss
-
 DLLPRE=lib
 DLLPOST=.so


--- a/solenv/inc/unxsolu4.mk
+++ b/solenv/inc/unxsolu4.mk
@@ -215,8 +215,6 @@ RCLINK=
 RCLINKFLAGS=
 RCSETVERSION=

-DLLPOSTFIX=su
-
 DLLPRE=lib
 DLLPOST=.so


--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -172,7 +172,6 @@ RCLINK=
 RCLINKFLAGS=
 RCSETVERSION=

-DLLPOSTFIX=gi
 PCHPOST=.gch

 ADVAPI32LIB=-ladvapi32

--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -342,11 +342,6 @@ MT=mt.exe
 MTFLAGS=$(NOLOGO)


-.IF "$(CL_X64)" == ""
-DLLPOSTFIX=mi
-.ELSE
-DLLPOSTFIX=mx
-.ENDIF
 PCHPOST=.pch

 CSC*=$(FLIPCMD) csc