From 05763a415a615b71d68a9ddb042d694ca7a7d08e Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Fri, 17 Mar 2000 23:16:36 +0000
Subject: [PATCH] Added c++ munching for vxWorks.

---
 configure/CONFIG_COMMON |  1 +
 configure/RULES_BUILD   | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
index bb7822638..ad2a902b3 100644
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -303,6 +303,7 @@ DIRECTORY_TARGETS += $(INSTALL_DBD) $(INSTALL_INCLUDE)
 
 INSTALL_PROD= $(PRODNAME:%= $(INSTALL_BIN)/%)
 INSTALL_LIBS= $(LIBNAME:%=$(INSTALL_LIB)/%)
+INSTALL_MUNCHS= $(MUNCHNAME:%=$(INSTALL_LIB)/%)
 INSTALL_SHRLIBS= $(SHRLIBNAME:%=$(INSTALL_SHRLIB)/%)
 INSTALL_DLL_LINK_LIBS=$(DLL_LINK_LIBNAME:%=$(INSTALL_LIB)/%)
 INSTALL_TCLLIBS=$(TCLLIBNAME:%=$(INSTALL_TCLLIB)/%)
diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index 1baf660ab..2ee52935a 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -66,6 +66,9 @@ PROD =
 TESTPROD = 
 LIBRARY_HOST =
 LIBRARY_IOC += $(LIBRARY)
+ifdef MUNCH
+LIBRARY_IOC += $(MUNCH_LIBRARY)
+endif
 endif
 
 
@@ -133,8 +136,8 @@ rebuild: clean install
 
 inc: $(DIRECTORY_TARGETS) $(INSTALL_INC) $(INSTALL_INCREC)
 
-build: $(OBJSNAME) \
-	$(LIBTARGETS) $(PRODNAME) $(TESTPRODNAME) $(TARGETS)
+build: $(OBJSNAME) $(LIBTARGETS) $(PRODNAME) $(TESTPRODNAME) \
+	$(TARGETS) $(MUNCHNAME)
 
 buildInstall : \
 	$(INSTALL_SCRIPTS) $(INSTALL_PROD) \
@@ -145,7 +148,7 @@ buildInstall : \
 	$(INSTALL_TEMPLATE) \
 	$(INSTALL_CONFIGS) \
 	$(INSTALL_DBS) $(INSTALL_BPTS) \
-	$(INSTALL_DBDNAME)
+	$(INSTALL_DBDNAME) $(INSTALL_MUNCHS)
 
 ifdef BIN_INSTALLS
 buildInstall : binInstalls
@@ -190,7 +193,7 @@ depends: $(LIBSRCS) $(SRCS) $(PROD_SRCS)
 	$(DEPENDS_RULE)
 
 # C++ munching for VxWorks
-%.out : %.o
+%.munch : %.o
 	@ $(RM) ctct.o ctdt.c
 	$(NM) $< | $(MUNCH) > ctdt.c
 	$(COMPILE.c) -traditional ctdt.c