diff options
author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2007-12-07 16:06:25 +0000 |
---|---|---|
committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2007-12-07 16:06:25 +0000 |
commit | 65644e4bc948890bd9ace5dd35bb0b5bd46719d7 (patch) | |
tree | aee060e156a35c14c221297b8f0cc67280730c03 /solenv | |
parent | 959f26ca9da0ab254a45418b270dc7bc24bb4a75 (diff) |
#i10000# - fix broken syntax slipped through qa (breaker for mac here)
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/inc/_tg_shl.mk | 30 | ||||
-rw-r--r-- | solenv/inc/settings.mk | 11 | ||||
-rw-r--r-- | solenv/inc/tg_shl.mk | 7 |
3 files changed, 11 insertions, 37 deletions
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk index 7da17dd9bfb8..217a8a4b3ed4 100644 --- a/solenv/inc/_tg_shl.mk +++ b/solenv/inc/_tg_shl.mk @@ -407,9 +407,6 @@ $(SHL1TARGETN) : \ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" -.IF "$(SOLAR_STLLIBPATH)"!="" -EXTRALIBPATHS+=-L$(SOLAR_STLLIBPATH) -.ENDIF .IF "$(SHL1NOCHECK)"=="" $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL1TARGETN) .ENDIF # "$(SHL1NOCHECK)"!="" @@ -857,9 +854,6 @@ $(SHL2TARGETN) : \ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" -.IF "$(SOLAR_STLLIBPATH)"!="" -EXTRALIBPATHS+=-L$(SOLAR_STLLIBPATH) -.ENDIF .IF "$(SHL2NOCHECK)"=="" $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL2TARGETN) .ENDIF # "$(SHL2NOCHECK)"!="" @@ -1307,9 +1301,6 @@ $(SHL3TARGETN) : \ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" -.IF "$(SOLAR_STLLIBPATH)"!="" -EXTRALIBPATHS+=-L$(SOLAR_STLLIBPATH) -.ENDIF .IF "$(SHL3NOCHECK)"=="" $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL3TARGETN) .ENDIF # "$(SHL3NOCHECK)"!="" @@ -1757,9 +1748,6 @@ $(SHL4TARGETN) : \ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" -.IF "$(SOLAR_STLLIBPATH)"!="" -EXTRALIBPATHS+=-L$(SOLAR_STLLIBPATH) -.ENDIF .IF "$(SHL4NOCHECK)"=="" $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL4TARGETN) .ENDIF # "$(SHL4NOCHECK)"!="" @@ -2207,9 +2195,6 @@ $(SHL5TARGETN) : \ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" -.IF "$(SOLAR_STLLIBPATH)"!="" -EXTRALIBPATHS+=-L$(SOLAR_STLLIBPATH) -.ENDIF .IF "$(SHL5NOCHECK)"=="" $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL5TARGETN) .ENDIF # "$(SHL5NOCHECK)"!="" @@ -2657,9 +2642,6 @@ $(SHL6TARGETN) : \ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" -.IF "$(SOLAR_STLLIBPATH)"!="" -EXTRALIBPATHS+=-L$(SOLAR_STLLIBPATH) -.ENDIF .IF "$(SHL6NOCHECK)"=="" $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL6TARGETN) .ENDIF # "$(SHL6NOCHECK)"!="" @@ -3107,9 +3089,6 @@ $(SHL7TARGETN) : \ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" -.IF "$(SOLAR_STLLIBPATH)"!="" -EXTRALIBPATHS+=-L$(SOLAR_STLLIBPATH) -.ENDIF .IF "$(SHL7NOCHECK)"=="" $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL7TARGETN) .ENDIF # "$(SHL7NOCHECK)"!="" @@ -3557,9 +3536,6 @@ $(SHL8TARGETN) : \ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" -.IF "$(SOLAR_STLLIBPATH)"!="" -EXTRALIBPATHS+=-L$(SOLAR_STLLIBPATH) -.ENDIF .IF "$(SHL8NOCHECK)"=="" $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL8TARGETN) .ENDIF # "$(SHL8NOCHECK)"!="" @@ -4007,9 +3983,6 @@ $(SHL9TARGETN) : \ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" -.IF "$(SOLAR_STLLIBPATH)"!="" -EXTRALIBPATHS+=-L$(SOLAR_STLLIBPATH) -.ENDIF .IF "$(SHL9NOCHECK)"=="" $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL9TARGETN) .ENDIF # "$(SHL9NOCHECK)"!="" @@ -4457,9 +4430,6 @@ $(SHL10TARGETN) : \ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" -.IF "$(SOLAR_STLLIBPATH)"!="" -EXTRALIBPATHS+=-L$(SOLAR_STLLIBPATH) -.ENDIF .IF "$(SHL10NOCHECK)"=="" $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL10TARGETN) .ENDIF # "$(SHL10NOCHECK)"!="" diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index f5d5b57ae76f..96310ebf6ce3 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -4,9 +4,9 @@ # # $RCSfile: settings.mk,v $ # -# $Revision: 1.222 $ +# $Revision: 1.223 $ # -# last change: $Author: ihi $ $Date: 2007-11-26 12:45:12 $ +# last change: $Author: hjs $ $Date: 2007-12-07 17:06:06 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -789,6 +789,13 @@ SOLARCOMMONRESDIR=$(SOLARRESDIR) SOLARCOMMONPCKDIR=$(SOLARPCKDIR) .ENDIF +.IF "$(UPDATER)"=="YES" +.IF "$(SHL$(TNR)NOCHECK)"=="" +.IF "$(SOLAR_STLLIBPATH)"!="" +EXTRALIBPATHS+=-L$(SOLAR_STLLIBPATH) +.ENDIF +.ENDIF # "$(SHL$(TNR)NOCHECK)"!="" +.ENDIF .IF "$(PRE)"=="" #JARDIR=$(CLASSDIR) diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index 8c926ea698c7..96c5d5d15099 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_shl.mk,v $ # -# $Revision: 1.117 $ +# $Revision: 1.118 $ # -# last change: $Author: vg $ $Date: 2007-12-06 16:46:14 $ +# last change: $Author: hjs $ $Date: 2007-12-07 17:06:25 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -444,9 +444,6 @@ $(SHL$(TNR)TARGETN) : \ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" -.IF "$(SOLAR_STLLIBPATH)"!="" -EXTRALIBPATHS+=-L$(SOLAR_STLLIBPATH) -.ENDIF .IF "$(SHL$(TNR)NOCHECK)"=="" $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL$(TNR)TARGETN) .ENDIF # "$(SHL$(TNR)NOCHECK)"!="" |