diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 13:42:14 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 13:42:14 +0000 |
| commit | 1d6cf55d6a25c090c12060de7a9ec753d90ce7ca (patch) | |
| tree | 2825c3129551acab728d5f73d336e7f24b80ef89 /odk/util | |
| parent | 2334789bd8d21696140fcb9efdd7bbef001388fb (diff) | |
INTEGRATION: CWS jsc21 (1.30.4); FILE MERGED
2008/07/04 11:33:45 jsc 1.30.4.4: RESYNC: (1.30-1.31); FILE MERGED
2008/06/27 08:49:55 jsc 1.30.4.3: #i90032# adapt link flags and linking for MacOS
2008/05/22 07:08:00 jsc 1.30.4.2: #i88797# adapted to new structure
2008/04/30 11:34:26 jsc 1.30.4.1: #86121# update for 3 layer office
Diffstat (limited to 'odk/util')
| -rw-r--r-- | odk/util/odk_rules.pmk | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/odk/util/odk_rules.pmk b/odk/util/odk_rules.pmk index ee6a159809f8..41b06a2d874f 100644 --- a/odk/util/odk_rules.pmk +++ b/odk/util/odk_rules.pmk @@ -8,7 +8,7 @@ # # $RCSfile: odk_rules.pmk,v $ # -# $Revision: 1.31 $ +# $Revision: 1.32 $ # # This file is part of OpenOffice.org. # @@ -34,6 +34,14 @@ $(DESTDIRDOCU)$/%.html : $(PRJ)$/docs$/%.html @@-rm -f $@ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ +$(DESTDIREXAMPLES)$/%.html : $(PRJ)$/examples$/%.html + @@-rm -f $@ + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ + +$(DESTDIR)$/index.html : $(PRJ)$/index.html + @@-rm -f $@ + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ + $(DESTDIRDOCU)$/%.css : $(PRJ)$/docs$/%.css @@-rm -f $@ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ @@ -77,6 +85,12 @@ $(DESTDIR)$/setsdkenv_unix : $(PRJ)$/setsdkenv_unix -chmod 755 $@ .ENDIF +#.IF "$(USE_SHELL)"=="4nt" +# $(TYPE) $< | $(SED) "s/__SDKNAME__/$(SDKDIRNAME)/" > $@ +#.ELSE +# $(TYPE) $< | $(SED) 's#__SDKNAME__#$(SDKDIRNAME)#' > $@ +#.ENDIF + $(DESTDIR)$/setsdkenv_unix.%.in : $(PRJ)$/setsdkenv_unix.%.in @@-rm -f $@ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ @@ -84,6 +98,14 @@ $(DESTDIR)$/setsdkenv_unix.%.in : $(PRJ)$/setsdkenv_unix.%.in -chmod 644 $@ .ENDIF +$(DESTDIR)$/setsdkenv_windows.bat : $(PRJ)$/setsdkenv_windows.bat + @@-rm -f $@ +.IF "$(USE_SHELL)"=="4nt" + $(TYPE) $< | $(SED) "s/__SDKNAME__/$(SDKDIRNAME)/" > $@ +.ELSE + $(TYPE) $< | $(SED) 's#__SDKNAME__#$(SDKDIRNAME)#' > $@ +.ENDIF + $(DESTDIR)$/%.bat : $(PRJ)$/%.bat @@-rm -f $@ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ @@ -154,6 +176,7 @@ $(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/%.class : $(CLASSDIR)$/com$/sun$/sta $(DESTDIRIDL)$/% : $(IDLOUT)$/% $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ + @touch $(IDL_DOCU_CLEANUP_FLAG) $(DESTDIRINC)$/udkversion.mk : @@-rm -f $@ @@ -192,6 +215,9 @@ $(DESTDIRSETTINGS)$/component.uno.map : $(SOLARENV)$/bin$/addsym.awk $(SOLARENV) @@-$(RM) -f $@ .IF "$(COMID)"=="gcc3" tr -d "\015" < $(SOLARENV)$/src$/component.map | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ +.IF "$(OS)"=="MACOSX" + tr -d "\015" < $(SOLARENV)$/src$/component.map | tail --lines +3 | head -3 | sed -e 's/.*component/_component/g' -e 's/;[ ]*$//' > $@ +.ENDIF .ELSE # "$(COMID)"=="gcc3" tr -d "\015" < $(SOLARENV)$/src$/component.map > $@ .ENDIF # "$(COMID)"=="gcc3" |