From b74fd70ca37ff3ba9d80196f3a751a289e04c8a6 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Tue, 8 Aug 2000 16:11:27 +0000
Subject: [PATCH] Added osclass specific RCS. Removed osclass specific
 DBDEXPAND and DBDNAME. Added lib dependancy on lib specific RESS.

---
 configure/tools/makeMakefileInclude.pl | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/configure/tools/makeMakefileInclude.pl b/configure/tools/makeMakefileInclude.pl
index 8685d8089..25fc0ce7a 100755
--- a/configure/tools/makeMakefileInclude.pl
+++ b/configure/tools/makeMakefileInclude.pl
@@ -38,6 +38,13 @@ foreach $name ( @nameList ) {
 	print OUT "${name}_SRCS+=\$(${name}_SRCS_DEFAULT)\n";
 	print OUT "endif\n";
 	print OUT "endif\n";
+	print OUT "ifneq (\$(strip \$(${name}_RCS_\$(OS_CLASS))),)\n";
+	print OUT "${name}_RCS+=\$(subst -nil-,,\$(${name}_RCS_\$(OS_CLASS)))\n";
+	print OUT "else\n";
+	print OUT "ifdef ${name}_RCS_DEFAULT\n";
+	print OUT "${name}_RCS+=\$(${name}_RCS_DEFAULT)\n";
+	print OUT "endif\n";
+	print OUT "endif\n";
 	print OUT "ifneq (\$(strip \$(${name}_OBJS_\$(OS_CLASS))),)\n";
 	print OUT "${name}_OBJS+=\$(subst -nil-,,\$(${name}_OBJS_\$(OS_CLASS)))\n";
 	print OUT "else\n";
@@ -89,23 +96,10 @@ foreach $name ( @nameList ) {
 	print OUT "ifneq (,\$(strip \$(${name}_OBJS) \$(LIBRARY_OBJS)))\n";
 	print OUT "BUILD_LIBRARY += ${name}\n";
 	print OUT "endif\n";
+	print OUT "${name}_RESS+=\$(addsuffix \$(RES),\$(basename \$(${name}_RCS)))\n";
 	print OUT "${name}_OBJSNAME+=\$(addsuffix \$(OBJ),\$(basename \$(${name}_OBJS)))\n";
-	print OUT "\$(LIB_PREFIX)${name}\$(LIB_SUFFIX):\$(${name}_OBJSNAME)\n";
-	print OUT "\$(LIB_PREFIX)${name}\$(SHRLIB_SUFFIX):\$(${name}_OBJSNAME)\n";
-	print OUT "endif\n";
-	print OUT "ifneq (\$(strip \$(DBDEXPAND_\$(OS_CLASS))),)\n";
-	print OUT "DBDEXPAND+=\$(subst -nil-,,\$(DBDEXPAND_\$(OS_CLASS)))\n";
-	print OUT "else\n";
-	print OUT "ifdef DBDEXPAND_DEFAULT\n";
-	print OUT "DBDEXPAND+=\$(DBDEXPAND_DEFAULT)\n";
-	print OUT "endif\n";
-	print OUT "endif\n";
-	print OUT "ifneq (\$(strip \$(DBDNAME_\$(OS_CLASS))),)\n";
-	print OUT "DBDNAME+=\$(subst -nil-,,\$(DBDNAME_\$(OS_CLASS)))\n";
-	print OUT "else\n";
-	print OUT "ifdef DBDNAME_DEFAULT\n";
-	print OUT "DBDNAME+=\$(DBDNAME_DEFAULT)\n";
-	print OUT "endif\n";
+	print OUT "\$(LIB_PREFIX)${name}\$(LIB_SUFFIX):\$(${name}_OBJSNAME) \$(${name}_RESS)\n";
+	print OUT "\$(LIB_PREFIX)${name}\$(SHRLIB_SUFFIX):\$(${name}_OBJSNAME) \$(${name}_RESS)\n";
 	print OUT "endif\n";
 	print OUT "\n";
 }