#i10000# fix image/resource mess

4 files changed, 54 insertions, 274 deletions

diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index b15625f3c0de..8dc89cce6c84 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -5,9 +5,9 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 #   $RCSfile: deliver.pl,v $
 #
-#   $Revision: 1.69 $
+#   $Revision: 1.70 $
 #
-#   last change: $Author: hjs $ $Date: 2004-06-07 13:41:41 $
+#   last change: $Author: hjs $ $Date: 2004-06-08 16:38:00 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -78,7 +78,7 @@ use File::Spec;
 
 ( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
 
-$id_str = ' $Revision: 1.69 $ ';
+$id_str = ' $Revision: 1.70 $ ';
 $id_str =~ /Revision:\s+(\S+)\s+\$/
   ? ($script_rev = $1) : ($script_rev = "-");
 
@@ -111,7 +111,7 @@ $module             = 0;            # module name
 $base_dir           = 0;            # path to module base directory
 $dlst_file          = 0;            # path to d.lst
 @ilst_file          = ();           # array of pathes to image lists
-$ilst_ext           = 'ilst2';      # extension of image lists
+$ilst_ext           = 'ilst';      # extension of image lists
 $umask              = 22;           # default file/directory creation mask
 $dest               = 0;            # optional destination path
 $common_build       = 0;            # do we have common trees?
diff --git a/solenv/bin/packimages.pl b/solenv/bin/packimages.pl
index 1acb72ae133d..79503d2ba943 100755
--- a/solenv/bin/packimages.pl
+++ b/solenv/bin/packimages.pl
@@ -5,9 +5,9 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 #   $RCSfile: packimages.pl,v $
 #
-#   $Revision: 1.4 $
+#   $Revision: 1.5 $
 #
-#   last change: $Author: hjs $ $Date: 2004-06-07 13:41:42 $
+#   last change: $Author: hjs $ $Date: 2004-06-08 16:38:00 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -91,7 +91,7 @@ my $extra_verbose;           # be extra verbose
 ( my $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
 
 my $script_rev;
-my $id_str = ' $Revision: 1.4 $ ';
+my $id_str = ' $Revision: 1.5 $ ';
 $id_str =~ /Revision:\s+(\S+)\s+\$/
   ? ($script_rev = $1) : ($script_rev = "-");
 
@@ -148,7 +148,7 @@ sub parse_options
 
 sub get_image_lists
 {
-    my @image_lists = glob("$imagelist_path/*.ilst2");
+    my @image_lists = glob("$imagelist_path/*.ilst");
 
     if ( !@image_lists ) {
         print_error("can't find any image lists in '$imagelist_path'", 3);
diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk
index 653d9755d865..af9eb0969762 100644
--- a/solenv/inc/_tg_rslb.mk
+++ b/solenv/inc/_tg_rslb.mk
@@ -19,26 +19,6 @@ 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) \
@@ -50,10 +30,10 @@ $(RSC_MULTI1) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(RESLIB1VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(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))} \
@@ -67,11 +47,11 @@ $(RSC_MULTI1) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(BIN)$/$(RESLIB1NAME)$(RESLIB1VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(RESLIB1IMAGES)) -lip{$j}$/$(lang_{$i}) \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
     -subGLOBAL=$(SOLARSRC) \
-    -subMODULE=$(PRJ) \
+    -subMODULE=$(PRJ)$/.. \
     -subCUSTOM=to_be_defined \
     -oil$(BIN) \
     -ft$@ \
@@ -122,26 +102,6 @@ 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) \
@@ -153,10 +113,10 @@ $(RSC_MULTI2) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(RESLIB2VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(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))} \
@@ -170,11 +130,11 @@ $(RSC_MULTI2) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(BIN)$/$(RESLIB2NAME)$(RESLIB2VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(RESLIB1IMAGES)) -lip{$j}$/$(lang_{$i}) \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
     -subGLOBAL=$(SOLARSRC) \
-    -subMODULE=$(PRJ) \
+    -subMODULE=$(PRJ)$/.. \
     -subCUSTOM=to_be_defined \
     -oil$(BIN) \
     -ft$@ \
