From 3f387a4534070371e03172457d70106813dabad0 Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Mon, 25 Aug 2003 13:47:27 +0000
Subject: INTEGRATION: CWS ause04 (1.4.118); FILE MERGED 2003/08/25 12:58:03 gh
 1.4.118.2: removed filtering of srs files on solenv when building hid
 particle 2003/08/12 12:55:09 gh 1.4.118.1: generate new hid.lst using
 particles

---
 solenv/inc/tg_rslb.mk | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'solenv/inc/tg_rslb.mk')

diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk
index 4a359a5f41a6..e53267513f03 100644
--- a/solenv/inc/tg_rslb.mk
+++ b/solenv/inc/tg_rslb.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: tg_rslb.mk,v $
 #
-#   $Revision: 1.4 $
+#   $Revision: 1.5 $
 #
-#   last change: $Author: hjs $ $Date: 2002-01-09 17:19:09 $
+#   last change: $Author: kz $ $Date: 2003-08-25 14:47:27 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -84,15 +84,7 @@ $(RESLIB9TARGETN) .NULL : RESLIB9
 
 .IF "$(MULTI_RESLIB_FLAG)"==""
 RESLIB1 RESLIB2 RESLIB3 RESLIB4 RESLIB5 RESLIB6 RESLIB7 RESLIB8 RESLIB9:
-.IF "$(GUI)"!="MAC"
-.IF "$(GUI)"=="UNX"
-    @dmake $(RESLIB$(TNR)TARGETN) solarlang=$(solarlang) MULTI_RESLIB_FLAG=true TNR:=$(TNR) $(MFLAGS) $(CALLMACROS)
-.ELSE
-    dmake $(RESLIB$(TNR)TARGETN) solarlang=$(solarlang) MULTI_RESLIB_FLAG=true TNR:=$(TNR) $(MFLAGS) $(CALLMACROS)
-.ENDIF
-.ELSE
-    @dmake "$(RESLIB$(TNR)TARGETN)" MULTI_RESLIB_FLAG=true TNR:=$(TNR) $(MFLAGS) $(CALLMACROS)
-.ENDIF
+    @dmake $(RESLIB$(TNR)TARGETN) $(HIDRES$(TNR)PARTICLE) solarlang=$(solarlang) MULTI_RESLIB_FLAG=true TNR:=$(TNR) $(MFLAGS) $(CALLMACROS)
 .ELSE
 
 
@@ -102,6 +94,23 @@ RESLIB1 RESLIB2 RESLIB3 RESLIB4 RESLIB5 RESLIB6 RESLIB7 RESLIB8 RESLIB9:
 
 .IF "$(RESLIB$(TNR)TARGETN)"!=""
 
+.IF "$(BUILDHIDS)"!=""
+HIDRES$(TNR)PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB$(TNR)NAME)_res.hid
+
+#HACK cut off the dirty srs files which are included from solver
+#RESLIB$(TNR)HIDFILESx=$(shell @+echo $(RESLIB$(TNR)SRSFILES:t"\n") | $(GREP) -v "$(SOLARRESDIR:s/\/\\/)" )
+RESLIB$(TNR)HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB$(TNR)SRSFILES)))
+$(HIDRES$(TNR)PARTICLE): $(RESLIB$(TNR)HIDFILES)
+    @echo ------------------------------
+    @echo Making: $@
+    @+if exist $@ rm $@
+    $(TYPE) $(RESLIB$(TNR)HIDFILES) > $@.$(ROUT).tmp 
+    @+$(RENAME) $@.$(ROUT).tmp $@
+
+ALLTAR : $(HIDRES$(TNR)PARTICLE)
+
+.ENDIF # "$(BUILDHIDS)"!=""
+
 $(RSC_MULTI$(TNR)) : \
         $(RESLIB$(TNR)SRSFILES) \
         $(RESLIB$(TNR)TARGETN) \
-- 
cgit v1.2.3