diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-11-08 11:04:09 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-11-08 11:04:09 +0000 |
| commit | 842bac4ed0dcb14855e99057c74e2068470f2e6d (patch) | |
| tree | c1a492852fd6335b594a349748952489f4930962 /solenv/inc/tg_merge.mk | |
| parent | b429b3367f6896206d02dd0e715150d464218eba (diff) | |
INTEGRATION: CWS ause070 (1.8.26); FILE MERGED
2006/10/18 15:24:31 hjs 1.8.26.3: #i70136# change check to work with configure default
2006/10/06 14:16:32 hjs 1.8.26.2: #i70136# *.ulf file handling
2006/10/05 16:12:14 hjs 1.8.26.1: #i70136# avoid merge if not needed
Diffstat (limited to 'solenv/inc/tg_merge.mk')
| -rw-r--r-- | solenv/inc/tg_merge.mk | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/solenv/inc/tg_merge.mk b/solenv/inc/tg_merge.mk index 359adcb216a5..de85abfb7cb4 100644 --- a/solenv/inc/tg_merge.mk +++ b/solenv/inc/tg_merge.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_merge.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: obo $ $Date: 2006-09-15 14:09:08 $ +# last change: $Author: kz $ $Date: 2006-11-08 12:04:09 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -37,11 +37,7 @@ MKFILENAME:=tg_merge.mk # look for the according rules in "rules.mk" -# dependencies from *.ulf to par-files -.IF "$(ULFPARFILES)"!="" -$(ULFPARFILES) : $(COMMONMISC)$/$(TARGET)$/$$(@:b).$(LANGFILEEXT) -.ENDIF # "$(PARFILES)"!="" - +.IF "$(WITH_LANG)"!="" .IF "$(ULFFILES)"!="" $(foreach,i,$(ULFFILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf .ENDIF # "$(ULFFILES)"!="" @@ -51,14 +47,19 @@ $(foreach,i,$(ULFFILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf $(foreach,i,$(XMLPROPERTIES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf .ENDIF # "$(ULFFILES)"!="" -# *.xrm merge -.IF "$(READMEFILES)"!="" -$(uniq $(foreach,i,$(READMEFILES) $(COMMONMISC)$/$(TARGET)$/$(i:b).xrm)) : $$(@:f) localize.sdf -.ENDIF # "$(ULFFILES)"!="" - # *.xcu merge .IF "$(LOCALIZEDFILES)"!="" $(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)$/merge$/{$(subst,.,$/ $(PACKAGE))}$/$(i:b).xcu) : $$(@:f) localize.sdf .ENDIF # "$(ULFFILES)"!="" +.ENDIF # "$(WITH_LANG)"!="" +# dependencies from *.ulf to par-files +.IF "$(ULFPARFILES)"!="" +$(ULFPARFILES) : $(COMMONMISC)$/$(TARGET)$/$$(@:b).$(LANGFILEEXT) +.ENDIF # "$(PARFILES)"!="" + +# *.xrm merge +.IF "$(READMEFILES)"!="" +$(uniq $(foreach,i,$(READMEFILES) $(COMMONMISC)$/$(TARGET)$/$(i:b).xrm)) : $$(@:f) localize.sdf +.ENDIF # "$(ULFFILES)"!="" |