INTEGRATION: CWS ause018 (1.10.14); FILE MERGED

2005/02/07 18:56:44 hjs 1.10.14.4: #i42057# avoid zip targets for javaless builds
2005/02/07 16:45:19 hjs 1.10.14.3: #i42057# avoid unwanted files in zip
2005/02/07 14:09:18 hjs 1.10.14.2: #i42057# unique TARGET names in generated link makefiles
2005/02/04 17:42:25 hjs 1.10.14.1: #i39062# use *.tree files generated to MISC
This commit is contained in:
Jens-Heiner Rechtien
2005-02-11 14:16:36 +00:00
parent fd5a1ad2de
commit 4be16e694a

View File

@ -3,9 +3,9 @@
#* $Workfile:$
#*
#* Creation date KR 28.06.99
#* last change $Author: rt $ $Date: 2004-12-16 13:01:34 $
#* last change $Author: hr $ $Date: 2005-02-11 15:16:36 $
#*
#* $Revision: 1.10 $
#* $Revision: 1.11 $
#*
#* $Logfile:$
#*
@ -19,25 +19,27 @@ PRJ = ..$/..
PRJNAME = helpcontent2
# uniqe name (module wide);
# using a modified form of package should do here
TARGET = util
TARGET = util_shared
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/settings.pmk
.IF "$(SOLAR_JAVA)"!=""
common_build_zip:=
zip1generatedlangs=TRUE
zip1langdirs=$(aux_alllangiso)
ZIP1TARGET=xhp_shared
ZIP1FLAGS= -u -r
ZIP1DIR=$(MISC)$/$(LANGDIR)
ZIP1LIST=$(LANGDIR)$/text$/shared$/* -x "*.dphh*" -x "*.hzip"
ZIP1LIST=$(LANGDIR)$/text$/shared$/* -x "*.dphh*" -x "*.hzip" -x "*.created"
.ENDIF # "$(SOLAR_JAVA)"!=""
LINKNAME=shared
LINKADDEDFILES= \
-add shared.tree $(PRJ)$/source$/auxiliary$/LANGUAGE$/shared.tree \
-add shared.tree $(MISC)$/LANGUAGE$/shared.tree \
-add shared.jar $(BIN)$/xhp_shared_LANGUAGE.zip \
-add default.css $(PRJ)$/source$/auxiliary$/LANGUAGE$/default.css \
-add highcontrast1.css $(PRJ)$/source$/auxiliary$/LANGUAGE$/highcontrast1.css \
@ -48,7 +50,7 @@ LINKADDEDFILES= \
LINKADDEDDEPS= \
$(PRJ)$/source$/auxiliary$/LANGUAGE$/shared.tree \
$(MISC)$/LANGUAGE$/shared.tree \
$(BIN)$/xhp_shared_LANGUAGE.zip \
$(PRJ)$/source$/auxiliary$/LANGUAGE$/default.css \
$(PRJ)$/source$/auxiliary$/LANGUAGE$/highcontrast1.css \