diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-30 11:48:35 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-30 11:48:35 +0000 |
| commit | 6027f452bad2119c10a99d90b23503de47b9213a (patch) | |
| tree | 9a22dc3cd94210bb522e8228fdd6d2f362235983 /solenv/inc/tg_merge.mk | |
| parent | f82e8cea88aa0b563824f819e3e9146a5bd02674 (diff) | |
INTEGRATION: CWS ause091 (1.11.4); FILE MERGED
2008/07/23 14:23:08 hjs 1.11.4.1: #i92044# - do not relay on intermediate files
Diffstat (limited to 'solenv/inc/tg_merge.mk')
| -rw-r--r-- | solenv/inc/tg_merge.mk | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/solenv/inc/tg_merge.mk b/solenv/inc/tg_merge.mk index 05701a9695a8..7e94a271c647 100644 --- a/solenv/inc/tg_merge.mk +++ b/solenv/inc/tg_merge.mk @@ -8,7 +8,7 @@ # # $RCSfile: tg_merge.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # # This file is part of OpenOffice.org. # @@ -41,31 +41,26 @@ $(foreach,i,$(ULFFILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf # *.xrb merge .IF "$(XMLPROPERTIES)"!="" $(foreach,i,$(XMLPROPERTIES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf -.ENDIF # "$(ULFFILES)"!="" - -# *.xrm merge -.IF "$(READMEFILES)"!="" -$(foreach,i,$(READMEFILES) $(COMMONMISC)$/$(TARGET)$/$(i:b).xrm) : $$(@:f) localize.sdf -.ENDIF # "$(ULFFILES)"!="" +.ENDIF # "$(XMLPROPERTIES)"!="" # *.xrm merge .IF "$(APOCHELPFILES)"!="" $(foreach,i,$(APOCHELPFILES) $(COMMONMISC)$/$(MYPATH)$/$(i:b).xrm) : $$(@:f) localize.sdf -.ENDIF # "$(ULFFILES)"!="" +.ENDIF # "$(APOCHELPFILES)"!="" # *.xcu merge .IF "$(LOCALIZEDFILES)"!="" $(foreach,i,$(LOCALIZEDFILES) $(PROCESSOUT)$/merge$/{$(subst,.,$/ $(PACKAGE))}$/$(i:b).xcu) : $$(@:f) localize.sdf -.ENDIF # "$(ULFFILES)"!="" +.ENDIF # "$(LOCALIZEDFILES)"!="" .ENDIF # "$(WITH_LANG)"!="" # dependencies from *.ulf to par-files .IF "$(ULFPARFILES)"!="" $(ULFPARFILES) : $(COMMONMISC)$/$(TARGET)$/$$(@:b).$(LANGFILEEXT) -.ENDIF # "$(PARFILES)"!="" +.ENDIF # "$(ULFPARFILES)"!="" # *.xrm merge .IF "$(READMEFILES)"!="" $(uniq $(foreach,i,$(READMEFILES) $(COMMONMISC)$/$(TARGET)$/$(i:b).xrm)) : $$(@:f) localize.sdf -.ENDIF # "$(ULFFILES)"!="" +.ENDIF # "$(READMEFILES)"!="" |