@@ -225,26 +185,6 @@ 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) \
@@ -256,10 +196,10 @@ $(RSC_MULTI3) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(RESLIB3VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(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))} \
@@ -273,11 +213,11 @@ $(RSC_MULTI3) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(BIN)$/$(RESLIB3NAME)$(RESLIB3VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(RESLIB1IMAGES)) -lip{$j}$/$(lang_{$i}) \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
     -subGLOBAL=$(SOLARSRC) \
-    -subMODULE=$(PRJ) \
+    -subMODULE=$(PRJ)$/.. \
     -subCUSTOM=to_be_defined \
     -oil$(BIN) \
     -ft$@ \
@@ -328,26 +268,6 @@ 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) \
@@ -359,10 +279,10 @@ $(RSC_MULTI4) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(RESLIB4VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(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))} \
@@ -376,11 +296,11 @@ $(RSC_MULTI4) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(BIN)$/$(RESLIB4NAME)$(RESLIB4VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(RESLIB1IMAGES)) -lip{$j}$/$(lang_{$i}) \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
     -subGLOBAL=$(SOLARSRC) \
-    -subMODULE=$(PRJ) \
+    -subMODULE=$(PRJ)$/.. \
     -subCUSTOM=to_be_defined \
     -oil$(BIN) \
     -ft$@ \
@@ -431,26 +351,6 @@ 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) \
@@ -462,10 +362,10 @@ $(RSC_MULTI5) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(RESLIB5VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(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))} \
@@ -479,11 +379,11 @@ $(RSC_MULTI5) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(BIN)$/$(RESLIB5NAME)$(RESLIB5VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(RESLIB1IMAGES)) -lip{$j}$/$(lang_{$i}) \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
     -subGLOBAL=$(SOLARSRC) \
-    -subMODULE=$(PRJ) \
+    -subMODULE=$(PRJ)$/.. \
     -subCUSTOM=to_be_defined \
     -oil$(BIN) \
     -ft$@ \
@@ -534,26 +434,6 @@ 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) \
@@ -565,10 +445,10 @@ $(RSC_MULTI6) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(RESLIB6VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(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))} \
@@ -582,11 +462,11 @@ $(RSC_MULTI6) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(BIN)$/$(RESLIB6NAME)$(RESLIB6VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(RESLIB1IMAGES)) -lip{$j}$/$(lang_{$i}) \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
     -subGLOBAL=$(SOLARSRC) \
-    -subMODULE=$(PRJ) \
+    -subMODULE=$(PRJ)$/.. \
     -subCUSTOM=to_be_defined \
     -oil$(BIN) \
     -ft$@ \
@@ -637,26 +517,6 @@ 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) \
@@ -668,10 +528,10 @@ $(RSC_MULTI7) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(RESLIB7VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(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))} \
@@ -685,11 +545,11 @@ $(RSC_MULTI7) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(BIN)$/$(RESLIB7NAME)$(RESLIB7VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(RESLIB1IMAGES)) -lip{$j}$/$(lang_{$i}) \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
     -subGLOBAL=$(SOLARSRC) \
-    -subMODULE=$(PRJ) \
+    -subMODULE=$(PRJ)$/.. \
     -subCUSTOM=to_be_defined \
     -oil$(BIN) \
     -ft$@ \
@@ -740,26 +600,6 @@ 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) \
@@ -771,10 +611,10 @@ $(RSC_MULTI8) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(RESLIB8VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(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))} \
@@ -788,11 +628,11 @@ $(RSC_MULTI8) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(BIN)$/$(RESLIB8NAME)$(RESLIB8VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(RESLIB1IMAGES)) -lip{$j}$/$(lang_{$i}) \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
     -subGLOBAL=$(SOLARSRC) \
-    -subMODULE=$(PRJ) \
+    -subMODULE=$(PRJ)$/.. \
     -subCUSTOM=to_be_defined \
     -oil$(BIN) \
     -ft$@ \
@@ -843,26 +683,6 @@ 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) \
@@ -874,10 +694,10 @@ $(RSC_MULTI9) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(RESLIB9VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(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))} \
@@ -891,11 +711,11 @@ $(RSC_MULTI9) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(BIN)$/$(RESLIB9NAME)$(RESLIB9VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(RESLIB1IMAGES)) -lip{$j}$/$(lang_{$i}) \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
     -subGLOBAL=$(SOLARSRC) \
