#i10000# back to ilst2 to fix OOo builds

1 files changed, 220 insertions, 20 deletions

diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk
index b488fb4bb423..653d9755d865 100644
--- a/solenv/inc/_tg_rslb.mk
+++ b/solenv/inc/_tg_rslb.mk
@@ -19,6 +19,26 @@ ALLTAR : $(HIDRES1PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
+.IF "$(common_build_reslib)"!=""
+$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(RESLIB1VERSION).ilst2 : $(RSC_MULTI1)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(RESLIB1VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(RESLIB1VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(RESLIB1VERSION).ilst2
+.ELSE           # "$(common_build_reslib)"!=""
+$(BIN)$/$(RESLIB1NAME)$(RESLIB1VERSION).ilst2 : $(RSC_MULTI1)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB1NAME)$(RESLIB1VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(RESLIB1VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(BIN)$/$(RESLIB1NAME)$(RESLIB1VERSION).ilst2
+.ENDIF          # "$(common_build_reslib)"!=""
+
 $(RSC_MULTI1) : \
         $(RESLIB1SRSFILES) \
         $(RESLIB1TARGETN) \
@@ -33,7 +53,7 @@ $(RSC_MULTI1) : \
     $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
-    -subMODULE=$(PRJ)$/.. \
+    -subMODULE=$(PRJ) \
     -subGLOBAL=$(SOLARSRC) \
     -subCUSTOM=to_be_defined \
     -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@@ -51,7 +71,7 @@ $(RSC_MULTI1) : \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
     -subGLOBAL=$(SOLARSRC) \
-    -subMODULE=$(PRJ)$/.. \
+    -subMODULE=$(PRJ) \
     -subCUSTOM=to_be_defined \
     -oil$(BIN) \
     -ft$@ \
@@ -102,6 +122,26 @@ ALLTAR : $(HIDRES2PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
+.IF "$(common_build_reslib)"!=""
+$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(RESLIB2VERSION).ilst2 : $(RSC_MULTI2)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(RESLIB2VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(RESLIB2VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(RESLIB2VERSION).ilst2
+.ELSE           # "$(common_build_reslib)"!=""
+$(BIN)$/$(RESLIB2NAME)$(RESLIB2VERSION).ilst2 : $(RSC_MULTI2)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB2NAME)$(RESLIB2VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(RESLIB2VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(BIN)$/$(RESLIB2NAME)$(RESLIB2VERSION).ilst2
+.ENDIF          # "$(common_build_reslib)"!=""
+
 $(RSC_MULTI2) : \
         $(RESLIB2SRSFILES) \
         $(RESLIB2TARGETN) \
@@ -116,7 +156,7 @@ $(RSC_MULTI2) : \
     $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
-    -subMODULE=$(PRJ)$/.. \
+    -subMODULE=$(PRJ) \
     -subGLOBAL=$(SOLARSRC) \
     -subCUSTOM=to_be_defined \
     -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@@ -134,7 +174,7 @@ $(RSC_MULTI2) : \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
     -subGLOBAL=$(SOLARSRC) \
-    -subMODULE=$(PRJ)$/.. \
+    -subMODULE=$(PRJ) \
     -subCUSTOM=to_be_defined \
     -oil$(BIN) \
     -ft$@ \
@@ -185,6 +225,26 @@ ALLTAR : $(HIDRES3PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
+.IF "$(common_build_reslib)"!=""
+$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(RESLIB3VERSION).ilst2 : $(RSC_MULTI3)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(RESLIB3VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(RESLIB3VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(RESLIB3VERSION).ilst2
+.ELSE           # "$(common_build_reslib)"!=""
+$(BIN)$/$(RESLIB3NAME)$(RESLIB3VERSION).ilst2 : $(RSC_MULTI3)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB3NAME)$(RESLIB3VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(RESLIB3VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(BIN)$/$(RESLIB3NAME)$(RESLIB3VERSION).ilst2
+.ENDIF          # "$(common_build_reslib)"!=""
+
 $(RSC_MULTI3) : \
         $(RESLIB3SRSFILES) \
         $(RESLIB3TARGETN) \
@@ -199,7 +259,7 @@ $(RSC_MULTI3) : \
     $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
-    -subMODULE=$(PRJ)$/.. \
+    -subMODULE=$(PRJ) \
     -subGLOBAL=$(SOLARSRC) \
     -subCUSTOM=to_be_defined \
     -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@@ -217,7 +277,7 @@ $(RSC_MULTI3) : \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
     -subGLOBAL=$(SOLARSRC) \
-    -subMODULE=$(PRJ)$/.. \
+    -subMODULE=$(PRJ) \
     -subCUSTOM=to_be_defined \
     -oil$(BIN) \
     -ft$@ \
@@ -268,6 +328,26 @@ ALLTAR : $(HIDRES4PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
+.IF "$(common_build_reslib)"!=""
+$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(RESLIB4VERSION).ilst2 : $(RSC_MULTI4)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(RESLIB4VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(RESLIB4VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(RESLIB4VERSION).ilst2
+.ELSE           # "$(common_build_reslib)"!=""
+$(BIN)$/$(RESLIB4NAME)$(RESLIB4VERSION).ilst2 : $(RSC_MULTI4)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB4NAME)$(RESLIB4VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(RESLIB4VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(BIN)$/$(RESLIB4NAME)$(RESLIB4VERSION).ilst2
+.ENDIF          # "$(common_build_reslib)"!=""
+
 $(RSC_MULTI4) : \
         $(RESLIB4SRSFILES) \
         $(RESLIB4TARGETN) \
@@ -282,7 +362,7 @@ $(RSC_MULTI4) : \
     $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
-    -subMODULE=$(PRJ)$/.. \
+    -subMODULE=$(PRJ) \
     -subGLOBAL=$(SOLARSRC) \
     -subCUSTOM=to_be_defined \
     -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@@ -300,7 +380,7 @@ $(RSC_MULTI4) : \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
     -subGLOBAL=$(SOLARSRC) \
-    -subMODULE=$(PRJ)$/.. \
+    -subMODULE=$(PRJ) \
     -subCUSTOM=to_be_defined \
     -oil$(BIN) \
     -ft$@ \
@@ -351,6 +431,26 @@ ALLTAR : $(HIDRES5PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
+.IF "$(common_build_reslib)"!=""
+$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(RESLIB5VERSION).ilst2 : $(RSC_MULTI5)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(RESLIB5VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(RESLIB5VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(RESLIB5VERSION).ilst2
+.ELSE           # "$(common_build_reslib)"!=""
+$(BIN)$/$(RESLIB5NAME)$(RESLIB5VERSION).ilst2 : $(RSC_MULTI5)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB5NAME)$(RESLIB5VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(RESLIB5VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(BIN)$/$(RESLIB5NAME)$(RESLIB5VERSION).ilst2
+.ENDIF          # "$(common_build_reslib)"!=""
+
 $(RSC_MULTI5) : \
         $(RESLIB5SRSFILES) \
         $(RESLIB5TARGETN) \
@@ -365,7 +465,7 @@ $(RSC_MULTI5) : \
     $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
-    -subMODULE=$(PRJ)$/.. \
+    -subMODULE=$(PRJ) \
     -subGLOBAL=$(SOLARSRC) \
     -subCUSTOM=to_be_defined \
     -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@@ -383,7 +483,7 @@ $(RSC_MULTI5) : \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
     -subGLOBAL=$(SOLARSRC) \
-    -subMODULE=$(PRJ)$/.. \
+    -subMODULE=$(PRJ) \
     -subCUSTOM=to_be_defined \
     -oil$(BIN) \
     -ft$@ \
@@ -434,6 +534,26 @@ ALLTAR : $(HIDRES6PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
+.IF "$(common_build_reslib)"!=""
+$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(RESLIB6VERSION).ilst2 : $(RSC_MULTI6)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(RESLIB6VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(RESLIB6VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(RESLIB6VERSION).ilst2
+.ELSE           # "$(common_build_reslib)"!=""
+$(BIN)$/$(RESLIB6NAME)$(RESLIB6VERSION).ilst2 : $(RSC_MULTI6)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB6NAME)$(RESLIB6VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(RESLIB6VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(BIN)$/$(RESLIB6NAME)$(RESLIB6VERSION).ilst2
+.ENDIF          # "$(common_build_reslib)"!=""
+
 $(RSC_MULTI6) : \
         $(RESLIB6SRSFILES) \
         $(RESLIB6TARGETN) \
@@ -448,7 +568,7 @@ $(RSC_MULTI6) : \
     $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
-    -subMODULE=$(PRJ)$/.. \
+    -subMODULE=$(PRJ) \
     -subGLOBAL=$(SOLARSRC) \
     -subCUSTOM=to_be_defined \
     -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@@ -466,7 +586,7 @@ $(RSC_MULTI6) : \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
     -subGLOBAL=$(SOLARSRC) \
-    -subMODULE=$(PRJ)$/.. \
+    -subMODULE=$(PRJ) \
     -subCUSTOM=to_be_defined \
     -oil$(BIN) \
     -ft$@ \
@@ -517,6 +637,26 @@ ALLTAR : $(HIDRES7PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
+.IF "$(common_build_reslib)"!=""
+$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(RESLIB7VERSION).ilst2 : $(RSC_MULTI7)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(RESLIB7VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(RESLIB7VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(RESLIB7VERSION).ilst2
+.ELSE           # "$(common_build_reslib)"!=""
+$(BIN)$/$(RESLIB7NAME)$(RESLIB7VERSION).ilst2 : $(RSC_MULTI7)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB7NAME)$(RESLIB7VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(RESLIB7VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(BIN)$/$(RESLIB7NAME)$(RESLIB7VERSION).ilst2
+.ENDIF          # "$(common_build_reslib)"!=""
+
 $(RSC_MULTI7) : \
         $(RESLIB7SRSFILES) \
         $(RESLIB7TARGETN) \
@@ -531,7 +671,7 @@ $(RSC_MULTI7) : \
     $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
-    -subMODULE=$(PRJ)$/.. \
+    -subMODULE=$(PRJ) \
     -subGLOBAL=$(SOLARSRC) \
     -subCUSTOM=to_be_defined \
     -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@@ -549,7 +689,7 @@ $(RSC_MULTI7) : \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
     -subGLOBAL=$(SOLARSRC) \
-    -subMODULE=$(PRJ)$/.. \
+    -subMODULE=$(PRJ) \
     -subCUSTOM=to_be_defined \
     -oil$(BIN) \
     -ft$@ \
@@ -600,6 +740,26 @@ ALLTAR : $(HIDRES8PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
+.IF "$(common_build_reslib)"!=""
+$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(RESLIB8VERSION).ilst2 : $(RSC_MULTI8)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(RESLIB8VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(RESLIB8VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(RESLIB8VERSION).ilst2
+.ELSE           # "$(common_build_reslib)"!=""
+$(BIN)$/$(RESLIB8NAME)$(RESLIB8VERSION).ilst2 : $(RSC_MULTI8)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB8NAME)$(RESLIB8VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(RESLIB8VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(BIN)$/$(RESLIB8NAME)$(RESLIB8VERSION).ilst2
+.ENDIF          # "$(common_build_reslib)"!=""
+
 $(RSC_MULTI8) : \
         $(RESLIB8SRSFILES) \
         $(RESLIB8TARGETN) \
@@ -614,7 +774,7 @@ $(RSC_MULTI8) : \
     $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
-    -subMODULE=$(PRJ)$/.. \
+    -subMODULE=$(PRJ) \
     -subGLOBAL=$(SOLARSRC) \
     -subCUSTOM=to_be_defined \
     -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@@ -632,7 +792,7 @@ $(RSC_MULTI8) : \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
     -subGLOBAL=$(SOLARSRC) \
-    -subMODULE=$(PRJ)$/.. \
+    -subMODULE=$(PRJ) \
     -subCUSTOM=to_be_defined \
     -oil$(BIN) \
     -ft$@ \
@@ -683,6 +843,26 @@ ALLTAR : $(HIDRES9PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
+.IF "$(common_build_reslib)"!=""
+$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(RESLIB9VERSION).ilst2 : $(RSC_MULTI9)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(RESLIB9VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(RESLIB9VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(RESLIB9VERSION).ilst2
+.ELSE           # "$(common_build_reslib)"!=""
+$(BIN)$/$(RESLIB9NAME)$(RESLIB9VERSION).ilst2 : $(RSC_MULTI9)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB9NAME)$(RESLIB9VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(RESLIB9VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(BIN)$/$(RESLIB9NAME)$(RESLIB9VERSION).ilst2
+.ENDIF          # "$(common_build_reslib)"!=""
+
 $(RSC_MULTI9) : \
         $(RESLIB9SRSFILES) \
         $(RESLIB9TARGETN) \
@@ -697,7 +877,7 @@ $(RSC_MULTI9) : \
     $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
-    -subMODULE=$(PRJ)$/.. \
+    -subMODULE=$(PRJ) \
     -subGLOBAL=$(SOLARSRC) \
     -subCUSTOM=to_be_defined \
     -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@@ -715,7 +895,7 @@ $(RSC_MULTI9) : \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
     -subGLOBAL=$(SOLARSRC) \
-    -subMODULE=$(PRJ)$/.. \
+    -subMODULE=$(PRJ) \
     -subCUSTOM=to_be_defined \
     -oil$(BIN) \
     -ft$@ \
@@ -766,6 +946,26 @@ ALLTAR : $(HIDRES10PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
+.IF "$(common_build_reslib)"!=""
+$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$(RESLIB10VERSION).ilst2 : $(RSC_MULTI10)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$(RESLIB10VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$(RESLIB10VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$(RESLIB10VERSION).ilst2
+.ELSE           # "$(common_build_reslib)"!=""
+$(BIN)$/$(RESLIB10NAME)$(RESLIB10VERSION).ilst2 : $(RSC_MULTI10)
+.IF "$(use_shell)"!="4nt"	
+    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB10NAME)$(RESLIB10VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
+.ELSE			# "$(use_shell)"!="4nt"	
+    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$(RESLIB10VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
+.ENDIF			# "$(use_shell)"!="4nt"	
+
+ALLTAR : $(BIN)$/$(RESLIB10NAME)$(RESLIB10VERSION).ilst2
+.ENDIF          # "$(common_build_reslib)"!=""
+
 $(RSC_MULTI10) : \
         $(RESLIB10SRSFILES) \
         $(RESLIB10TARGETN) \
@@ -780,7 +980,7 @@ $(RSC_MULTI10) : \
     $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
-    -subMODULE=$(PRJ)$/.. \
+    -subMODULE=$(PRJ) \
     -subGLOBAL=$(SOLARSRC) \
     -subCUSTOM=to_be_defined \
     -oil{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))} \
@@ -798,7 +998,7 @@ $(RSC_MULTI10) : \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
     -subGLOBAL=$(SOLARSRC) \
-    -subMODULE=$(PRJ)$/.. \
+    -subMODULE=$(PRJ) \
     -subCUSTOM=to_be_defined \
     -oil$(BIN) \
     -ft$@ \