summaryrefslogtreecommitdiff
path: root/solenv/inc
diff options
context:
space:
mode:
authorFrancois Tigeot <ftigeot@wolfpond.org>2011-06-01 08:40:48 +0200
committerFrancois Tigeot <ftigeot@wolfpond.org>2011-06-02 14:37:34 +0200
commiteb5217de96690a13928b00e6db3289f6c3b6b689 (patch)
treec97e7d24f62214ed792fcdb7ca8975ad3d3f581c /solenv/inc
parent1000d15c859f7f1823704517c82ed0f3987a3e7b (diff)
Unify DLLPOSTFIX value on all platforms.
There is no justification for changing some shared library file names depending on the platform used.
Diffstat (limited to 'solenv/inc')
-rw-r--r--solenv/inc/settings.mk2
-rw-r--r--solenv/inc/unxaigppc.mk1
-rw-r--r--solenv/inc/unxaixp.mk4
-rw-r--r--solenv/inc/unxandr.mk1
-rw-r--r--solenv/inc/unxdfly.mk3
-rw-r--r--solenv/inc/unxfbsdi.mk3
-rw-r--r--solenv/inc/unxfbsdx.mk2
-rw-r--r--solenv/inc/unxiosr.mk1
-rw-r--r--solenv/inc/unxlnga.mk1
-rw-r--r--solenv/inc/unxlngaxp.mk1
-rw-r--r--solenv/inc/unxlnghppa.mk1
-rw-r--r--solenv/inc/unxlngi.mk1
-rw-r--r--solenv/inc/unxlngm68k.mk1
-rw-r--r--solenv/inc/unxlngmips.mk1
-rw-r--r--solenv/inc/unxlngppc.mk1
-rw-r--r--solenv/inc/unxlngr.mk1
-rw-r--r--solenv/inc/unxlngs.mk1
-rw-r--r--solenv/inc/unxlngs390.mk1
-rw-r--r--solenv/inc/unxlngx.mk1
-rw-r--r--solenv/inc/unxmacx.mk2
-rw-r--r--solenv/inc/unxmacxi.mk2
-rw-r--r--solenv/inc/unxmacxp.mk2
-rw-r--r--solenv/inc/unxnbsd.mk3
-rw-r--r--solenv/inc/unxobsd.mk3
-rw-r--r--solenv/inc/unxsogi.mk1
-rw-r--r--solenv/inc/unxsogs.mk1
-rw-r--r--solenv/inc/unxsoli4.mk2
-rw-r--r--solenv/inc/unxsols4.mk2
-rw-r--r--solenv/inc/unxsolu4.mk2
-rw-r--r--solenv/inc/wntgcci.mk1
-rw-r--r--solenv/inc/wntmsc.mk5
31 files changed, 3 insertions, 51 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 04dfd3490387..e6e6f7659889 100644
--- 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
diff --git a/solenv/inc/unxaigppc.mk b/solenv/inc/unxaigppc.mk
index 0a93729acfd2..240aa9c03b09 100644
--- 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:=
diff --git a/solenv/inc/unxaixp.mk b/solenv/inc/unxaixp.mk
index 571cee1053c6..be35f438378d 100644
--- 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
diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk
index 25d1dbaef30b..070db53af6c9 100644
--- 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
diff --git a/solenv/inc/unxdfly.mk b/solenv/inc/unxdfly.mk
index 601f30729d26..55b331630b9f 100644
--- 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
diff --git a/solenv/inc/unxfbsdi.mk b/solenv/inc/unxfbsdi.mk
index c1227a35f2d3..c01fc21fbb2d 100644
--- 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
diff --git a/solenv/inc/unxfbsdx.mk b/solenv/inc/unxfbsdx.mk
index 4a8e120d318e..6fb0641d94d3 100644
--- 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
diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk
index 13b2ee1ae765..a218f4e28675 100644
--- 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
diff --git a/solenv/inc/unxlnga.mk b/solenv/inc/unxlnga.mk
index da5d2fcd3d38..e7882f3a905a 100644
--- a/solenv/inc/unxlnga.mk
+++ b/solenv/inc/unxlnga.mk
@@ -29,5 +29,4 @@
.INCLUDE : unxlng.mk
CFLAGS+=-DIA64
-DLLPOSTFIX=la
BUILD64=1
diff --git a/solenv/inc/unxlngaxp.mk b/solenv/inc/unxlngaxp.mk
index f008ff3311e5..fdeb932f2264 100644
--- 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
diff --git a/solenv/inc/unxlnghppa.mk b/solenv/inc/unxlnghppa.mk
index 7ae2d25c332e..41a428e31689 100644
--- a/solenv/inc/unxlnghppa.mk
+++ b/solenv/inc/unxlnghppa.mk
@@ -32,4 +32,3 @@ CDEFS+=-DHPPA
CFLAGS+=
CFLAGSCC+=
CFLAGSCXX+=
-DLLPOSTFIX=lh
diff --git a/solenv/inc/unxlngi.mk b/solenv/inc/unxlngi.mk
index 8c6c540e86bc..79c255c326a2 100644
--- 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
diff --git a/solenv/inc/unxlngm68k.mk b/solenv/inc/unxlngm68k.mk
index da6ed55d8cfd..b6a018a10a1d 100644
--- 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
diff --git a/solenv/inc/unxlngmips.mk b/solenv/inc/unxlngmips.mk
index 53c927d10b32..783305d6c9d1 100644
--- a/solenv/inc/unxlngmips.mk
+++ b/solenv/inc/unxlngmips.mk
@@ -30,4 +30,3 @@
CDEFAULTOPT=-Os
.INCLUDE : unxlng.mk
CDEFS+=-DMIPS
-DLLPOSTFIX=lm
diff --git a/solenv/inc/unxlngppc.mk b/solenv/inc/unxlngppc.mk
index 89b2501bf366..af528d96ee94 100644
--- 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
diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk
index 1bcbb6626219..81ee90ca4f0e 100644
--- 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
diff --git a/solenv/inc/unxlngs.mk b/solenv/inc/unxlngs.mk
index b4e6f5f58f4d..390244f31d6c 100644
--- 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
diff --git a/solenv/inc/unxlngs390.mk b/solenv/inc/unxlngs390.mk
index 47e2e37011e8..0eac39af0b9d 100644
--- 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
diff --git a/solenv/inc/unxlngx.mk b/solenv/inc/unxlngx.mk
index 414f15d0dc92..9c89eddefad9 100644
--- a/solenv/inc/unxlngx.mk
+++ b/solenv/inc/unxlngx.mk
@@ -29,5 +29,4 @@
.INCLUDE : unxlng.mk
CDEFS+=-DX86_64
-DLLPOSTFIX=lx
BUILD64=1
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 99beaa797626..c862f948b571 100644
--- 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=
diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk
index ed048403c2a3..1e620f34407b 100644
--- 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)"!=""
diff --git a/solenv/inc/unxmacxp.mk b/solenv/inc/unxmacxp.mk
index 28b2881962de..805563a7fe14 100644
--- 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
diff --git a/solenv/inc/unxnbsd.mk b/solenv/inc/unxnbsd.mk
index 6b8d2563bbcb..b7d5e042e6fd 100644
--- 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
diff --git a/solenv/inc/unxobsd.mk b/solenv/inc/unxobsd.mk
index d700614d757a..fd4c744bf9ef 100644
--- 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
diff --git a/solenv/inc/unxsogi.mk b/solenv/inc/unxsogi.mk
index 06bb68eba5c9..1991089709f9 100644
--- a/solenv/inc/unxsogi.mk
+++ b/solenv/inc/unxsogi.mk
@@ -128,6 +128,5 @@ RCLINK=
RCLINKFLAGS=
RCSETVERSION=
-DLLPOSTFIX=sogi
DLLPRE=lib
DLLPOST=.so
diff --git a/solenv/inc/unxsogs.mk b/solenv/inc/unxsogs.mk
index 7136621eeeb7..5400be270e9b 100644
--- a/solenv/inc/unxsogs.mk
+++ b/solenv/inc/unxsogs.mk
@@ -127,6 +127,5 @@ RCLINK=
RCLINKFLAGS=
RCSETVERSION=
-DLLPOSTFIX=sogs
DLLPRE=lib
DLLPOST=.so
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index 522425ed994e..a14da5da1a26 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -216,8 +216,6 @@ RCLINK=
RCLINKFLAGS=
RCSETVERSION=
-DLLPOSTFIX=si
-
DLLPRE=lib
DLLPOST=.so
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index 5918196e5e06..11b6f15473aa 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -222,8 +222,6 @@ RCLINK=
RCLINKFLAGS=
RCSETVERSION=
-DLLPOSTFIX=ss
-
DLLPRE=lib
DLLPOST=.so
diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk
index b79a33e73674..76da3103880a 100644
--- a/solenv/inc/unxsolu4.mk
+++ b/solenv/inc/unxsolu4.mk
@@ -215,8 +215,6 @@ RCLINK=
RCLINKFLAGS=
RCSETVERSION=
-DLLPOSTFIX=su
-
DLLPRE=lib
DLLPOST=.so
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index 0fb5695811fa..2622ca6b1927 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -172,7 +172,6 @@ RCLINK=
RCLINKFLAGS=
RCSETVERSION=
-DLLPOSTFIX=gi
PCHPOST=.gch
ADVAPI32LIB=-ladvapi32
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 8660eb4fe1cb..9aca574b0873 100644
--- 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