-    -subMODULE=$(PRJ) \
+    -subMODULE=$(PRJ)$/.. \
     -subCUSTOM=to_be_defined \
     -oil$(BIN) \
     -ft$@ \
@@ -946,26 +766,6 @@ 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) \
@@ -977,10 +777,10 @@ $(RSC_MULTI10) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB10NAME)$(RESLIB10VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(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))} \
@@ -994,11 +794,11 @@ $(RSC_MULTI10) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(BIN)$/$(RESLIB10NAME)$(RESLIB10VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(RESLIB1IMAGES)) -lip{$j}$/$(lang_{$i}) \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
     -subGLOBAL=$(SOLARSRC) \
-    -subMODULE=$(PRJ) \
+    -subMODULE=$(PRJ)$/.. \
     -subCUSTOM=to_be_defined \
     -oil$(BIN) \
     -ft$@ \
diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk
index 89a5ece4147a..c9a801016e9e 100644
--- a/solenv/inc/tg_rslb.mk
+++ b/solenv/inc/tg_rslb.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: tg_rslb.mk,v $
 #
-#   $Revision: 1.8 $
+#   $Revision: 1.9 $
 #
-#   last change: $Author: hjs $ $Date: 2004-06-07 13:47:40 $
+#   last change: $Author: hjs $ $Date: 2004-06-08 16:37:09 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -111,26 +111,6 @@ ALLTAR : $(HIDRES$(TNR)PARTICLE)
 
 .ENDIF # "$(BUILDHIDS)"!=""
 
-.IF "$(common_build_reslib)"!=""
-$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION).ilst2 : $(RSC_MULTI$(TNR))
-.IF "$(use_shell)"!="4nt"	
-    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
-.ELSE			# "$(use_shell)"!="4nt"	
-    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
-.ENDIF			# "$(use_shell)"!="4nt"	
-
-ALLTAR : $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION).ilst2
-.ELSE           # "$(common_build_reslib)"!=""
-$(BIN)$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION).ilst2 : $(RSC_MULTI$(TNR))
-.IF "$(use_shell)"!="4nt"	
-    $(TYPE) $(mktmp $(foreach,i,$(alllangext) $(BIN)$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION)$i.ilst)) | xargs sed s\#%MODULE%\#%MODULE%$/$(PRJNAME)\# > $@
-.ELSE			# "$(use_shell)"!="4nt"	
-    +$(TYPE) $(foreach,i,$(alllangext) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION)$i.ilst) | sed `s/MODULE%/MODULE%\/$(PRJNAME)/` > $@
-.ENDIF			# "$(use_shell)"!="4nt"	
-
-ALLTAR : $(BIN)$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION).ilst2
-.ENDIF          # "$(common_build_reslib)"!=""
-
 $(RSC_MULTI$(TNR)) : \
         $(RESLIB$(TNR)SRSFILES) \
         $(RESLIB$(TNR)TARGETN) \
@@ -142,10 +122,10 @@ $(RSC_MULTI$(TNR)) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(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))} \
@@ -159,11 +139,11 @@ $(RSC_MULTI$(TNR)) : \
     $(foreach,i,$(alllangext) $(rsclang_{$i}) \
     $(rescharset_{$i}) \
     -fs{$(BIN)$/$(RESLIB$(TNR)NAME)$(RESLIB$(TNR)VERSION)$i.res} \
-    $(foreach,j,$(RESLIB1IMAGES) -lip{$j}$/$(lang_{$i}) \
+    $(foreach,j,$(subst,$(PRJ),$(PRJ)$/..$/$(PRJNAME) $(RESLIB1IMAGES)) -lip{$j}$/$(lang_{$i}) \
     -lip{$j} ) \
     -lip$(SOLARSRC)$/res$/$(lang_{$i}) -lip$(SOLARSRC)$/res ) \
     -subGLOBAL=$(SOLARSRC) \
-    -subMODULE=$(PRJ) \
+    -subMODULE=$(PRJ)$/.. \
     -subCUSTOM=to_be_defined \
     -oil$(BIN) \
     -ft$@ \