# HG changeset patch
# User Henning Brinkmann <hbrinkm@openoffice.org>
# Date 1249554246 -7200
# Node ID c365e90758b117c79a73280165eac49ddf233dac
# Parent  68aff558b6943e56caf3d958c1dca5ba0c5db12e
added master fix

diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk
--- a/solenv/inc/_tg_srs.mk
+++ b/solenv/inc/_tg_srs.mk
@@ -15,7 +15,9 @@
 
 .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 @@
     $(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 @@
 		$(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 @@
 
 .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 @@
     $(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 @@
 		$(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 @@
 
 .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 @@
     $(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 @@
 		$(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 @@
 
 .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 @@
     $(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 @@
 		$(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 @@
 
 .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 @@
     $(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 @@
 		$(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 @@
 
 .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 @@
     $(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 @@
 		$(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 @@
 
 .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 @@
     $(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 @@
 		$(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 @@
 
 .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 @@
     $(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 @@
 		$(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 @@
 
 .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 @@
     $(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 @@
 		$(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 @@
 
 .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 @@
     $(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 @@
 		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
 		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
 		-fp=$@.$(INPATH) \
-		$< \
+		$(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) \
 	)
 	-$(RM) $@
 	$(RENAME) $@.$(INPATH) $@
diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk
--- a/solenv/inc/tg_srs.mk
+++ b/solenv/inc/tg_srs.mk
@@ -47,7 +47,9 @@
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES) $(LOCALIZE_ME_DEST)
+$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(LOCALIZE_ME_DEST)
+
+$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES)
 	@echo ------------------------------
 	@echo Making: $@
 	@@-$(RM) $(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr
@@ -63,7 +65,9 @@
     $(RENAME) $@.$(INPATH) $@
     -$(RM) $@.$(INPATH)
 
-$(SRS)$/$(SRS$(TNR)NAME).srs: $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) $(LOCALIZE_ME_DEST)
+$(SRS)$/$(SRS$(TNR)NAME).srs: $(LOCALIZE_ME_DEST)
+
+$(SRS)$/$(SRS$(TNR)NAME).srs: $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i)
 .ELSE			# "$(WITH_LANG)"!=""
 $(SRS)$/$(SRS$(TNR)NAME).srs: $(SRC$(TNR)FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
@@ -73,7 +77,7 @@
 		$(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
 		$(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
 		-fp=$@.$(INPATH) \
-		$< \
+		$(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) \
 	)
 	-$(RM) $@
 	$(RENAME) $@.$(INPATH) $@
