summaryrefslogtreecommitdiff
path: root/helpcontent2/makefile.pmk
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2006-03-29 12:24:41 +0000
committerOliver Bolte <obo@openoffice.org>2006-03-29 12:24:41 +0000
commita621cc9d2319eb866291147e0a7bf46ebd0936e9 (patch)
treeacc067df4852b427385eb0509e50738bfc669e0a /helpcontent2/makefile.pmk
parent8a30248adfe986c1a9f0d5220a35a0d52c2a5d16 (diff)
INTEGRATION: CWS hc2opti (1.11.14); FILE MERGED
2006/03/08 12:58:13 ihi 1.11.14.4: cleanup 2006/02/14 18:31:30 ihi 1.11.14.3: windows break fix 2006/02/14 15:49:51 ihi 1.11.14.2: RESYNC: (1.11-1.12); FILE MERGED 2006/02/14 13:01:41 ihi 1.11.14.1: #i55666# hc2 build speedup prototype
Diffstat (limited to 'helpcontent2/makefile.pmk')
-rwxr-xr-xhelpcontent2/makefile.pmk19
1 files changed, 10 insertions, 9 deletions
diff --git a/helpcontent2/makefile.pmk b/helpcontent2/makefile.pmk
index b29e6e9e00..76fda429cf 100755
--- a/helpcontent2/makefile.pmk
+++ b/helpcontent2/makefile.pmk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.pmk,v $
#
-# $Revision: 1.12 $
+# $Revision: 1.13 $
#
-# last change: $Author: kz $ $Date: 2006-01-03 14:40:43 $
+# last change: $Author: obo $ $Date: 2006-03-29 13:24:41 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -37,24 +37,25 @@ SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE))
HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(COMMONMISC)$/$j$/$(SHELL_PACKAGE)$/$(i:f)))
.IF "$(SOLAR_JAVA)"!=""
-ALLTAR : $(foreach,i,$(XHPFILES:b) $(COMMONMISC)$/$(TARGET).$i.done) $(COMMONMISC)$/xhp_changed.flag optix
+ALLTAR : $(COMMONMISC)$/$(TARGET).done $(COMMONMISC)$/xhp_changed.flag optix
.ENDIF
$(HLANGXHPFILES) : $$(@:d)thisdir.created
$(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp : %.xhp
- @$(TOUCH) $@
+ @$(NULL)
-$(foreach,i,$(XHPFILES:b) $(COMMONMISC)$/$(TARGET).$i.done) : $(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/$$(@:b:e:s/.//).xhp
- @+$(WRAPCMD) helpex -QQ -p helpcontent2 -r $(PRJ) -i $(uniq $(<:f)) -x $(COMMONMISC) -y $(SHELL_PACKAGE)$/$(@:b:e:s/.//).xhp -l all -lf $(aux_alllangiso:t",") -m localize.sdf && $(TOUCH) $@
+$(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES)
+ @+$(WRAPCMD) helpex -QQ -p helpcontent2 -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m localize.sdf && $(TOUCH) $@
# urks - dmake mixes up operators and strings :-(
.IF "$(HLANGXHPFILES:s/defined/xxx/)"!=""
.IF "$(HELPTRANSPHONY)"!=""
-$(foreach,i,$(XHPFILES) $(COMMONMISC)$/$(TARGET).$(i:b).done) .PHONY :
+$(foreach,i,$(XHPFILES) $(COMMONMISC)$/$(TARGET).done) .PHONY :
.ELSE # "$(HELPTRANSPHONY)"!=""
-$(foreach,i,$(XHPFILES) $(COMMONMISC)$/$(TARGET).$(i:b).done) : localize.sdf makefile.mk
+
+$(COMMONMISC)$/$(TARGET).done : localize.sdf makefile.mk
.ENDIF # "$(HELPTRANSPHONY)"!=""
.ENDIF # "$(HLANGXHPFILES)"!=""
@@ -67,7 +68,7 @@ $(COMMONMISC)$/xhp_changed.flag : $(HLANGXHPFILES)
@+$(ECHONL)
.ENDIF # "$(OS)"=="SOLARIS"
-optix: $(foreach,i,$(XHPFILES) $(COMMONMISC)$/$(TARGET).$(i:b).done)
+optix: $(foreach,i,$(XHPFILES) $(COMMONMISC)$/$(TARGET).done)
@+echo done
%.created :