From 3d6d07a7e34e0e767c653008c0eb16ce7ffe5f19 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 16 Jan 2013 16:28:20 +0200 Subject: Get rid of GetVersionInfo and checkdll With gbuildification neither was actually used anyway, as far as I could see. Change-Id: I00d914e6571aed3110226f91ac1685a838031c65 --- Repository.mk | 1 - mysqlc/source/makefile.mk | 3 - salhelper/test/rtti/sols.map | 1 - shell/source/mingw_intel.map | 1 - solenv/bin/checkdll.sh | 94 -------- solenv/inc/_tg_def.mk | 40 ---- solenv/inc/_tg_shl.mk | 410 +++++------------------------------ solenv/inc/tg_def.mk | 4 - solenv/inc/tg_shl.mk | 41 +--- solenv/inc/tg_wntx64.mk | 30 +-- solenv/src/version.c | 55 ----- soltools/Executable_checkdll.mk | 28 --- soltools/Module_soltools.mk | 6 - soltools/checkdll/checkdll.c | 89 -------- xmerge/source/activesync/exports.map | 1 - 15 files changed, 70 insertions(+), 734 deletions(-) delete mode 100755 solenv/bin/checkdll.sh delete mode 100644 solenv/src/version.c delete mode 100644 soltools/Executable_checkdll.mk delete mode 100644 soltools/checkdll/checkdll.c diff --git a/Repository.mk b/Repository.mk index fc1e38b88a33..133bbfee1f44 100644 --- a/Repository.mk +++ b/Repository.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \ bmp \ bmpsum \ cfgex \ - checkdll \ cpp \ cppunit/cppunittester \ g2g \ diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk index 63c86df97829..1ee4c87eab29 100644 --- a/mysqlc/source/makefile.mk +++ b/mysqlc/source/makefile.mk @@ -104,9 +104,6 @@ CDEFS += -DCPPCONN_LIB=\"$(DLLPRE)mysqlcppconn$(DLLPOST)\" .ELSE MYSQL_LIBFILE=$(MYSQL_LIBDIR)$/$(DLLPRE)mysql$(DLLPOST).16 .ENDIF - - # checkdll will complain if we do not point it to the libmysql lib - EXTRALIBPATHS=-L$(MYSQL_LIBDIR) .ENDIF .IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES" diff --git a/salhelper/test/rtti/sols.map b/salhelper/test/rtti/sols.map index 955e810937e4..b4b9cf95ac15 100644 --- a/salhelper/test/rtti/sols.map +++ b/salhelper/test/rtti/sols.map @@ -17,7 +17,6 @@ # UDK_3_0_0 { global: -GetVersionInfo; _fini; _init; diff --git a/shell/source/mingw_intel.map b/shell/source/mingw_intel.map index ab0eb928d46d..3b46742fcec2 100644 --- a/shell/source/mingw_intel.map +++ b/shell/source/mingw_intel.map @@ -18,7 +18,6 @@ UDK_3_0_0 { # should have been UDK_3.0 global: - GetVersionInfo; _ZN9salhelper18ORealDynamicLoader11newInstanceEPPS0_RKN3rtl8OUStringES6_; _ZN9salhelper18ORealDynamicLoader7acquireEv; _ZN9salhelper18ORealDynamicLoader7releaseEv; diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh deleted file mode 100755 index e2de5481e581..000000000000 --- a/solenv/bin/checkdll.sh +++ /dev/null @@ -1,94 +0,0 @@ -#! /bin/sh -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -# checkdll.sh - execute checkdll with all -L arguments to this script -# prepended to LD_LIBRARY_PATH - -set -- `getopt "L:" "$@"` || { - echo "Usage: `basename $0` [-L library_path] " 1>&2 - exit 1 -} - -checkdll="$SOLARVERSION/$INPATH/bin/checkdll" - -if [ -x $checkdll ]; then - while : - do - case $1 in - -L) shift; option=$1;; - --) break;; - esac - case "${libpath:+X}" in - X) libpath=$libpath:$option;; - *) libpath=$option;; - esac - shift - done - shift # remove the trailing --- - - case `uname -s` in - Darwin) case "${DYLD_LIBRARY_PATH:+X}" in - X) DYLD_LIBRARY_PATH=$libpath:$DYLD_LIBRARY_PATH;; - *) DYLD_LIBRARY_PATH=$libpath;; - esac - export DYLD_LIBRARY_PATH;; - AIX) case "${LIBPATH:+X}" in - X) LIBPATH=$libpath:$LIBPATH;; - *) LIBPATH=$libpath;; - esac - export LIBPATH;; - *) case "${LD_LIBRARY_PATH:+X}" in - X) LD_LIBRARY_PATH=$libpath:$LD_LIBRARY_PATH;; - *) LD_LIBRARY_PATH=$libpath;; - esac - export LD_LIBRARY_PATH;; - esac - - $checkdll "$@" - if [ $? -ne 0 ]; then exit 1 ; fi - - for parameter in $*; do - library=$parameter; - done - realname=`echo $library | sed "s/check_//"` - if [ $library != $realname ]; then - LD_LIBRARY_PATH= - export LD_LIBRARY_PATH - mv $library $realname - fi -else - for parameter in $*; do - library=$parameter; - done - realname=`echo $library | sed "s/check_//"` - if [ $library != $realname ]; then - mv $library $realname - fi -fi - -exit 0 - diff --git a/solenv/inc/_tg_def.mk b/solenv/inc/_tg_def.mk index 38e9ddaa4c01..79752bec249a 100644 --- a/solenv/inc/_tg_def.mk +++ b/solenv/inc/_tg_def.mk @@ -63,10 +63,6 @@ $(DEF1TARGETN) .PHONY : $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile .ENDIF $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile -.ENDIF .IF "$(DEFLIB1NAME)"!="" .IF "$(COM)"=="GCC" $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL1TARGET).exp @@ -232,10 +228,6 @@ $(DEF2TARGETN) .PHONY : $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile .ENDIF $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile -.ENDIF .IF "$(DEFLIB2NAME)"!="" .IF "$(COM)"=="GCC" $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL2TARGET).exp @@ -401,10 +393,6 @@ $(DEF3TARGETN) .PHONY : $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile .ENDIF $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile -.ENDIF .IF "$(DEFLIB3NAME)"!="" .IF "$(COM)"=="GCC" $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL3TARGET).exp @@ -570,10 +558,6 @@ $(DEF4TARGETN) .PHONY : $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile .ENDIF $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile -.ENDIF .IF "$(DEFLIB4NAME)"!="" .IF "$(COM)"=="GCC" $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL4TARGET).exp @@ -739,10 +723,6 @@ $(DEF5TARGETN) .PHONY : $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile .ENDIF $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile -.ENDIF .IF "$(DEFLIB5NAME)"!="" .IF "$(COM)"=="GCC" $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL5TARGET).exp @@ -908,10 +888,6 @@ $(DEF6TARGETN) .PHONY : $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile .ENDIF $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile -.ENDIF .IF "$(DEFLIB6NAME)"!="" .IF "$(COM)"=="GCC" $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL6TARGET).exp @@ -1077,10 +1053,6 @@ $(DEF7TARGETN) .PHONY : $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile .ENDIF $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile -.ENDIF .IF "$(DEFLIB7NAME)"!="" .IF "$(COM)"=="GCC" $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL7TARGET).exp @@ -1246,10 +1218,6 @@ $(DEF8TARGETN) .PHONY : $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile .ENDIF $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile -.ENDIF .IF "$(DEFLIB8NAME)"!="" .IF "$(COM)"=="GCC" $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL8TARGET).exp @@ -1415,10 +1383,6 @@ $(DEF9TARGETN) .PHONY : $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile .ENDIF $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile -.ENDIF .IF "$(DEFLIB9NAME)"!="" .IF "$(COM)"=="GCC" $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL9TARGET).exp @@ -1584,10 +1548,6 @@ $(DEF10TARGETN) .PHONY : $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile .ENDIF $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile -.ENDIF .IF "$(DEFLIB10NAME)"!="" .IF "$(COM)"=="GCC" $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL10TARGET).exp diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk index 6c51ec4f87a2..d11330f7ae9b 100644 --- a/solenv/inc/_tg_shl.mk +++ b/solenv/inc/_tg_shl.mk @@ -34,26 +34,6 @@ EXTRALIBPATHS1=$(EXTRALIBPATHS) EXTRALIBPATHS1+=-L$(SOLAR_STLLIBPATH) .ENDIF .ENDIF # "$(SHL1NOCHECK)"!="" -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -.IF "$(L10N_framework)"=="" -.IF "$(VERSIONOBJ)"!="" -SHL1VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL1TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)/$(SHL1VERSIONOBJ:b).h -.IF "$(OS)" != "WNT" -SHL1VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL1TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) -.ELSE # "$(OS)" != "WNT" -SHL1VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL1TARGET))}$(VERSIONOBJ:f) -.ENDIF # "$(OS)" != "WNT" -$(MISC)/$(SHL1VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL1VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)/src/version.c $@ - $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ:b).h/ > $@ - -.INIT : $(SHL1VERSIONOBJDEP) -.ENDIF # "$(VERSIONOBJ)"!="" -.ENDIF .IF "$(OS)" == "WNT" .IF "$(OS)" == "WNT" @@ -288,7 +268,7 @@ $(SHL1TARGETN) : \ $(SHL1DEF) \ $(USE_1IMPLIB) \ $(STDOBJ) \ - $(SHL1VERSIONOBJ) $(SHL1OBJS) \ + $(SHL1OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL1LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL1STDLIBS) -Wl,--end-group \ $(SHL1STDSHL) $(STDSHL1) \ @@ -310,7 +290,7 @@ $(SHL1TARGETN) : \ $(SHL1DEF) \ $(USE_1IMPLIB) \ $(STDOBJ) \ - $(SHL1VERSIONOBJ) $(SHL1OBJS) \ + $(SHL1OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL1LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL1STDLIBS) -Wl,--end-group \ $(SHL1STDSHL) $(STDSHL1) \ @@ -330,7 +310,7 @@ $(SHL1TARGETN) : \ -def:$(SHL1DEF) \ $(USE_1IMPLIB) \ $(STDOBJ) \ - $(SHL1VERSIONOBJ) $(SHL1OBJS) \ + $(SHL1OBJS) \ $(SHL1LIBS) \ $(SHL1STDLIBS) \ $(SHL1STDSHL) $(STDSHL1) \ @@ -354,7 +334,7 @@ $(SHL1TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(LB)/$(SHL1IMPLIB).exp \ $(STDOBJ) \ - $(SHL1OBJS) $(SHL1VERSIONOBJ) \ + $(SHL1OBJS) \ $(SHL1LIBS) \ $(SHL1STDLIBS) \ $(SHL1STDSHL) $(STDSHL1) \ @@ -379,7 +359,7 @@ $(SHL1TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(USE_1IMPLIB) \ $(STDOBJ) \ - $(SHL1OBJS) $(SHL1VERSIONOBJ)) \ + $(SHL1OBJS) ) \ $(SHL1LIBS) \ @$(mktmp $(SHL1STDLIBS) \ $(SHL1STDSHL) $(STDSHL1) \ @@ -429,7 +409,6 @@ $(SHL1TARGETN) : \ @-$(RM) $(MISC)/$(@:b).list @-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd @echo $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \ - $(SHL1VERSIONOBJ) \ `cat /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list @/bin/echo -n $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_1.cmd @@ -446,16 +425,13 @@ $(SHL1TARGETN) : \ @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ .ENDIF # "$(SHL1CREATEJNILIB)"!="" -.IF "$(SHL1NOCHECK)"=="" - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN) -.ENDIF # "$(SHL1NOCHECK)"!="" .ELIF "$(DISABLE_DYNLOADING)"=="TRUE" $(COMMAND_ECHO)$(AR) $(LIB1FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL1OBJS)) $(shell cat /dev/null $(LIB1TARGET) $(SHL1LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g) $(COMMAND_ECHO)$(RANLIB) $@ .ELSE # "$(OS)"=="MACOSX" @-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd @echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \ - $(SHL1VERSIONOBJ) -o $@ \ + -o $@ \ `cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_1.cmd .IF "$(VERBOSE)" == "TRUE" @@ -465,11 +441,6 @@ $(SHL1TARGETN) : \ .IF "$(SHL1NOCHECK)"=="" $(COMMAND_ECHO)-$(RM) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f) $(COMMAND_ECHO)$(RENAME) $(SHL1TARGETN) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f) -.IF "$(VERBOSE)"=="TRUE" - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f) -.ELSE - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) -- -s $(SHL1TARGETN:d)check_$(SHL1TARGETN:f) -.ENDIF .ENDIF # "$(SHL1NOCHECK)"!="" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" @@ -519,26 +490,6 @@ EXTRALIBPATHS2=$(EXTRALIBPATHS) EXTRALIBPATHS2+=-L$(SOLAR_STLLIBPATH) .ENDIF .ENDIF # "$(SHL2NOCHECK)"!="" -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -.IF "$(L10N_framework)"=="" -.IF "$(VERSIONOBJ)"!="" -SHL2VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL2TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)/$(SHL2VERSIONOBJ:b).h -.IF "$(OS)" != "WNT" -SHL2VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL2TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) -.ELSE # "$(OS)" != "WNT" -SHL2VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL2TARGET))}$(VERSIONOBJ:f) -.ENDIF # "$(OS)" != "WNT" -$(MISC)/$(SHL2VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL2VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)/src/version.c $@ - $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ:b).h/ > $@ - -.INIT : $(SHL2VERSIONOBJDEP) -.ENDIF # "$(VERSIONOBJ)"!="" -.ENDIF .IF "$(OS)" == "WNT" .IF "$(OS)" == "WNT" @@ -773,7 +724,7 @@ $(SHL2TARGETN) : \ $(SHL2DEF) \ $(USE_2IMPLIB) \ $(STDOBJ) \ - $(SHL2VERSIONOBJ) $(SHL2OBJS) \ + $(SHL2OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL2LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL2STDLIBS) -Wl,--end-group \ $(SHL2STDSHL) $(STDSHL2) \ @@ -795,7 +746,7 @@ $(SHL2TARGETN) : \ $(SHL2DEF) \ $(USE_2IMPLIB) \ $(STDOBJ) \ - $(SHL2VERSIONOBJ) $(SHL2OBJS) \ + $(SHL2OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL2LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL2STDLIBS) -Wl,--end-group \ $(SHL2STDSHL) $(STDSHL2) \ @@ -815,7 +766,7 @@ $(SHL2TARGETN) : \ -def:$(SHL2DEF) \ $(USE_2IMPLIB) \ $(STDOBJ) \ - $(SHL2VERSIONOBJ) $(SHL2OBJS) \ + $(SHL2OBJS) \ $(SHL2LIBS) \ $(SHL2STDLIBS) \ $(SHL2STDSHL) $(STDSHL2) \ @@ -839,7 +790,7 @@ $(SHL2TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(LB)/$(SHL2IMPLIB).exp \ $(STDOBJ) \ - $(SHL2OBJS) $(SHL2VERSIONOBJ) \ + $(SHL2OBJS) \ $(SHL2LIBS) \ $(SHL2STDLIBS) \ $(SHL2STDSHL) $(STDSHL2) \ @@ -864,7 +815,7 @@ $(SHL2TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(USE_2IMPLIB) \ $(STDOBJ) \ - $(SHL2OBJS) $(SHL2VERSIONOBJ)) \ + $(SHL2OBJS) ) \ $(SHL2LIBS) \ @$(mktmp $(SHL2STDLIBS) \ $(SHL2STDSHL) $(STDSHL2) \ @@ -914,7 +865,6 @@ $(SHL2TARGETN) : \ @-$(RM) $(MISC)/$(@:b).list @-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd @echo $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \ - $(SHL2VERSIONOBJ) \ `cat /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list @/bin/echo -n $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_2.cmd @@ -931,16 +881,13 @@ $(SHL2TARGETN) : \ @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ .ENDIF # "$(SHL2CREATEJNILIB)"!="" -.IF "$(SHL2NOCHECK)"=="" - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN) -.ENDIF # "$(SHL2NOCHECK)"!="" .ELIF "$(DISABLE_DYNLOADING)"=="TRUE" $(COMMAND_ECHO)$(AR) $(LIB2FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL2OBJS)) $(shell cat /dev/null $(LIB2TARGET) $(SHL2LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g) $(COMMAND_ECHO)$(RANLIB) $@ .ELSE # "$(OS)"=="MACOSX" @-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd @echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \ - $(SHL2VERSIONOBJ) -o $@ \ + -o $@ \ `cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_2.cmd .IF "$(VERBOSE)" == "TRUE" @@ -950,11 +897,6 @@ $(SHL2TARGETN) : \ .IF "$(SHL2NOCHECK)"=="" $(COMMAND_ECHO)-$(RM) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f) $(COMMAND_ECHO)$(RENAME) $(SHL2TARGETN) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f) -.IF "$(VERBOSE)"=="TRUE" - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f) -.ELSE - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) -- -s $(SHL2TARGETN:d)check_$(SHL2TARGETN:f) -.ENDIF .ENDIF # "$(SHL2NOCHECK)"!="" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" @@ -1004,26 +946,6 @@ EXTRALIBPATHS3=$(EXTRALIBPATHS) EXTRALIBPATHS3+=-L$(SOLAR_STLLIBPATH) .ENDIF .ENDIF # "$(SHL3NOCHECK)"!="" -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -.IF "$(L10N_framework)"=="" -.IF "$(VERSIONOBJ)"!="" -SHL3VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL3TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)/$(SHL3VERSIONOBJ:b).h -.IF "$(OS)" != "WNT" -SHL3VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL3TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) -.ELSE # "$(OS)" != "WNT" -SHL3VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL3TARGET))}$(VERSIONOBJ:f) -.ENDIF # "$(OS)" != "WNT" -$(MISC)/$(SHL3VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL3VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)/src/version.c $@ - $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL3VERSIONOBJ:b).h/ > $@ - -.INIT : $(SHL3VERSIONOBJDEP) -.ENDIF # "$(VERSIONOBJ)"!="" -.ENDIF .IF "$(OS)" == "WNT" .IF "$(OS)" == "WNT" @@ -1258,7 +1180,7 @@ $(SHL3TARGETN) : \ $(SHL3DEF) \ $(USE_3IMPLIB) \ $(STDOBJ) \ - $(SHL3VERSIONOBJ) $(SHL3OBJS) \ + $(SHL3OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL3LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL3STDLIBS) -Wl,--end-group \ $(SHL3STDSHL) $(STDSHL3) \ @@ -1280,7 +1202,7 @@ $(SHL3TARGETN) : \ $(SHL3DEF) \ $(USE_3IMPLIB) \ $(STDOBJ) \ - $(SHL3VERSIONOBJ) $(SHL3OBJS) \ + $(SHL3OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL3LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL3STDLIBS) -Wl,--end-group \ $(SHL3STDSHL) $(STDSHL3) \ @@ -1300,7 +1222,7 @@ $(SHL3TARGETN) : \ -def:$(SHL3DEF) \ $(USE_3IMPLIB) \ $(STDOBJ) \ - $(SHL3VERSIONOBJ) $(SHL3OBJS) \ + $(SHL3OBJS) \ $(SHL3LIBS) \ $(SHL3STDLIBS) \ $(SHL3STDSHL) $(STDSHL3) \ @@ -1324,7 +1246,7 @@ $(SHL3TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(LB)/$(SHL3IMPLIB).exp \ $(STDOBJ) \ - $(SHL3OBJS) $(SHL3VERSIONOBJ) \ + $(SHL3OBJS) \ $(SHL3LIBS) \ $(SHL3STDLIBS) \ $(SHL3STDSHL) $(STDSHL3) \ @@ -1349,7 +1271,7 @@ $(SHL3TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(USE_3IMPLIB) \ $(STDOBJ) \ - $(SHL3OBJS) $(SHL3VERSIONOBJ)) \ + $(SHL3OBJS) ) \ $(SHL3LIBS) \ @$(mktmp $(SHL3STDLIBS) \ $(SHL3STDSHL) $(STDSHL3) \ @@ -1399,7 +1321,6 @@ $(SHL3TARGETN) : \ @-$(RM) $(MISC)/$(@:b).list @-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd @echo $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \ - $(SHL3VERSIONOBJ) \ `cat /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list @/bin/echo -n $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_3.cmd @@ -1416,16 +1337,13 @@ $(SHL3TARGETN) : \ @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ .ENDIF # "$(SHL3CREATEJNILIB)"!="" -.IF "$(SHL3NOCHECK)"=="" - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN) -.ENDIF # "$(SHL3NOCHECK)"!="" .ELIF "$(DISABLE_DYNLOADING)"=="TRUE" $(COMMAND_ECHO)$(AR) $(LIB3FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL3OBJS)) $(shell cat /dev/null $(LIB3TARGET) $(SHL3LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g) $(COMMAND_ECHO)$(RANLIB) $@ .ELSE # "$(OS)"=="MACOSX" @-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd @echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \ - $(SHL3VERSIONOBJ) -o $@ \ + -o $@ \ `cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_3.cmd .IF "$(VERBOSE)" == "TRUE" @@ -1435,11 +1353,6 @@ $(SHL3TARGETN) : \ .IF "$(SHL3NOCHECK)"=="" $(COMMAND_ECHO)-$(RM) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f) $(COMMAND_ECHO)$(RENAME) $(SHL3TARGETN) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f) -.IF "$(VERBOSE)"=="TRUE" - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f) -.ELSE - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) -- -s $(SHL3TARGETN:d)check_$(SHL3TARGETN:f) -.ENDIF .ENDIF # "$(SHL3NOCHECK)"!="" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" @@ -1489,26 +1402,6 @@ EXTRALIBPATHS4=$(EXTRALIBPATHS) EXTRALIBPATHS4+=-L$(SOLAR_STLLIBPATH) .ENDIF .ENDIF # "$(SHL4NOCHECK)"!="" -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -.IF "$(L10N_framework)"=="" -.IF "$(VERSIONOBJ)"!="" -SHL4VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL4TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)/$(SHL4VERSIONOBJ:b).h -.IF "$(OS)" != "WNT" -SHL4VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL4TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) -.ELSE # "$(OS)" != "WNT" -SHL4VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL4TARGET))}$(VERSIONOBJ:f) -.ENDIF # "$(OS)" != "WNT" -$(MISC)/$(SHL4VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL4VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)/src/version.c $@ - $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL4VERSIONOBJ:b).h/ > $@ - -.INIT : $(SHL4VERSIONOBJDEP) -.ENDIF # "$(VERSIONOBJ)"!="" -.ENDIF .IF "$(OS)" == "WNT" .IF "$(OS)" == "WNT" @@ -1743,7 +1636,7 @@ $(SHL4TARGETN) : \ $(SHL4DEF) \ $(USE_4IMPLIB) \ $(STDOBJ) \ - $(SHL4VERSIONOBJ) $(SHL4OBJS) \ + $(SHL4OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL4LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL4STDLIBS) -Wl,--end-group \ $(SHL4STDSHL) $(STDSHL4) \ @@ -1765,7 +1658,7 @@ $(SHL4TARGETN) : \ $(SHL4DEF) \ $(USE_4IMPLIB) \ $(STDOBJ) \ - $(SHL4VERSIONOBJ) $(SHL4OBJS) \ + $(SHL4OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL4LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL4STDLIBS) -Wl,--end-group \ $(SHL4STDSHL) $(STDSHL4) \ @@ -1785,7 +1678,7 @@ $(SHL4TARGETN) : \ -def:$(SHL4DEF) \ $(USE_4IMPLIB) \ $(STDOBJ) \ - $(SHL4VERSIONOBJ) $(SHL4OBJS) \ + $(SHL4OBJS) \ $(SHL4LIBS) \ $(SHL4STDLIBS) \ $(SHL4STDSHL) $(STDSHL4) \ @@ -1809,7 +1702,7 @@ $(SHL4TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(LB)/$(SHL4IMPLIB).exp \ $(STDOBJ) \ - $(SHL4OBJS) $(SHL4VERSIONOBJ) \ + $(SHL4OBJS) \ $(SHL4LIBS) \ $(SHL4STDLIBS) \ $(SHL4STDSHL) $(STDSHL4) \ @@ -1834,7 +1727,7 @@ $(SHL4TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(USE_4IMPLIB) \ $(STDOBJ) \ - $(SHL4OBJS) $(SHL4VERSIONOBJ)) \ + $(SHL4OBJS) ) \ $(SHL4LIBS) \ @$(mktmp $(SHL4STDLIBS) \ $(SHL4STDSHL) $(STDSHL4) \ @@ -1884,7 +1777,6 @@ $(SHL4TARGETN) : \ @-$(RM) $(MISC)/$(@:b).list @-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd @echo $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \ - $(SHL4VERSIONOBJ) \ `cat /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list @/bin/echo -n $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_4.cmd @@ -1901,16 +1793,13 @@ $(SHL4TARGETN) : \ @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ .ENDIF # "$(SHL4CREATEJNILIB)"!="" -.IF "$(SHL4NOCHECK)"=="" - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN) -.ENDIF # "$(SHL4NOCHECK)"!="" .ELIF "$(DISABLE_DYNLOADING)"=="TRUE" $(COMMAND_ECHO)$(AR) $(LIB4FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL4OBJS)) $(shell cat /dev/null $(LIB4TARGET) $(SHL4LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g) $(COMMAND_ECHO)$(RANLIB) $@ .ELSE # "$(OS)"=="MACOSX" @-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd @echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \ - $(SHL4VERSIONOBJ) -o $@ \ + -o $@ \ `cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_4.cmd .IF "$(VERBOSE)" == "TRUE" @@ -1920,11 +1809,6 @@ $(SHL4TARGETN) : \ .IF "$(SHL4NOCHECK)"=="" $(COMMAND_ECHO)-$(RM) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f) $(COMMAND_ECHO)$(RENAME) $(SHL4TARGETN) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f) -.IF "$(VERBOSE)"=="TRUE" - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f) -.ELSE - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) -- -s $(SHL4TARGETN:d)check_$(SHL4TARGETN:f) -.ENDIF .ENDIF # "$(SHL4NOCHECK)"!="" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" @@ -1974,26 +1858,6 @@ EXTRALIBPATHS5=$(EXTRALIBPATHS) EXTRALIBPATHS5+=-L$(SOLAR_STLLIBPATH) .ENDIF .ENDIF # "$(SHL5NOCHECK)"!="" -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -.IF "$(L10N_framework)"=="" -.IF "$(VERSIONOBJ)"!="" -SHL5VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL5TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)/$(SHL5VERSIONOBJ:b).h -.IF "$(OS)" != "WNT" -SHL5VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL5TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) -.ELSE # "$(OS)" != "WNT" -SHL5VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL5TARGET))}$(VERSIONOBJ:f) -.ENDIF # "$(OS)" != "WNT" -$(MISC)/$(SHL5VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL5VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)/src/version.c $@ - $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL5VERSIONOBJ:b).h/ > $@ - -.INIT : $(SHL5VERSIONOBJDEP) -.ENDIF # "$(VERSIONOBJ)"!="" -.ENDIF .IF "$(OS)" == "WNT" .IF "$(OS)" == "WNT" @@ -2228,7 +2092,7 @@ $(SHL5TARGETN) : \ $(SHL5DEF) \ $(USE_5IMPLIB) \ $(STDOBJ) \ - $(SHL5VERSIONOBJ) $(SHL5OBJS) \ + $(SHL5OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL5LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL5STDLIBS) -Wl,--end-group \ $(SHL5STDSHL) $(STDSHL5) \ @@ -2250,7 +2114,7 @@ $(SHL5TARGETN) : \ $(SHL5DEF) \ $(USE_5IMPLIB) \ $(STDOBJ) \ - $(SHL5VERSIONOBJ) $(SHL5OBJS) \ + $(SHL5OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL5LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL5STDLIBS) -Wl,--end-group \ $(SHL5STDSHL) $(STDSHL5) \ @@ -2270,7 +2134,7 @@ $(SHL5TARGETN) : \ -def:$(SHL5DEF) \ $(USE_5IMPLIB) \ $(STDOBJ) \ - $(SHL5VERSIONOBJ) $(SHL5OBJS) \ + $(SHL5OBJS) \ $(SHL5LIBS) \ $(SHL5STDLIBS) \ $(SHL5STDSHL) $(STDSHL5) \ @@ -2294,7 +2158,7 @@ $(SHL5TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(LB)/$(SHL5IMPLIB).exp \ $(STDOBJ) \ - $(SHL5OBJS) $(SHL5VERSIONOBJ) \ + $(SHL5OBJS) \ $(SHL5LIBS) \ $(SHL5STDLIBS) \ $(SHL5STDSHL) $(STDSHL5) \ @@ -2319,7 +2183,7 @@ $(SHL5TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(USE_5IMPLIB) \ $(STDOBJ) \ - $(SHL5OBJS) $(SHL5VERSIONOBJ)) \ + $(SHL5OBJS) ) \ $(SHL5LIBS) \ @$(mktmp $(SHL5STDLIBS) \ $(SHL5STDSHL) $(STDSHL5) \ @@ -2369,7 +2233,6 @@ $(SHL5TARGETN) : \ @-$(RM) $(MISC)/$(@:b).list @-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd @echo $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \ - $(SHL5VERSIONOBJ) \ `cat /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list @/bin/echo -n $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_5.cmd @@ -2386,16 +2249,13 @@ $(SHL5TARGETN) : \ @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ .ENDIF # "$(SHL5CREATEJNILIB)"!="" -.IF "$(SHL5NOCHECK)"=="" - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN) -.ENDIF # "$(SHL5NOCHECK)"!="" .ELIF "$(DISABLE_DYNLOADING)"=="TRUE" $(COMMAND_ECHO)$(AR) $(LIB5FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL5OBJS)) $(shell cat /dev/null $(LIB5TARGET) $(SHL5LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g) $(COMMAND_ECHO)$(RANLIB) $@ .ELSE # "$(OS)"=="MACOSX" @-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd @echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \ - $(SHL5VERSIONOBJ) -o $@ \ + -o $@ \ `cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_5.cmd .IF "$(VERBOSE)" == "TRUE" @@ -2405,11 +2265,6 @@ $(SHL5TARGETN) : \ .IF "$(SHL5NOCHECK)"=="" $(COMMAND_ECHO)-$(RM) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f) $(COMMAND_ECHO)$(RENAME) $(SHL5TARGETN) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f) -.IF "$(VERBOSE)"=="TRUE" - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f) -.ELSE - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) -- -s $(SHL5TARGETN:d)check_$(SHL5TARGETN:f) -.ENDIF .ENDIF # "$(SHL5NOCHECK)"!="" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" @@ -2459,26 +2314,6 @@ EXTRALIBPATHS6=$(EXTRALIBPATHS) EXTRALIBPATHS6+=-L$(SOLAR_STLLIBPATH) .ENDIF .ENDIF # "$(SHL6NOCHECK)"!="" -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -.IF "$(L10N_framework)"=="" -.IF "$(VERSIONOBJ)"!="" -SHL6VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL6TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)/$(SHL6VERSIONOBJ:b).h -.IF "$(OS)" != "WNT" -SHL6VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL6TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) -.ELSE # "$(OS)" != "WNT" -SHL6VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL6TARGET))}$(VERSIONOBJ:f) -.ENDIF # "$(OS)" != "WNT" -$(MISC)/$(SHL6VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL6VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)/src/version.c $@ - $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL6VERSIONOBJ:b).h/ > $@ - -.INIT : $(SHL6VERSIONOBJDEP) -.ENDIF # "$(VERSIONOBJ)"!="" -.ENDIF .IF "$(OS)" == "WNT" .IF "$(OS)" == "WNT" @@ -2713,7 +2548,7 @@ $(SHL6TARGETN) : \ $(SHL6DEF) \ $(USE_6IMPLIB) \ $(STDOBJ) \ - $(SHL6VERSIONOBJ) $(SHL6OBJS) \ + $(SHL6OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL6LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL6STDLIBS) -Wl,--end-group \ $(SHL6STDSHL) $(STDSHL6) \ @@ -2735,7 +2570,7 @@ $(SHL6TARGETN) : \ $(SHL6DEF) \ $(USE_6IMPLIB) \ $(STDOBJ) \ - $(SHL6VERSIONOBJ) $(SHL6OBJS) \ + $(SHL6OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL6LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL6STDLIBS) -Wl,--end-group \ $(SHL6STDSHL) $(STDSHL6) \ @@ -2755,7 +2590,7 @@ $(SHL6TARGETN) : \ -def:$(SHL6DEF) \ $(USE_6IMPLIB) \ $(STDOBJ) \ - $(SHL6VERSIONOBJ) $(SHL6OBJS) \ + $(SHL6OBJS) \ $(SHL6LIBS) \ $(SHL6STDLIBS) \ $(SHL6STDSHL) $(STDSHL6) \ @@ -2779,7 +2614,7 @@ $(SHL6TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(LB)/$(SHL6IMPLIB).exp \ $(STDOBJ) \ - $(SHL6OBJS) $(SHL6VERSIONOBJ) \ + $(SHL6OBJS) \ $(SHL6LIBS) \ $(SHL6STDLIBS) \ $(SHL6STDSHL) $(STDSHL6) \ @@ -2804,7 +2639,7 @@ $(SHL6TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(USE_6IMPLIB) \ $(STDOBJ) \ - $(SHL6OBJS) $(SHL6VERSIONOBJ)) \ + $(SHL6OBJS) ) \ $(SHL6LIBS) \ @$(mktmp $(SHL6STDLIBS) \ $(SHL6STDSHL) $(STDSHL6) \ @@ -2854,7 +2689,6 @@ $(SHL6TARGETN) : \ @-$(RM) $(MISC)/$(@:b).list @-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd @echo $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \ - $(SHL6VERSIONOBJ) \ `cat /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list @/bin/echo -n $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_6.cmd @@ -2871,16 +2705,13 @@ $(SHL6TARGETN) : \ @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ .ENDIF # "$(SHL6CREATEJNILIB)"!="" -.IF "$(SHL6NOCHECK)"=="" - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN) -.ENDIF # "$(SHL6NOCHECK)"!="" .ELIF "$(DISABLE_DYNLOADING)"=="TRUE" $(COMMAND_ECHO)$(AR) $(LIB6FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL6OBJS)) $(shell cat /dev/null $(LIB6TARGET) $(SHL6LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g) $(COMMAND_ECHO)$(RANLIB) $@ .ELSE # "$(OS)"=="MACOSX" @-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd @echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \ - $(SHL6VERSIONOBJ) -o $@ \ + -o $@ \ `cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_6.cmd .IF "$(VERBOSE)" == "TRUE" @@ -2890,11 +2721,6 @@ $(SHL6TARGETN) : \ .IF "$(SHL6NOCHECK)"=="" $(COMMAND_ECHO)-$(RM) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f) $(COMMAND_ECHO)$(RENAME) $(SHL6TARGETN) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f) -.IF "$(VERBOSE)"=="TRUE" - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f) -.ELSE - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) -- -s $(SHL6TARGETN:d)check_$(SHL6TARGETN:f) -.ENDIF .ENDIF # "$(SHL6NOCHECK)"!="" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" @@ -2944,26 +2770,6 @@ EXTRALIBPATHS7=$(EXTRALIBPATHS) EXTRALIBPATHS7+=-L$(SOLAR_STLLIBPATH) .ENDIF .ENDIF # "$(SHL7NOCHECK)"!="" -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -.IF "$(L10N_framework)"=="" -.IF "$(VERSIONOBJ)"!="" -SHL7VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL7TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)/$(SHL7VERSIONOBJ:b).h -.IF "$(OS)" != "WNT" -SHL7VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL7TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) -.ELSE # "$(OS)" != "WNT" -SHL7VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL7TARGET))}$(VERSIONOBJ:f) -.ENDIF # "$(OS)" != "WNT" -$(MISC)/$(SHL7VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL7VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)/src/version.c $@ - $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL7VERSIONOBJ:b).h/ > $@ - -.INIT : $(SHL7VERSIONOBJDEP) -.ENDIF # "$(VERSIONOBJ)"!="" -.ENDIF .IF "$(OS)" == "WNT" .IF "$(OS)" == "WNT" @@ -3198,7 +3004,7 @@ $(SHL7TARGETN) : \ $(SHL7DEF) \ $(USE_7IMPLIB) \ $(STDOBJ) \ - $(SHL7VERSIONOBJ) $(SHL7OBJS) \ + $(SHL7OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL7LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL7STDLIBS) -Wl,--end-group \ $(SHL7STDSHL) $(STDSHL7) \ @@ -3220,7 +3026,7 @@ $(SHL7TARGETN) : \ $(SHL7DEF) \ $(USE_7IMPLIB) \ $(STDOBJ) \ - $(SHL7VERSIONOBJ) $(SHL7OBJS) \ + $(SHL7OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL7LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL7STDLIBS) -Wl,--end-group \ $(SHL7STDSHL) $(STDSHL7) \ @@ -3240,7 +3046,7 @@ $(SHL7TARGETN) : \ -def:$(SHL7DEF) \ $(USE_7IMPLIB) \ $(STDOBJ) \ - $(SHL7VERSIONOBJ) $(SHL7OBJS) \ + $(SHL7OBJS) \ $(SHL7LIBS) \ $(SHL7STDLIBS) \ $(SHL7STDSHL) $(STDSHL7) \ @@ -3264,7 +3070,7 @@ $(SHL7TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(LB)/$(SHL7IMPLIB).exp \ $(STDOBJ) \ - $(SHL7OBJS) $(SHL7VERSIONOBJ) \ + $(SHL7OBJS) \ $(SHL7LIBS) \ $(SHL7STDLIBS) \ $(SHL7STDSHL) $(STDSHL7) \ @@ -3289,7 +3095,7 @@ $(SHL7TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(USE_7IMPLIB) \ $(STDOBJ) \ - $(SHL7OBJS) $(SHL7VERSIONOBJ)) \ + $(SHL7OBJS) ) \ $(SHL7LIBS) \ @$(mktmp $(SHL7STDLIBS) \ $(SHL7STDSHL) $(STDSHL7) \ @@ -3339,7 +3145,6 @@ $(SHL7TARGETN) : \ @-$(RM) $(MISC)/$(@:b).list @-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd @echo $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \ - $(SHL7VERSIONOBJ) \ `cat /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list @/bin/echo -n $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_7.cmd @@ -3356,16 +3161,13 @@ $(SHL7TARGETN) : \ @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ .ENDIF # "$(SHL7CREATEJNILIB)"!="" -.IF "$(SHL7NOCHECK)"=="" - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN) -.ENDIF # "$(SHL7NOCHECK)"!="" .ELIF "$(DISABLE_DYNLOADING)"=="TRUE" $(COMMAND_ECHO)$(AR) $(LIB7FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL7OBJS)) $(shell cat /dev/null $(LIB7TARGET) $(SHL7LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g) $(COMMAND_ECHO)$(RANLIB) $@ .ELSE # "$(OS)"=="MACOSX" @-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd @echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \ - $(SHL7VERSIONOBJ) -o $@ \ + -o $@ \ `cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_7.cmd .IF "$(VERBOSE)" == "TRUE" @@ -3375,11 +3177,6 @@ $(SHL7TARGETN) : \ .IF "$(SHL7NOCHECK)"=="" $(COMMAND_ECHO)-$(RM) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f) $(COMMAND_ECHO)$(RENAME) $(SHL7TARGETN) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f) -.IF "$(VERBOSE)"=="TRUE" - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f) -.ELSE - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) -- -s $(SHL7TARGETN:d)check_$(SHL7TARGETN:f) -.ENDIF .ENDIF # "$(SHL7NOCHECK)"!="" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" @@ -3429,26 +3226,6 @@ EXTRALIBPATHS8=$(EXTRALIBPATHS) EXTRALIBPATHS8+=-L$(SOLAR_STLLIBPATH) .ENDIF .ENDIF # "$(SHL8NOCHECK)"!="" -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -.IF "$(L10N_framework)"=="" -.IF "$(VERSIONOBJ)"!="" -SHL8VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL8TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)/$(SHL8VERSIONOBJ:b).h -.IF "$(OS)" != "WNT" -SHL8VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL8TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) -.ELSE # "$(OS)" != "WNT" -SHL8VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL8TARGET))}$(VERSIONOBJ:f) -.ENDIF # "$(OS)" != "WNT" -$(MISC)/$(SHL8VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL8VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)/src/version.c $@ - $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL8VERSIONOBJ:b).h/ > $@ - -.INIT : $(SHL8VERSIONOBJDEP) -.ENDIF # "$(VERSIONOBJ)"!="" -.ENDIF .IF "$(OS)" == "WNT" .IF "$(OS)" == "WNT" @@ -3683,7 +3460,7 @@ $(SHL8TARGETN) : \ $(SHL8DEF) \ $(USE_8IMPLIB) \ $(STDOBJ) \ - $(SHL8VERSIONOBJ) $(SHL8OBJS) \ + $(SHL8OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL8LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL8STDLIBS) -Wl,--end-group \ $(SHL8STDSHL) $(STDSHL8) \ @@ -3705,7 +3482,7 @@ $(SHL8TARGETN) : \ $(SHL8DEF) \ $(USE_8IMPLIB) \ $(STDOBJ) \ - $(SHL8VERSIONOBJ) $(SHL8OBJS) \ + $(SHL8OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL8LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL8STDLIBS) -Wl,--end-group \ $(SHL8STDSHL) $(STDSHL8) \ @@ -3725,7 +3502,7 @@ $(SHL8TARGETN) : \ -def:$(SHL8DEF) \ $(USE_8IMPLIB) \ $(STDOBJ) \ - $(SHL8VERSIONOBJ) $(SHL8OBJS) \ + $(SHL8OBJS) \ $(SHL8LIBS) \ $(SHL8STDLIBS) \ $(SHL8STDSHL) $(STDSHL8) \ @@ -3749,7 +3526,7 @@ $(SHL8TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(LB)/$(SHL8IMPLIB).exp \ $(STDOBJ) \ - $(SHL8OBJS) $(SHL8VERSIONOBJ) \ + $(SHL8OBJS) \ $(SHL8LIBS) \ $(SHL8STDLIBS) \ $(SHL8STDSHL) $(STDSHL8) \ @@ -3774,7 +3551,7 @@ $(SHL8TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(USE_8IMPLIB) \ $(STDOBJ) \ - $(SHL8OBJS) $(SHL8VERSIONOBJ)) \ + $(SHL8OBJS) ) \ $(SHL8LIBS) \ @$(mktmp $(SHL8STDLIBS) \ $(SHL8STDSHL) $(STDSHL8) \ @@ -3824,7 +3601,6 @@ $(SHL8TARGETN) : \ @-$(RM) $(MISC)/$(@:b).list @-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd @echo $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \ - $(SHL8VERSIONOBJ) \ `cat /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list @/bin/echo -n $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_8.cmd @@ -3841,16 +3617,13 @@ $(SHL8TARGETN) : \ @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ .ENDIF # "$(SHL8CREATEJNILIB)"!="" -.IF "$(SHL8NOCHECK)"=="" - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN) -.ENDIF # "$(SHL8NOCHECK)"!="" .ELIF "$(DISABLE_DYNLOADING)"=="TRUE" $(COMMAND_ECHO)$(AR) $(LIB8FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL8OBJS)) $(shell cat /dev/null $(LIB8TARGET) $(SHL8LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g) $(COMMAND_ECHO)$(RANLIB) $@ .ELSE # "$(OS)"=="MACOSX" @-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd @echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \ - $(SHL8VERSIONOBJ) -o $@ \ + -o $@ \ `cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_8.cmd .IF "$(VERBOSE)" == "TRUE" @@ -3860,11 +3633,6 @@ $(SHL8TARGETN) : \ .IF "$(SHL8NOCHECK)"=="" $(COMMAND_ECHO)-$(RM) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f) $(COMMAND_ECHO)$(RENAME) $(SHL8TARGETN) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f) -.IF "$(VERBOSE)"=="TRUE" - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f) -.ELSE - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) -- -s $(SHL8TARGETN:d)check_$(SHL8TARGETN:f) -.ENDIF .ENDIF # "$(SHL8NOCHECK)"!="" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" @@ -3914,26 +3682,6 @@ EXTRALIBPATHS9=$(EXTRALIBPATHS) EXTRALIBPATHS9+=-L$(SOLAR_STLLIBPATH) .ENDIF .ENDIF # "$(SHL9NOCHECK)"!="" -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -.IF "$(L10N_framework)"=="" -.IF "$(VERSIONOBJ)"!="" -SHL9VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL9TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)/$(SHL9VERSIONOBJ:b).h -.IF "$(OS)" != "WNT" -SHL9VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL9TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) -.ELSE # "$(OS)" != "WNT" -SHL9VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL9TARGET))}$(VERSIONOBJ:f) -.ENDIF # "$(OS)" != "WNT" -$(MISC)/$(SHL9VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL9VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)/src/version.c $@ - $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL9VERSIONOBJ:b).h/ > $@ - -.INIT : $(SHL9VERSIONOBJDEP) -.ENDIF # "$(VERSIONOBJ)"!="" -.ENDIF .IF "$(OS)" == "WNT" .IF "$(OS)" == "WNT" @@ -4168,7 +3916,7 @@ $(SHL9TARGETN) : \ $(SHL9DEF) \ $(USE_9IMPLIB) \ $(STDOBJ) \ - $(SHL9VERSIONOBJ) $(SHL9OBJS) \ + $(SHL9OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL9LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL9STDLIBS) -Wl,--end-group \ $(SHL9STDSHL) $(STDSHL9) \ @@ -4190,7 +3938,7 @@ $(SHL9TARGETN) : \ $(SHL9DEF) \ $(USE_9IMPLIB) \ $(STDOBJ) \ - $(SHL9VERSIONOBJ) $(SHL9OBJS) \ + $(SHL9OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL9LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL9STDLIBS) -Wl,--end-group \ $(SHL9STDSHL) $(STDSHL9) \ @@ -4210,7 +3958,7 @@ $(SHL9TARGETN) : \ -def:$(SHL9DEF) \ $(USE_9IMPLIB) \ $(STDOBJ) \ - $(SHL9VERSIONOBJ) $(SHL9OBJS) \ + $(SHL9OBJS) \ $(SHL9LIBS) \ $(SHL9STDLIBS) \ $(SHL9STDSHL) $(STDSHL9) \ @@ -4234,7 +3982,7 @@ $(SHL9TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(LB)/$(SHL9IMPLIB).exp \ $(STDOBJ) \ - $(SHL9OBJS) $(SHL9VERSIONOBJ) \ + $(SHL9OBJS) \ $(SHL9LIBS) \ $(SHL9STDLIBS) \ $(SHL9STDSHL) $(STDSHL9) \ @@ -4259,7 +4007,7 @@ $(SHL9TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(USE_9IMPLIB) \ $(STDOBJ) \ - $(SHL9OBJS) $(SHL9VERSIONOBJ)) \ + $(SHL9OBJS) ) \ $(SHL9LIBS) \ @$(mktmp $(SHL9STDLIBS) \ $(SHL9STDSHL) $(STDSHL9) \ @@ -4309,7 +4057,6 @@ $(SHL9TARGETN) : \ @-$(RM) $(MISC)/$(@:b).list @-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd @echo $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \ - $(SHL9VERSIONOBJ) \ `cat /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list @/bin/echo -n $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_9.cmd @@ -4326,16 +4073,13 @@ $(SHL9TARGETN) : \ @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ .ENDIF # "$(SHL9CREATEJNILIB)"!="" -.IF "$(SHL9NOCHECK)"=="" - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN) -.ENDIF # "$(SHL9NOCHECK)"!="" .ELIF "$(DISABLE_DYNLOADING)"=="TRUE" $(COMMAND_ECHO)$(AR) $(LIB9FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL9OBJS)) $(shell cat /dev/null $(LIB9TARGET) $(SHL9LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g) $(COMMAND_ECHO)$(RANLIB) $@ .ELSE # "$(OS)"=="MACOSX" @-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd @echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \ - $(SHL9VERSIONOBJ) -o $@ \ + -o $@ \ `cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_9.cmd .IF "$(VERBOSE)" == "TRUE" @@ -4345,11 +4089,6 @@ $(SHL9TARGETN) : \ .IF "$(SHL9NOCHECK)"=="" $(COMMAND_ECHO)-$(RM) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f) $(COMMAND_ECHO)$(RENAME) $(SHL9TARGETN) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f) -.IF "$(VERBOSE)"=="TRUE" - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f) -.ELSE - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) -- -s $(SHL9TARGETN:d)check_$(SHL9TARGETN:f) -.ENDIF .ENDIF # "$(SHL9NOCHECK)"!="" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" @@ -4399,26 +4138,6 @@ EXTRALIBPATHS10=$(EXTRALIBPATHS) EXTRALIBPATHS10+=-L$(SOLAR_STLLIBPATH) .ENDIF .ENDIF # "$(SHL10NOCHECK)"!="" -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -.IF "$(L10N_framework)"=="" -.IF "$(VERSIONOBJ)"!="" -SHL10VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL10TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)/$(SHL10VERSIONOBJ:b).h -.IF "$(OS)" != "WNT" -SHL10VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL10TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) -.ELSE # "$(OS)" != "WNT" -SHL10VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL10TARGET))}$(VERSIONOBJ:f) -.ENDIF # "$(OS)" != "WNT" -$(MISC)/$(SHL10VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL10VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)/src/version.c $@ - $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL10VERSIONOBJ:b).h/ > $@ - -.INIT : $(SHL10VERSIONOBJDEP) -.ENDIF # "$(VERSIONOBJ)"!="" -.ENDIF .IF "$(OS)" == "WNT" .IF "$(OS)" == "WNT" @@ -4653,7 +4372,7 @@ $(SHL10TARGETN) : \ $(SHL10DEF) \ $(USE_10IMPLIB) \ $(STDOBJ) \ - $(SHL10VERSIONOBJ) $(SHL10OBJS) \ + $(SHL10OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL10LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL10STDLIBS) -Wl,--end-group \ $(SHL10STDSHL) $(STDSHL10) \ @@ -4675,7 +4394,7 @@ $(SHL10TARGETN) : \ $(SHL10DEF) \ $(USE_10IMPLIB) \ $(STDOBJ) \ - $(SHL10VERSIONOBJ) $(SHL10OBJS) \ + $(SHL10OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL10LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL10STDLIBS) -Wl,--end-group \ $(SHL10STDSHL) $(STDSHL10) \ @@ -4695,7 +4414,7 @@ $(SHL10TARGETN) : \ -def:$(SHL10DEF) \ $(USE_10IMPLIB) \ $(STDOBJ) \ - $(SHL10VERSIONOBJ) $(SHL10OBJS) \ + $(SHL10OBJS) \ $(SHL10LIBS) \ $(SHL10STDLIBS) \ $(SHL10STDSHL) $(STDSHL10) \ @@ -4719,7 +4438,7 @@ $(SHL10TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(LB)/$(SHL10IMPLIB).exp \ $(STDOBJ) \ - $(SHL10OBJS) $(SHL10VERSIONOBJ) \ + $(SHL10OBJS) \ $(SHL10LIBS) \ $(SHL10STDLIBS) \ $(SHL10STDSHL) $(STDSHL10) \ @@ -4744,7 +4463,7 @@ $(SHL10TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(USE_10IMPLIB) \ $(STDOBJ) \ - $(SHL10OBJS) $(SHL10VERSIONOBJ)) \ + $(SHL10OBJS) ) \ $(SHL10LIBS) \ @$(mktmp $(SHL10STDLIBS) \ $(SHL10STDSHL) $(STDSHL10) \ @@ -4794,7 +4513,6 @@ $(SHL10TARGETN) : \ @-$(RM) $(MISC)/$(@:b).list @-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd @echo $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \ - $(SHL10VERSIONOBJ) \ `cat /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list @/bin/echo -n $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_10.cmd @@ -4811,16 +4529,13 @@ $(SHL10TARGETN) : \ @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ .ENDIF # "$(SHL10CREATEJNILIB)"!="" -.IF "$(SHL10NOCHECK)"=="" - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN) -.ENDIF # "$(SHL10NOCHECK)"!="" .ELIF "$(DISABLE_DYNLOADING)"=="TRUE" $(COMMAND_ECHO)$(AR) $(LIB10FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL10OBJS)) $(shell cat /dev/null $(LIB10TARGET) $(SHL10LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g) $(COMMAND_ECHO)$(RANLIB) $@ .ELSE # "$(OS)"=="MACOSX" @-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd @echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \ - $(SHL10VERSIONOBJ) -o $@ \ + -o $@ \ `cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_10.cmd .IF "$(VERBOSE)" == "TRUE" @@ -4830,11 +4545,6 @@ $(SHL10TARGETN) : \ .IF "$(SHL10NOCHECK)"=="" $(COMMAND_ECHO)-$(RM) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f) $(COMMAND_ECHO)$(RENAME) $(SHL10TARGETN) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f) -.IF "$(VERBOSE)"=="TRUE" - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f) -.ELSE - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) -- -s $(SHL10TARGETN:d)check_$(SHL10TARGETN:f) -.ENDIF .ENDIF # "$(SHL10NOCHECK)"!="" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk index 0e984cfad91c..650bedd1c9ac 100644 --- a/solenv/inc/tg_def.mk +++ b/solenv/inc/tg_def.mk @@ -92,10 +92,6 @@ $(DEF$(TNR)TARGETN) .PHONY : $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile .ENDIF $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile -.IF "$(VERSIONOBJ)"!="" -# getversioninfo fuer alle!! - $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile -.ENDIF .IF "$(DEFLIB$(TNR)NAME)"!="" .IF "$(COM)"=="GCC" $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL$(TNR)TARGET).exp diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index d703b0585715..62e47822d239 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -63,26 +63,6 @@ EXTRALIBPATHS$(TNR)=$(EXTRALIBPATHS) EXTRALIBPATHS$(TNR)+=-L$(SOLAR_STLLIBPATH) .ENDIF .ENDIF # "$(SHL$(TNR)NOCHECK)"!="" -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -#+++++++++++ version object ++++++++++++++++++++++++++++++++++++++++ -#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -.IF "$(L10N_framework)"=="" -.IF "$(VERSIONOBJ)"!="" -SHL$(TNR)VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f) -USE_VERSIONH:=$(INCCOM)/$(SHL$(TNR)VERSIONOBJ:b).h -.IF "$(OS)" != "WNT" -SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f:s/.o/.obj/) -.ELSE # "$(OS)" != "WNT" -SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f) -.ENDIF # "$(OS)" != "WNT" -$(MISC)/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL$(TNR)VERSIONOBJ:b).h -# $(COPY) $(SOLARENV)/src/version.c $@ - $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL$(TNR)VERSIONOBJ:b).h/ > $@ - -.INIT : $(SHL$(TNR)VERSIONOBJDEP) -.ENDIF # "$(VERSIONOBJ)"!="" -.ENDIF .IF "$(OS)" == "WNT" .IF "$(OS)" == "WNT" @@ -317,7 +297,7 @@ $(SHL$(TNR)TARGETN) : \ $(SHL$(TNR)DEF) \ $(USE_$(TNR)IMPLIB) \ $(STDOBJ) \ - $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)OBJS) \ + $(SHL$(TNR)OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL$(TNR)LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL$(TNR)STDLIBS) -Wl,--end-group \ $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \ @@ -339,7 +319,7 @@ $(SHL$(TNR)TARGETN) : \ $(SHL$(TNR)DEF) \ $(USE_$(TNR)IMPLIB) \ $(STDOBJ) \ - $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)OBJS) \ + $(SHL$(TNR)OBJS) \ $(subst,$(ROUT),$(PRJ)/$(ROUT) $(shell cat /dev/null $(SHL$(TNR)LIBS))) \ -Wl,--exclude-libs,ALL,--start-group $(SHL$(TNR)STDLIBS) -Wl,--end-group \ $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \ @@ -359,7 +339,7 @@ $(SHL$(TNR)TARGETN) : \ -def:$(SHL$(TNR)DEF) \ $(USE_$(TNR)IMPLIB) \ $(STDOBJ) \ - $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)OBJS) \ + $(SHL$(TNR)OBJS) \ $(SHL$(TNR)LIBS) \ $(SHL$(TNR)STDLIBS) \ $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \ @@ -383,7 +363,7 @@ $(SHL$(TNR)TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(LB)/$(SHL$(TNR)IMPLIB).exp \ $(STDOBJ) \ - $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ) \ + $(SHL$(TNR)OBJS) \ $(SHL$(TNR)LIBS) \ $(SHL$(TNR)STDLIBS) \ $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \ @@ -408,7 +388,7 @@ $(SHL$(TNR)TARGETN) : \ -map:$(MISC)/$(@:B).map \ $(USE_$(TNR)IMPLIB) \ $(STDOBJ) \ - $(SHL$(TNR)OBJS) $(SHL$(TNR)VERSIONOBJ)) \ + $(SHL$(TNR)OBJS) ) \ $(SHL$(TNR)LIBS) \ @$(mktmp $(SHL$(TNR)STDLIBS) \ $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \ @@ -458,7 +438,6 @@ $(SHL$(TNR)TARGETN) : \ @-$(RM) $(MISC)/$(@:b).list @-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd @echo $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \ - $(SHL$(TNR)VERSIONOBJ) \ `cat /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list @/bin/echo -n $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(SHL$(TNR)VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) -o $@ \ $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) -filelist $(MISC)/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd @@ -475,16 +454,13 @@ $(SHL$(TNR)TARGETN) : \ @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ .ENDIF # "$(SHL$(TNR)CREATEJNILIB)"!="" -.IF "$(SHL$(TNR)NOCHECK)"=="" - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN) -.ENDIF # "$(SHL$(TNR)NOCHECK)"!="" .ELIF "$(DISABLE_DYNLOADING)"=="TRUE" $(COMMAND_ECHO)$(AR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $@ $(subst,.obj,.o $(SHL$(TNR)OBJS)) $(shell cat /dev/null $(LIB$(TNR)TARGET) $(SHL$(TNR)LIBS) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g) $(COMMAND_ECHO)$(RANLIB) $@ .ELSE # "$(OS)"=="MACOSX" @-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd @echo $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(SHL$(TNR)SONAME) $(LINKFLAGSSHL) $(SHL$(TNR)VERSIONMAPPARA) -L$(PRJ)/$(ROUT)/lib $(SOLARLIB) $(STDSLO) $(SHL$(TNR)OBJS:s/.obj/.o/) \ - $(SHL$(TNR)VERSIONOBJ) -o $@ \ + -o $@ \ `cat /dev/null $(SHL$(TNR)LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd .IF "$(VERBOSE)" == "TRUE" @@ -494,11 +470,6 @@ $(SHL$(TNR)TARGETN) : \ .IF "$(SHL$(TNR)NOCHECK)"=="" $(COMMAND_ECHO)-$(RM) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f) $(COMMAND_ECHO)$(RENAME) $(SHL$(TNR)TARGETN) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f) -.IF "$(VERBOSE)"=="TRUE" - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f) -.ELSE - $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) -- -s $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f) -.ENDIF .ENDIF # "$(SHL$(TNR)NOCHECK)"!="" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" diff --git a/solenv/inc/tg_wntx64.mk b/solenv/inc/tg_wntx64.mk index 66d28e936788..b07fcbe7876f 100644 --- a/solenv/inc/tg_wntx64.mk +++ b/solenv/inc/tg_wntx64.mk @@ -133,8 +133,6 @@ $(DEF1TARGETN_X64) : \ @echo LIBRARY $(EMQ)"$(SHL1TARGETN:f)$(EMQ)" >$@.tmpfile @echo HEAPSIZE 0 >>$@.tmpfile @echo EXPORTS >>$@.tmpfile -# getversioninfo fuer alle!! - @echo GetVersionInfo >>$@.tmpfile .IF "$(DEFLIB1NAME_X64)"!="" .IF "$(SHL1USE_EXPORTS_X64)"=="" @-$(EXPORT1_PROTECT) $(RMHACK1) $(MISC_X64)/$(SHL1TARGET_X64).exp @@ -170,8 +168,6 @@ $(DEF2TARGETN_X64) : \ @echo LIBRARY $(EMQ)"$(SHL2TARGETN:f)$(EMQ)" >$@.tmpfile @echo HEAPSIZE 0 >>$@.tmpfile @echo EXPORTS >>$@.tmpfile -# getversioninfo fuer alle!! - @echo GetVersionInfo >>$@.tmpfile .IF "$(DEFLIB2NAME_X64)"!="" .IF "$(SHL2USE_EXPORTS_X64)"=="" @-$(EXPORT2_PROTECT) $(RMHACK1) $(MISC_X64)/$(SHL2TARGET_X64).exp @@ -201,15 +197,6 @@ $(DEF2TARGETN_X64) : \ # -------------------------------- shl ----------------------------------------- .IF "$(SHL1TARGET_X64)"!="" -.IF "$(VERSIONOBJ_X64)"!="" -SHL1VERSIONOBJ_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET_X64))}$(VERSIONOBJ_X64:f) -USE_VERSIONH_X64:=$(INCCOM)/$(SHL1VERSIONOBJ_X64:b).h -SHL1VERSIONOBJDEP_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET_X64))}$(VERSIONOBJ_X64:f) -$(MISC_X64)/$(SHL1VERSIONOBJ_X64:b).c : make_x64_dirs $(SOLARENV)/src/version.c $(INCCOM)/$(SHL1VERSIONOBJ_X64:b).h - $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ_X64:b).h/ > $@ -.INIT : $(SHL1VERSIONOBJDEP_X64) -.ENDIF - .IF "$(USE_DEFFILE_X64)"=="" USE_1IMPLIB_DEPS_X64=$(LB_X64)/$(SHL1IMPLIB_X64).lib .ENDIF # "$(USE_DEFFILE_X64)"=="" @@ -271,7 +258,7 @@ $(SHL1TARGETN_X64) : \ -def:$(SHL1DEF_X64) \ $(USE_1IMPLIB_X64) \ $(STDOBJ_X64) \ - $(SHL1VERSIONOBJ_X64) $(SHL1OBJS_X64) \ + $(SHL1OBJS_X64) \ $(SHL1LIBS_X64) \ $(SHL1STDLIBS_X64) \ $(SHL1STDSHL_X64) $(STDSHL1_X64) \ @@ -295,7 +282,7 @@ $(SHL1TARGETN_X64) : \ -map:$(MISC_X64)/$(@:B).map \ $(LB_X64)/$(SHL1IMPLIB_X64).exp \ $(STDOBJ_X64) \ - $(SHL1OBJS_X64) $(SHL1VERSIONOBJ_X64) \ + $(SHL1OBJS_X64) \ $(SHL1LIBS_X64) \ $(SHL1STDLIBS_X64) \ $(SHL1STDSHL_X64) $(STDSHL1_X64) \ @@ -346,15 +333,6 @@ ALLTAR : $(SHL2IMPLIBN_X64) .ENDIF # "$(LIBTARGET)" == "" .IF "$(SHL2TARGET_X64)"!="" -.IF "$(VERSIONOBJ_X64)"!="" -SHL2VERSIONOBJ_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET_X64))}$(VERSIONOBJ_X64:f) -USE_VERSIONH_X64:=$(INCCOM)/$(SHL2VERSIONOBJ_X64:b).h -SHL2VERSIONOBJDEP_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET_X64))}$(VERSIONOBJ_X64:f) -$(MISC_X64)/$(SHL2VERSIONOBJ_X64:b).c : make_x64_dirs $(SOLARENV)/src/version.c $(INCCOM)/$(SHL2VERSIONOBJ_X64:b).h - $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ_X64:b).h/ > $@ -.INIT : $(SHL2VERSIONOBJDEP_X64) -.ENDIF - .IF "$(USE_DEFFILE_X64)"=="" USE_2IMPLIB_DEPS_X64=$(LB_X64)/$(SHL2IMPLIB_X64).lib .ENDIF # "$(USE_DEFFILE_X64)"=="" @@ -416,7 +394,7 @@ $(SHL2TARGETN_X64) : \ -def:$(SHL2DEF_X64) \ $(USE_2IMPLIB_X64) \ $(STDOBJ_X64) \ - $(SHL2VERSIONOBJ_X64) $(SHL2OBJS_X64) \ + $(SHL2OBJS_X64) \ $(SHL2LIBS_X64) \ $(SHL2STDLIBS_X64) \ $(SHL2STDSHL_X64) $(STDSHL2_X64) \ @@ -440,7 +418,7 @@ $(SHL2TARGETN_X64) : \ -map:$(MISC_X64)/$(@:B).map \ $(LB_X64)/$(SHL2IMPLIB_X64).exp \ $(STDOBJ_X64) \ - $(SHL2OBJS_X64) $(SHL2VERSIONOBJ_X64) \ + $(SHL2OBJS_X64) \ $(SHL2LIBS_X64) \ $(SHL2STDLIBS_X64) \ $(SHL2STDSHL_X64) $(STDSHL2_X64) \ diff --git a/solenv/src/version.c b/solenv/src/version.c deleted file mode 100644 index 4bd0732f7921..000000000000 --- a/solenv/src/version.c +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <_version.h> - -struct VersionInfo -{ - const char* pTime; - const char* pDate; - const char* pUpd; - const char* pMinor; - const char* pBuild; - const char* pInpath; -}; - -static const struct VersionInfo g_aVersionInfo = -{ - __TIME__, - __DATE__, - _UPD, - _LAST_MINOR, - _BUILD, - _INPATH -}; - -#if defined(WNT) -__declspec(dllexport) const struct VersionInfo* GetVersionInfo(void); -#endif - -#if defined(WNT) -__declspec(dllexport) const struct VersionInfo* GetVersionInfo(void) -#else -const struct VersionInfo *GetVersionInfo(void) -#endif -{ - return &g_aVersionInfo; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/Executable_checkdll.mk b/soltools/Executable_checkdll.mk deleted file mode 100644 index de9ccbb41eed..000000000000 --- a/soltools/Executable_checkdll.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Executable_Executable,checkdll)) - -ifeq ($(COM),MSC) -$(eval $(call gb_Executable_use_packages,checkdll,\ - soltools_inc \ -)) -endif - -$(eval $(call gb_Executable_add_cobjects,checkdll,\ - soltools/checkdll/checkdll \ -)) - -ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) -$(eval $(call gb_Executable_add_libs,checkdll,\ - -ldl \ -)) -endif - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/soltools/Module_soltools.mk b/soltools/Module_soltools.mk index 12b1d81e9e64..95a802149f34 100644 --- a/soltools/Module_soltools.mk +++ b/soltools/Module_soltools.mk @@ -16,12 +16,6 @@ $(eval $(call gb_Module_add_targets,soltools,\ Executable_makedepend \ )) -ifneq ($(OS),WNT) -$(eval $(call gb_Module_add_targets,soltools,\ - Executable_checkdll \ -)) -endif # UNX - ifeq ($(OS)$(COM),SOLARISC52) $(eval $(call gb_Module_add_targets,soltools,\ Executable_adjustvisibility \ diff --git a/soltools/checkdll/checkdll.c b/soltools/checkdll/checkdll.c deleted file mode 100644 index 64f2877f9227..000000000000 --- a/soltools/checkdll/checkdll.c +++ /dev/null @@ -1,89 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include -#include -#include -#include -#include - -/* - * NOTE: Since no one is really interested in correct unload behavior I've - * disabled the shared library unload check. If you want to reenable it comment - * the following line out - */ -#define NO_UNLOAD_CHECK - -static const char *pprog_name = "checkdll"; -static const char *psymbol = "GetVersionInfo"; - -void usage() -{ - fprintf(stderr, "usage: %s [-s] \n", pprog_name); - return; -} - -int main(int argc, char *argv[]) -{ - int silent=0; - void *phandle; - char *(*pfun)(void); - - if ( argc < 2 || argc > 4) { - usage(); - return 1; - } - - if ( !strcmp(argv[1],"-s") ) { - silent = 1; - ++argv, --argc; - } - - if ( access( argv[1], R_OK ) == -1 ) { - fprintf(stderr, "%s: ERROR: %s: %s\n", - pprog_name, argv[1], strerror(errno)); - return 2; - } - - if (!silent) printf("Checking DLL %s ...", argv[1]); - fflush(stdout); - - if ( (phandle = dlopen(argv[1], RTLD_NOW)) != NULL ) { - if ( (pfun = (char *(*)(void))dlsym(phandle, psymbol)) != NULL ) { - if (!silent) printf(": ok\n"); - } - else - { - printf(": WARNING: %s\n", dlerror()); - } -#ifdef NO_UNLOAD_CHECK - _exit(0); -#else - dlclose(phandle); -#endif - return 0; - } - - printf(": ERROR: %s\n", dlerror()); - return 3; -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmerge/source/activesync/exports.map b/xmerge/source/activesync/exports.map index e93e4b06689f..e78067c51ff5 100644 --- a/xmerge/source/activesync/exports.map +++ b/xmerge/source/activesync/exports.map @@ -18,7 +18,6 @@ UDK_3_0_0 { global: - GetVersionInfo; DllCanUnloadNow; DllGetClassObject; DllRegisterServer; -- cgit