diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-02-11 14:15:43 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-02-11 14:15:43 +0000 |
| commit | 478789eef91fed64e5be8973811bd91baa14d5e2 (patch) | |
| tree | 929969655b3dc9213430d07e447b061fa7cafaf4 /helpcontent2/util/scalc | |
| parent | d1ef1895e2add64fc4401542529cb44da7ef6d1d (diff) | |
INTEGRATION: CWS ause018 (1.12.6); FILE MERGED
2005/02/07 18:56:42 hjs 1.12.6.4: #i42057# avoid zip targets for javaless builds
2005/02/07 16:45:16 hjs 1.12.6.3: #i42057# avoid unwanted files in zip
2005/02/07 14:09:12 hjs 1.12.6.2: #i42057# unique TARGET names in generated link makefiles
2005/02/04 17:42:24 hjs 1.12.6.1: #i39062# use *.tree files generated to MISC
Diffstat (limited to 'helpcontent2/util/scalc')
| -rw-r--r-- | helpcontent2/util/scalc/makefile.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/helpcontent2/util/scalc/makefile.mk b/helpcontent2/util/scalc/makefile.mk index dc0e0a15ba..4075c8c7af 100644 --- a/helpcontent2/util/scalc/makefile.mk +++ b/helpcontent2/util/scalc/makefile.mk @@ -3,9 +3,9 @@ #* $Workfile:$ #* #* Creation date KR 28.06.99 -#* last change $Author: rt $ $Date: 2005-01-28 10:44:20 $ +#* last change $Author: hr $ $Date: 2005-02-11 15:15:43 $ #* -#* $Revision: 1.12 $ +#* $Revision: 1.13 $ #* #* $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_scalc # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/settings.pmk +.IF "$(SOLAR_JAVA)"!="" common_build_zip:= zip1generatedlangs=TRUE zip1langdirs=$(aux_alllangiso) ZIP1TARGET=xhp_scalc ZIP1FLAGS= -u -r ZIP1DIR=$(MISC)$/$(LANGDIR) -ZIP1LIST=$(LANGDIR)$/text$/scalc$/* -x "*.dphh*" -x "*.hzip" +ZIP1LIST=$(LANGDIR)$/text$/scalc$/* -x "*.dphh*" -x "*.hzip" -x "*.created" +.ENDIF # "$(SOLAR_JAVA)"!="" LINKNAME=scalc LINKADDEDFILES= \ -add scalc.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/scalc.cfg \ - -add scalc.tree $(PRJ)$/source$/auxiliary$/LANGUAGE$/scalc.tree \ + -add scalc.tree $(MISC)$/LANGUAGE$/scalc.tree \ -add scalc.jar $(BIN)$/xhp_scalc_LANGUAGE.zip LINKADDEDDEPS= \ $(PRJ)$/source$/auxiliary$/LANGUAGE$/scalc.cfg \ - $(PRJ)$/source$/auxiliary$/LANGUAGE$/scalc.tree \ + $(MISC)$/LANGUAGE$/scalc.tree \ $(BIN)$/xhp_scalc_LANGUAGE.zip |