Hi, The attached patch gets rid of many definitions of DLLPOSTFIX. With this change, shared library file names will be the same on all platforms.
-- Francois Tigeot
>From dd00beebf1abf8f4a1c04169b99dc97adc2aee2d Mon Sep 17 00:00:00 2001 From: Francois Tigeot <ftig...@wolfpond.org> Date: Wed, 1 Jun 2011 08:40:48 +0200 Subject: [PATCH] Unify DLLPOSTFIX value on all platforms. There is no justification for changing some shared library file names depending on the platform used. --- solenv/gbuild/gbuild.mk | 2 ++ solenv/gbuild/platform/dragonfly.mk | 1 - solenv/gbuild/platform/freebsd.mk | 1 - solenv/gbuild/platform/linux-ARM.mk | 1 - solenv/gbuild/platform/linux-AXP.mk | 1 - solenv/gbuild/platform/linux-GODSON.mk | 1 - solenv/gbuild/platform/linux-HPPA.mk | 1 - solenv/gbuild/platform/linux-IA64.mk | 1 - solenv/gbuild/platform/linux-INTEL.mk | 1 - solenv/gbuild/platform/linux-M68K.mk | 1 - solenv/gbuild/platform/linux-POWERPC.mk | 1 - solenv/gbuild/platform/linux-S390.mk | 1 - solenv/gbuild/platform/linux-SPARC.mk | 1 - solenv/gbuild/platform/linux-X86_64.mk | 1 - solenv/gbuild/platform/netbsd.mk | 1 - solenv/gbuild/platform/openbsd.mk | 1 - solenv/inc/settings.mk | 2 ++ solenv/inc/unxaigppc.mk | 1 - solenv/inc/unxaixp.mk | 4 ---- solenv/inc/unxandr.mk | 1 - solenv/inc/unxdfly.mk | 3 --- solenv/inc/unxfbsdi.mk | 3 --- solenv/inc/unxfbsdx.mk | 2 -- solenv/inc/unxiosr.mk | 1 - solenv/inc/unxlnga.mk | 1 - solenv/inc/unxlngaxp.mk | 1 - solenv/inc/unxlnghppa.mk | 1 - solenv/inc/unxlngi.mk | 1 - solenv/inc/unxlngm68k.mk | 1 - solenv/inc/unxlngmips.mk | 1 - solenv/inc/unxlngppc.mk | 1 - solenv/inc/unxlngr.mk | 1 - solenv/inc/unxlngs.mk | 1 - solenv/inc/unxlngs390.mk | 1 - solenv/inc/unxlngx.mk | 1 - solenv/inc/unxmacx.mk | 2 +- solenv/inc/unxmacxi.mk | 2 -- solenv/inc/unxmacxp.mk | 2 -- solenv/inc/unxnbsd.mk | 3 --- solenv/inc/unxobsd.mk | 3 --- solenv/inc/unxsogi.mk | 1 - solenv/inc/unxsogs.mk | 1 - solenv/inc/unxsoli4.mk | 2 -- solenv/inc/unxsols4.mk | 2 -- solenv/inc/unxsolu4.mk | 2 -- solenv/inc/wntgcci.mk | 1 - solenv/inc/wntmsc.mk | 5 ----- 47 files changed, 5 insertions(+), 66 deletions(-) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 9943b33..b62847b 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -169,6 +169,8 @@ else $(eval $(call gb_Output_error,Unsupported OS: $(OS))) endif +gb_Library_DLLPOSTFIX := lo + include $(GBUILDDIR)/Tempfile.mk include $(foreach repo,$(gb_REPOS),$(repo)/RepositoryFixes.mk) diff --git a/solenv/gbuild/platform/dragonfly.mk b/solenv/gbuild/platform/dragonfly.mk index 3aa047a..591b47b 100644 --- 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 diff --git a/solenv/gbuild/platform/freebsd.mk b/solenv/gbuild/platform/freebsd.mk index 6ec9704..39cce14 100644 --- 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 diff --git a/solenv/gbuild/platform/linux-ARM.mk b/solenv/gbuild/platform/linux-ARM.mk index 0bc41cb..df39d54 100644 --- 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 diff --git a/solenv/gbuild/platform/linux-AXP.mk b/solenv/gbuild/platform/linux-AXP.mk index 5fc7c67..ebf88fb 100644 --- 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 diff --git a/solenv/gbuild/platform/linux-GODSON.mk b/solenv/gbuild/platform/linux-GODSON.mk index 0fe6e8c..0f17660 100644 --- 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 diff --git a/solenv/gbuild/platform/linux-HPPA.mk b/solenv/gbuild/platform/linux-HPPA.mk index 13d83ab..ad5fba8 100644 --- 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 diff --git a/solenv/gbuild/platform/linux-IA64.mk b/solenv/gbuild/platform/linux-IA64.mk index 0aaf292..9eba1ff 100644 --- 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 diff --git a/solenv/gbuild/platform/linux-INTEL.mk b/solenv/gbuild/platform/linux-INTEL.mk index 5bff1cb..0bf0267 100644 --- 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 diff --git a/solenv/gbuild/platform/linux-M68K.mk b/solenv/gbuild/platform/linux-M68K.mk index 40c100c..670a331 100644 --- 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 diff --git a/solenv/gbuild/platform/linux-POWERPC.mk b/solenv/gbuild/platform/linux-POWERPC.mk index 35e1e96..ba730c9 100644 --- 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 diff --git a/solenv/gbuild/platform/linux-S390.mk b/solenv/gbuild/platform/linux-S390.mk index 410038e..983c94a 100644 --- 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 diff --git a/solenv/gbuild/platform/linux-SPARC.mk b/solenv/gbuild/platform/linux-SPARC.mk index 88343d6..2472d5e 100644 --- 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 diff --git a/solenv/gbuild/platform/linux-X86_64.mk b/solenv/gbuild/platform/linux-X86_64.mk index 654ced4..9eba1ff 100644 --- 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 diff --git a/solenv/gbuild/platform/netbsd.mk b/solenv/gbuild/platform/netbsd.mk index b162baf..081cff8 100644 --- 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 diff --git a/solenv/gbuild/platform/openbsd.mk b/solenv/gbuild/platform/openbsd.mk index d82a54d..187c207 100644 --- 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 diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 04dfd34..e6e6f76 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 0a93729..240aa9c 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 571cee1..be35f43 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 25d1dba..070db53 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 601f307..55b3316 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 c1227a3..c01fc21 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 4a8e120..6fb0641 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 13b2ee1..a218f4e 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 da5d2fc..e7882f3 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 f008ff3..fdeb932 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 7ae2d25..41a428e 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 8c6c540..79c255c 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 da6ed55..b6a018a 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 53c927d..783305d 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 89b2501..af528d9 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 1bcbb66..81ee90c 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 b4e6f5f..390244f 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 47e2e37..0eac39a 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 414f15d..9c89edd 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 99beaa7..c862f94 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 ed04840..1e620f3 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 28b2881..805563a 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 6b8d256..b7d5e04 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 d700614..fd4c744 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 06bb68e..1991089 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 7136621..5400be2 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 522425e..a14da5d 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 5918196..11b6f15 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 b79a33e..76da310 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 0fb5695..2622ca6 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 8660eb4..9aca574 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 -- 1.7.4.1
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice