diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-02-11 14:17:17 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-02-11 14:17:17 +0000 |
| commit | 0318b221b2a1a3244a29370bf5ba1afc8d20ff08 (patch) | |
| tree | 1ea4a87d35965f0e08e4e1eb40350839f302ec56 /helpcontent2/util | |
| parent | 41e70eb0de906f505c891b93064e03ec55df9e5f (diff) | |
INTEGRATION: CWS ause018 (1.11.6); FILE MERGED
2005/02/07 18:56:45 hjs 1.11.6.4: #i42057# avoid zip targets for javaless builds
2005/02/07 16:45:21 hjs 1.11.6.3: #i42057# avoid unwanted files in zip
2005/02/07 14:09:20 hjs 1.11.6.2: #i42057# unique TARGET names in generated link makefiles
2005/02/04 17:42:27 hjs 1.11.6.1: #i39062# use *.tree files generated to MISC
Diffstat (limited to 'helpcontent2/util')
| -rw-r--r-- | helpcontent2/util/swriter/makefile.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/helpcontent2/util/swriter/makefile.mk b/helpcontent2/util/swriter/makefile.mk index 988686b3da..8c4ef755ae 100644 --- a/helpcontent2/util/swriter/makefile.mk +++ b/helpcontent2/util/swriter/makefile.mk @@ -3,9 +3,9 @@ #* $Workfile:$ #* #* Creation date KR 28.06.99 -#* last change $Author: rt $ $Date: 2005-01-28 10:51:00 $ +#* last change $Author: hr $ $Date: 2005-02-11 15:17:17 $ #* -#* $Revision: 1.11 $ +#* $Revision: 1.12 $ #* #* $Logfile:$ #* @@ -19,32 +19,34 @@ PRJ = ..$/.. PRJNAME = helpcontent2 # uniqe name (module wide); # using a modified form of package should do here -TARGET = util +TARGET = util_swriter # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/settings.pmk +.IF "$(SOLAR_JAVA)"!="" common_build_zip:= zip1generatedlangs=TRUE zip1langdirs=$(aux_alllangiso) ZIP1TARGET=xhp_swriter ZIP1FLAGS= -u -r ZIP1DIR=$(MISC)$/$(LANGDIR) -ZIP1LIST=$(LANGDIR)$/text$/swriter$/* -x "*.dphh*" -x "*.hzip" +ZIP1LIST=$(LANGDIR)$/text$/swriter$/* -x "*.dphh*" -x "*.hzip" -x "*.created" +.ENDIF # "$(SOLAR_JAVA)"!="" LINKNAME=swriter LINKADDEDFILES= \ -add swriter.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/swriter.cfg \ - -add swriter.tree $(PRJ)$/source$/auxiliary$/LANGUAGE$/swriter.tree \ + -add swriter.tree $(MISC)$/LANGUAGE$/swriter.tree \ -add swriter.jar $(BIN)$/xhp_swriter_LANGUAGE.zip LINKADDEDDEPS= \ $(PRJ)$/source$/auxiliary$/LANGUAGE$/swriter.cfg \ - $(PRJ)$/source$/auxiliary$/LANGUAGE$/swriter.tree \ + $(MISC)$/LANGUAGE$/swriter.tree \ $(BIN)$/xhp_swriter_LANGUAGE.zip |