From 4a9eb3a6059f9a6d2bc5074b7f79acb5cbf31882 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 15 Jul 2009 16:00:45 +0000 Subject: CWS-TOOLING: integrate CWS ause105 2009-07-08 17:57:23 +0200 hjs r273843 : #i103418# add missing dependency on localized .hrc files 2009-07-08 17:28:46 +0200 hjs r273841 : #i103416# handle new solver subdir sdf 2009-07-08 11:27:47 +0200 hjs r273823 : #i103409# disable cmd.exe autorun 2009-07-07 19:23:23 +0200 hjs r273813 : #i103394# fix path handling of files failed in first run of rebase.exe --- solenv/inc/_tg_srs.mk | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'solenv/inc/_tg_srs.mk') diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk index bc23ed5ffbba..3d260248b3b0 100644 --- a/solenv/inc/_tg_srs.mk +++ b/solenv/inc/_tg_srs.mk @@ -15,7 +15,7 @@ ALLTAR : $(HIDSRS1PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES) +$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES) $(LOCALIZE_ME_DEST) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS1NAME).dprr @@ -31,7 +31,7 @@ $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)$/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS1NAME).srs: $(SRC1FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -66,7 +66,7 @@ ALLTAR : $(HIDSRS2PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES) +$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES) $(LOCALIZE_ME_DEST) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS2NAME).dprr @@ -82,7 +82,7 @@ $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)$/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS2NAME).srs: $(SRC2FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -117,7 +117,7 @@ ALLTAR : $(HIDSRS3PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES) +$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES) $(LOCALIZE_ME_DEST) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS3NAME).dprr @@ -133,7 +133,7 @@ $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)$/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS3NAME).srs: $(SRC3FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -168,7 +168,7 @@ ALLTAR : $(HIDSRS4PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES) +$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES) $(LOCALIZE_ME_DEST) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS4NAME).dprr @@ -184,7 +184,7 @@ $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)$/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS4NAME).srs: $(SRC4FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -219,7 +219,7 @@ ALLTAR : $(HIDSRS5PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES) +$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES) $(LOCALIZE_ME_DEST) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS5NAME).dprr @@ -235,7 +235,7 @@ $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)$/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS5NAME).srs: $(SRC5FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -270,7 +270,7 @@ ALLTAR : $(HIDSRS6PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES) +$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES) $(LOCALIZE_ME_DEST) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS6NAME).dprr @@ -286,7 +286,7 @@ $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)$/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS6NAME).srs: $(SRC6FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -321,7 +321,7 @@ ALLTAR : $(HIDSRS7PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES) +$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES) $(LOCALIZE_ME_DEST) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS7NAME).dprr @@ -337,7 +337,7 @@ $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)$/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS7NAME).srs: $(SRC7FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -372,7 +372,7 @@ ALLTAR : $(HIDSRS8PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES) +$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES) $(LOCALIZE_ME_DEST) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS8NAME).dprr @@ -388,7 +388,7 @@ $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)$/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS8NAME).srs: $(SRC8FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -423,7 +423,7 @@ ALLTAR : $(HIDSRS9PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES) +$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES) $(LOCALIZE_ME_DEST) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS9NAME).dprr @@ -439,7 +439,7 @@ $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)$/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS9NAME).srs: $(SRC9FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -474,7 +474,7 @@ ALLTAR : $(HIDSRS10PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES) +$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES) $(LOCALIZE_ME_DEST) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS10NAME).dprr @@ -490,7 +490,7 @@ $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) +$(SRS)$/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS10NAME).srs: $(SRC10FILES) .ENDIF # "$(WITH_LANG)"!="" -- cgit From e52df004a1c710162ac6d871d7f6ecd4b36127de Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Tue, 28 Jul 2009 13:56:40 +0000 Subject: #i103736# avoid additional dependencies showing up on the rsc commandline --- solenv/inc/_tg_srs.mk | 100 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 70 insertions(+), 30 deletions(-) (limited to 'solenv/inc/_tg_srs.mk') diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk index 3d260248b3b0..d1d1d70bcb26 100644 --- a/solenv/inc/_tg_srs.mk +++ b/solenv/inc/_tg_srs.mk @@ -15,7 +15,9 @@ ALLTAR : $(HIDSRS1PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES) $(LOCALIZE_ME_DEST) +$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(LOCALIZE_ME_DEST) + +$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS1NAME).dprr @@ -31,7 +33,9 @@ $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) +$(SRS)$/$(SRS1NAME).srs: $(LOCALIZE_ME_DEST) + +$(SRS)$/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS1NAME).srs: $(SRC1FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -41,7 +45,7 @@ $(SRS)$/$(SRS1NAME).srs: $(SRC1FILES) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \ $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \ -fp=$@.$(INPATH) \ - $< \ + $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) \ ) -$(RM) $@ $(RENAME) $@.$(INPATH) $@ @@ -66,7 +70,9 @@ ALLTAR : $(HIDSRS2PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES) $(LOCALIZE_ME_DEST) +$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(LOCALIZE_ME_DEST) + +$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS2NAME).dprr @@ -82,7 +88,9 @@ $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) +$(SRS)$/$(SRS2NAME).srs: $(LOCALIZE_ME_DEST) + +$(SRS)$/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS2NAME).srs: $(SRC2FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -92,7 +100,7 @@ $(SRS)$/$(SRS2NAME).srs: $(SRC2FILES) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \ $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \ -fp=$@.$(INPATH) \ - $< \ + $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) \ ) -$(RM) $@ $(RENAME) $@.$(INPATH) $@ @@ -117,7 +125,9 @@ ALLTAR : $(HIDSRS3PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES) $(LOCALIZE_ME_DEST) +$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(LOCALIZE_ME_DEST) + +$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS3NAME).dprr @@ -133,7 +143,9 @@ $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) +$(SRS)$/$(SRS3NAME).srs: $(LOCALIZE_ME_DEST) + +$(SRS)$/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS3NAME).srs: $(SRC3FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -143,7 +155,7 @@ $(SRS)$/$(SRS3NAME).srs: $(SRC3FILES) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \ $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \ -fp=$@.$(INPATH) \ - $< \ + $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) \ ) -$(RM) $@ $(RENAME) $@.$(INPATH) $@ @@ -168,7 +180,9 @@ ALLTAR : $(HIDSRS4PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES) $(LOCALIZE_ME_DEST) +$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(LOCALIZE_ME_DEST) + +$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS4NAME).dprr @@ -184,7 +198,9 @@ $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) +$(SRS)$/$(SRS4NAME).srs: $(LOCALIZE_ME_DEST) + +$(SRS)$/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS4NAME).srs: $(SRC4FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -194,7 +210,7 @@ $(SRS)$/$(SRS4NAME).srs: $(SRC4FILES) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \ $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \ -fp=$@.$(INPATH) \ - $< \ + $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) \ ) -$(RM) $@ $(RENAME) $@.$(INPATH) $@ @@ -219,7 +235,9 @@ ALLTAR : $(HIDSRS5PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES) $(LOCALIZE_ME_DEST) +$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(LOCALIZE_ME_DEST) + +$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS5NAME).dprr @@ -235,7 +253,9 @@ $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) +$(SRS)$/$(SRS5NAME).srs: $(LOCALIZE_ME_DEST) + +$(SRS)$/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS5NAME).srs: $(SRC5FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -245,7 +265,7 @@ $(SRS)$/$(SRS5NAME).srs: $(SRC5FILES) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \ $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \ -fp=$@.$(INPATH) \ - $< \ + $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) \ ) -$(RM) $@ $(RENAME) $@.$(INPATH) $@ @@ -270,7 +290,9 @@ ALLTAR : $(HIDSRS6PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES) $(LOCALIZE_ME_DEST) +$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(LOCALIZE_ME_DEST) + +$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS6NAME).dprr @@ -286,7 +308,9 @@ $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) +$(SRS)$/$(SRS6NAME).srs: $(LOCALIZE_ME_DEST) + +$(SRS)$/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS6NAME).srs: $(SRC6FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -296,7 +320,7 @@ $(SRS)$/$(SRS6NAME).srs: $(SRC6FILES) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \ $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \ -fp=$@.$(INPATH) \ - $< \ + $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) \ ) -$(RM) $@ $(RENAME) $@.$(INPATH) $@ @@ -321,7 +345,9 @@ ALLTAR : $(HIDSRS7PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES) $(LOCALIZE_ME_DEST) +$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(LOCALIZE_ME_DEST) + +$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS7NAME).dprr @@ -337,7 +363,9 @@ $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) +$(SRS)$/$(SRS7NAME).srs: $(LOCALIZE_ME_DEST) + +$(SRS)$/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS7NAME).srs: $(SRC7FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -347,7 +375,7 @@ $(SRS)$/$(SRS7NAME).srs: $(SRC7FILES) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \ $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \ -fp=$@.$(INPATH) \ - $< \ + $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) \ ) -$(RM) $@ $(RENAME) $@.$(INPATH) $@ @@ -372,7 +400,9 @@ ALLTAR : $(HIDSRS8PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES) $(LOCALIZE_ME_DEST) +$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(LOCALIZE_ME_DEST) + +$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS8NAME).dprr @@ -388,7 +418,9 @@ $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) +$(SRS)$/$(SRS8NAME).srs: $(LOCALIZE_ME_DEST) + +$(SRS)$/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS8NAME).srs: $(SRC8FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -398,7 +430,7 @@ $(SRS)$/$(SRS8NAME).srs: $(SRC8FILES) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \ $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \ -fp=$@.$(INPATH) \ - $< \ + $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) \ ) -$(RM) $@ $(RENAME) $@.$(INPATH) $@ @@ -423,7 +455,9 @@ ALLTAR : $(HIDSRS9PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES) $(LOCALIZE_ME_DEST) +$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(LOCALIZE_ME_DEST) + +$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS9NAME).dprr @@ -439,7 +473,9 @@ $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) +$(SRS)$/$(SRS9NAME).srs: $(LOCALIZE_ME_DEST) + +$(SRS)$/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS9NAME).srs: $(SRC9FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -449,7 +485,7 @@ $(SRS)$/$(SRS9NAME).srs: $(SRC9FILES) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \ $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \ -fp=$@.$(INPATH) \ - $< \ + $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) \ ) -$(RM) $@ $(RENAME) $@.$(INPATH) $@ @@ -474,7 +510,9 @@ ALLTAR : $(HIDSRS10PARTICLE) .ENDIF # "$(BUILDHIDS)"!="" -$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES) $(LOCALIZE_ME_DEST) +$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(LOCALIZE_ME_DEST) + +$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES) @echo ------------------------------ @echo Making: $@ @@-$(RM) $(MISC)$/$(TARGET).$(SRS10NAME).dprr @@ -490,7 +528,9 @@ $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF) $(RENAME) $@.$(INPATH) $@ -$(RM) $@.$(INPATH) -$(SRS)$/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST) +$(SRS)$/$(SRS10NAME).srs: $(LOCALIZE_ME_DEST) + +$(SRS)$/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) .ELSE # "$(WITH_LANG)"!="" $(SRS)$/$(SRS10NAME).srs: $(SRC10FILES) .ENDIF # "$(WITH_LANG)"!="" @@ -500,7 +540,7 @@ $(SRS)$/$(SRS10NAME).srs: $(SRC10FILES) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \ $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \ -fp=$@.$(INPATH) \ - $< \ + $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) \ ) -$(RM) $@ $(RENAME) $@.$(INPATH) $@ -- cgit From ff6b2cadef0394f0c6448ee31b3b8aae3126b44b Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Mon, 3 Aug 2009 13:35:02 +0000 Subject: #i10000#, #i103736# - previous change broke build without WITH_LANG set --- solenv/inc/_tg_srs.mk | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'solenv/inc/_tg_srs.mk') diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk index d1d1d70bcb26..5ffdaea6b88d 100644 --- a/solenv/inc/_tg_srs.mk +++ b/solenv/inc/_tg_srs.mk @@ -45,7 +45,7 @@ $(SRS)$/$(SRS1NAME).srs: $(SRC1FILES) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \ $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \ -fp=$@.$(INPATH) \ - $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) \ + $< \ ) -$(RM) $@ $(RENAME) $@.$(INPATH) $@ @@ -100,7 +100,7 @@ $(SRS)$/$(SRS2NAME).srs: $(SRC2FILES) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \ $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \ -fp=$@.$(INPATH) \ - $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) \ + $< \ ) -$(RM) $@ $(RENAME) $@.$(INPATH) $@ @@ -155,7 +155,7 @@ $(SRS)$/$(SRS3NAME).srs: $(SRC3FILES) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \ $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \ -fp=$@.$(INPATH) \ - $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) \ + $< \ ) -$(RM) $@ $(RENAME) $@.$(INPATH) $@ @@ -210,7 +210,7 @@ $(SRS)$/$(SRS4NAME).srs: $(SRC4FILES) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \ $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \ -fp=$@.$(INPATH) \ - $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) \ + $< \ ) -$(RM) $@ $(RENAME) $@.$(INPATH) $@ @@ -265,7 +265,7 @@ $(SRS)$/$(SRS5NAME).srs: $(SRC5FILES) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \ $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \ -fp=$@.$(INPATH) \ - $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) \ + $< \ ) -$(RM) $@ $(RENAME) $@.$(INPATH) $@ @@ -320,7 +320,7 @@ $(SRS)$/$(SRS6NAME).srs: $(SRC6FILES) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \ $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \ -fp=$@.$(INPATH) \ - $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) \ + $< \ ) -$(RM) $@ $(RENAME) $@.$(INPATH) $@ @@ -375,7 +375,7 @@ $(SRS)$/$(SRS7NAME).srs: $(SRC7FILES) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \ $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \ -fp=$@.$(INPATH) \ - $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) \ + $< \ ) -$(RM) $@ $(RENAME) $@.$(INPATH) $@ @@ -430,7 +430,7 @@ $(SRS)$/$(SRS8NAME).srs: $(SRC8FILES) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \ $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \ -fp=$@.$(INPATH) \ - $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) \ + $< \ ) -$(RM) $@ $(RENAME) $@.$(INPATH) $@ @@ -485,7 +485,7 @@ $(SRS)$/$(SRS9NAME).srs: $(SRC9FILES) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \ $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \ -fp=$@.$(INPATH) \ - $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) \ + $< \ ) -$(RM) $@ $(RENAME) $@.$(INPATH) $@ @@ -540,7 +540,7 @@ $(SRS)$/$(SRS10NAME).srs: $(SRC10FILES) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \ $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \ -fp=$@.$(INPATH) \ - $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) \ + $< \ ) -$(RM) $@ $(RENAME) $@.$(INPATH) $@ -- cgit