diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-12-07 19:13:10 +0100 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-12-07 19:13:10 +0100 |
| commit | 4b125ac345c1e4310ee786a4016ba3c202e0326e (patch) | |
| tree | 18833ea0f6603a74e360061010ab1146ae2570d3 /solenv/inc/_tg_shl.mk | |
| parent | 60bb7401108b52fe7856eb5688bafb183322bc01 (diff) | |
ause128: #i115964# create .jnilib file on request when linking; deliver .jnilib files instead of deliver magic
Diffstat (limited to 'solenv/inc/_tg_shl.mk')
| -rw-r--r-- | solenv/inc/_tg_shl.mk | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk index 14a64e2b54ab..41d48c839949 100644 --- a/solenv/inc/_tg_shl.mk +++ b/solenv/inc/_tg_shl.mk @@ -440,8 +440,10 @@ $(SHL1TARGETN) : \ @+source $(MISC)/$(TARGET).$(@:b)_1.cmd @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL1RPATH) $@ +.IF "$(SHL1CREATEJNILIB)"!="" @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ +.ENDIF # "$(SHL1CREATEJNILIB)"!="" .IF "$(UPDATER)"=="YES" .IF "$(SHL1NOCHECK)"=="" $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN) @@ -982,8 +984,10 @@ $(SHL2TARGETN) : \ @+source $(MISC)/$(TARGET).$(@:b)_2.cmd @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL2RPATH) $@ +.IF "$(SHL2CREATEJNILIB)"!="" @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ +.ENDIF # "$(SHL2CREATEJNILIB)"!="" .IF "$(UPDATER)"=="YES" .IF "$(SHL2NOCHECK)"=="" $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN) @@ -1524,8 +1528,10 @@ $(SHL3TARGETN) : \ @+source $(MISC)/$(TARGET).$(@:b)_3.cmd @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL3RPATH) $@ +.IF "$(SHL3CREATEJNILIB)"!="" @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ +.ENDIF # "$(SHL3CREATEJNILIB)"!="" .IF "$(UPDATER)"=="YES" .IF "$(SHL3NOCHECK)"=="" $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN) @@ -2066,8 +2072,10 @@ $(SHL4TARGETN) : \ @+source $(MISC)/$(TARGET).$(@:b)_4.cmd @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL4RPATH) $@ +.IF "$(SHL4CREATEJNILIB)"!="" @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ +.ENDIF # "$(SHL4CREATEJNILIB)"!="" .IF "$(UPDATER)"=="YES" .IF "$(SHL4NOCHECK)"=="" $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN) @@ -2608,8 +2616,10 @@ $(SHL5TARGETN) : \ @+source $(MISC)/$(TARGET).$(@:b)_5.cmd @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL5RPATH) $@ +.IF "$(SHL5CREATEJNILIB)"!="" @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ +.ENDIF # "$(SHL5CREATEJNILIB)"!="" .IF "$(UPDATER)"=="YES" .IF "$(SHL5NOCHECK)"=="" $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN) @@ -3150,8 +3160,10 @@ $(SHL6TARGETN) : \ @+source $(MISC)/$(TARGET).$(@:b)_6.cmd @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL6RPATH) $@ +.IF "$(SHL6CREATEJNILIB)"!="" @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ +.ENDIF # "$(SHL6CREATEJNILIB)"!="" .IF "$(UPDATER)"=="YES" .IF "$(SHL6NOCHECK)"=="" $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN) @@ -3692,8 +3704,10 @@ $(SHL7TARGETN) : \ @+source $(MISC)/$(TARGET).$(@:b)_7.cmd @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL7RPATH) $@ +.IF "$(SHL7CREATEJNILIB)"!="" @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ +.ENDIF # "$(SHL7CREATEJNILIB)"!="" .IF "$(UPDATER)"=="YES" .IF "$(SHL7NOCHECK)"=="" $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN) @@ -4234,8 +4248,10 @@ $(SHL8TARGETN) : \ @+source $(MISC)/$(TARGET).$(@:b)_8.cmd @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL8RPATH) $@ +.IF "$(SHL8CREATEJNILIB)"!="" @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ +.ENDIF # "$(SHL8CREATEJNILIB)"!="" .IF "$(UPDATER)"=="YES" .IF "$(SHL8NOCHECK)"=="" $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN) @@ -4776,8 +4792,10 @@ $(SHL9TARGETN) : \ @+source $(MISC)/$(TARGET).$(@:b)_9.cmd @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL9RPATH) $@ +.IF "$(SHL9CREATEJNILIB)"!="" @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ +.ENDIF # "$(SHL9CREATEJNILIB)"!="" .IF "$(UPDATER)"=="YES" .IF "$(SHL9NOCHECK)"=="" $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN) @@ -5318,8 +5336,10 @@ $(SHL10TARGETN) : \ @+source $(MISC)/$(TARGET).$(@:b)_10.cmd @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \ shl $(SHL10RPATH) $@ +.IF "$(SHL10CREATEJNILIB)"!="" @echo "Making: " $(@:f).jnilib @macosx-create-bundle $@ +.ENDIF # "$(SHL10CREATEJNILIB)"!="" .IF "$(UPDATER)"=="YES" .IF "$(SHL10NOCHECK)"=="" $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN) |