diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 13:14:24 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 13:14:24 +0000 |
| commit | 3d86c9989dfbf04818971742a18241dcf6de2194 (patch) | |
| tree | 69330c63b4d924ba4f7bbfcac38181e0e8a841b6 /solenv/inc/tg_shl.mk | |
| parent | 4599abacc7118008cdafbd46a8096f5864ece298 (diff) | |
INTEGRATION: CWS pj53 (1.94.36); FILE MERGED
2006/04/13 15:39:56 pjanik 1.94.36.2: #i61798#: Rename dylib-link-list to macosx-dylib-link-list and move it to solenv/bin.
2006/04/13 12:51:59 pjanik 1.94.36.1: #i61798#: Rename create-bundle to macosx-create-bundle and move it to solenv/bin.
Diffstat (limited to 'solenv/inc/tg_shl.mk')
| -rw-r--r-- | solenv/inc/tg_shl.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index 60fa1af149b1..9cf4371fdaf3 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_shl.mk,v $ # -# $Revision: 1.94 $ +# $Revision: 1.95 $ # -# last change: $Author: rt $ $Date: 2006-03-07 17:09:10 $ +# last change: $Author: hr $ $Date: 2006-04-20 14:14:24 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -410,7 +410,7 @@ $(SHL$(TNR)TARGETN) : \ $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ:s/.obj/.o/) \ `cat /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list @+echo $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - `dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL$(TNR)STDLIBS)` \ + `macosx-dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL$(TNR)STDLIBS)` \ $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(@:b).cmd @cat $(MISC)$/$(@:b).cmd @+source $(MISC)$/$(@:b).cmd @@ -420,7 +420,7 @@ $(SHL$(TNR)TARGETN) : \ .ENDIF .ENDIF @echo "Making: $@.jnilib" - @create-bundle $@ + @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" .IF "$(SHL$(TNR)NOCHECK)"=="" +$(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL$(TNR)TARGETN) |