ChangeLogTag: Wed Jan 7 17:49:46 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 28 insertions, 28 deletions

diff --git a/apps/gperf/tests/Makefile b/apps/gperf/tests/Makefile
index f9a29417a6f..d2d076f296a 100644
--- a/apps/gperf/tests/Makefile
+++ b/apps/gperf/tests/Makefile
@@ -28,7 +28,7 @@ GPERF = ../src/gperf
 PROG_SRCS = \
 	test.cpp \
 	cinset.cpp \
-	c++inset.cpp \
+	cppinset.cpp \
 	iinset.cpp \
 	iinset2.cpp \
 	tinset.cpp \
@@ -47,7 +47,7 @@ AOUT_OBJS = test.o \
 	    adainset.o
 
 CPPOUT_OBJS = test.o \
-	      c++inset.o
+	      cppinset.o
 
 PREOUT_OBJS = test.o \
 	      preinset.o
@@ -72,7 +72,7 @@ TAOOUT_OBJS = test.o \
 
 BIN  =  cout \
 	aout \
-	c++out \
+	cppout \
 	preout \
 	m3out \
 	pout \
@@ -103,7 +103,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 all: cout \
 	aout \
-	c++out \
+	cppout \
 	preout \
 	m3out \
 	pout \
@@ -118,8 +118,8 @@ cinset.cpp: $(srcdir)/c.gperf $(GPERF)
 adainset.cpp: $(srcdir)/ada.gperf $(GPERF)
 	$(GPERF)  -a -k1,4,'$$' $(srcdir)/ada.gperf > $@
 
-c++inset.cpp: $(srcdir)/c++.gperf $(GPERF)
-	$(GPERF) -a -D $(srcdir)/c++.gperf > $@
+cppinset.cpp: $(srcdir)/cpp.gperf $(GPERF)
+	$(GPERF) -a -D $(srcdir)/cpp.gperf > $@
 
 preinset.cpp: $(srcdir)/adadefs.gperf $(GPERF)
 	$(GPERF)  -a -p -D -k1,'$$' -s 2 -o $(srcdir)/adadefs.gperf > $@
@@ -151,7 +151,7 @@ cout:$(addprefix $(VDIR),$(COUT_OBJS))
 aout:$(addprefix $(VDIR),$(AOUT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-c++out:$(addprefix $(VDIR),$(CPPOUT_OBJS))
+cppout:$(addprefix $(VDIR),$(CPPOUT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 preout:$(addprefix $(VDIR),$(PREOUT_OBJS))
@@ -175,7 +175,7 @@ tout:$(addprefix $(VDIR),$(TOUT_OBJS))
 taoout:$(addprefix $(VDIR),$(TAOOUT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-runtests: cout aout c++out preout m3out pout iout iout2 tout taoout
+runtests: cout aout cppout preout m3out pout iout iout2 tout taoout
 	 @echo "performing some tests of the perfect hash generator"
 	 # test cout
 	 ./cout -v < $(srcdir)/c.gperf > c.out
@@ -183,9 +183,9 @@ runtests: cout aout c++out preout m3out pout iout iout2 tout taoout
 	 # test aout
 	 ./aout -v < $(srcdir)/ada.gperf > ada-res.out
 	 -diff -b $(srcdir)/ada-res.exp ada-res.out
-	 # test c++out
-	 ./c++out -v < $(srcdir)/c++.gperf > c++-res.out
-	 -diff -b $(srcdir)/c++-res.exp c++-res.out
+	 # test cppout
+	 ./cppout -v < $(srcdir)/cpp.gperf > cpp-res.out
+	 -diff -b $(srcdir)/cpp-res.exp cpp-res.out
 	 # test preout
 	 ./preout -v < $(srcdir)/adadefs.gperf > ada-pred.out
 	 -diff -b $(srcdir)/ada-pred.exp ada-pred.out
@@ -225,9 +225,9 @@ runtests: cout aout c++out preout m3out pout iout iout2 tout taoout
 	 -diff -b $(srcdir)/test-7.exp test-7.out
 
 realclean:
-	$(RM) -rf *.out cinset.cpp c++inset.cpp iinset.cpp iinset2.cpp \
+	$(RM) -rf *.out cinset.cpp cppinset.cpp iinset.cpp iinset2.cpp \
 	tinset.cpp taoinset.cpp pinset.cpp m3inset.cpp adainset.cpp preinset.cpp
-	$(RM) -rf c.out aout preout m3out pout cout c++out iout iout2 tout taoout
+	$(RM) -rf c.out aout preout m3out pout cout cppout iout iout2 tout taoout
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/apps/gperf/tests/Makefile.am b/apps/gperf/tests/Makefile.am
index a6cc359241b..c5ee4623956 100644
--- a/apps/gperf/tests/Makefile.am
+++ b/apps/gperf/tests/Makefile.am
@@ -33,13 +33,13 @@
 AUTOMAKE_OPTIONS = 1.4
 
 
-noinst_PROGRAMS = cout aout c++out preout m3out pout iout iout2 tout
+noinst_PROGRAMS = cout aout cppout preout m3out pout iout iout2 tout
 
 cout_SOURCES = cinset.cpp test.cpp
 
 aout_SOURCES = adainset.cpp test.cpp
 
-c++out_SOURCES = c++inset.cpp test.cpp
+cppout_SOURCES = cppinset.cpp test.cpp
 
 preout_SOURCES = preinset.cpp test.cpp
 
@@ -56,7 +56,7 @@ tout_SOURCES = tinset.cpp test.cpp
 BUILT_SOURCES = \
         cinset.cpp \
         adainset.cpp \
-        c++inset.cpp \
+        cppinset.cpp \
         preinset.cpp \
         m3inset.cpp \
         pinset.cpp \
@@ -72,7 +72,7 @@ EXTRA_DIST = \
         modula2.gperf \
         ada-pred.exp \
         ada-res.exp \
-        c++-res.exp \
+        cpp-res.exp \
         c.exp \
         corba.exp \
         idl.exp \
@@ -92,8 +92,8 @@ cinset.cpp: c.gperf
 adainset.cpp: ada.gperf
         $(GPERF) -a -k1,4,'$$' $(srcdir)/ada.gperf > adainset.cpp
 
-c++inset.cpp: c++.gperf
-        $(GPERF) -a -D $(srcdir)/c++.gperf > c++inset.cpp
+cppinset.cpp: cpp.gperf
+        $(GPERF) -a -D $(srcdir)/cpp.gperf > cppinset.cpp
 
 preinset.cpp: adadefs.gperf
         $(GPERF) -a -p -D -k1,'$$' -s 2 -o $(srcdir)/adadefs.gperf > preinset.cpp
diff --git a/apps/gperf/tests/c++-res.exp b/apps/gperf/tests/cpp-res.exp
index 124af99193f..124af99193f 100644
--- a/apps/gperf/tests/c++-res.exp
+++ b/apps/gperf/tests/cpp-res.exp
diff --git a/apps/gperf/tests/c++.gperf b/apps/gperf/tests/cpp.gperf
index e8c8dc3f251..e8c8dc3f251 100644
--- a/apps/gperf/tests/c++.gperf
+++ b/apps/gperf/tests/cpp.gperf
diff --git a/apps/gperf/tests/tests.mpc b/apps/gperf/tests/tests.mpc
index 8a54a8bc58b..c90648dad84 100644
--- a/apps/gperf/tests/tests.mpc
+++ b/apps/gperf/tests/tests.mpc
@@ -45,25 +45,25 @@ project(adainset): gperf_test {
   }
 }
 
-project(c++inset): gperf_test {
-  exename = c++out
+project(cppinset): gperf_test {
+  exename = cppout
 
   verbatim(gnuace, bottom) {
     all: runtests
 
-    runtests: c++out
-    "	@echo "Testing c++out"
-    "	./c++out -v < c++.gperf > c++out.out
-    "	-diff -b c++-res.exp c++out.out"
+    runtests: cppout
+    "	@echo "Testing cppout"
+    "	./cppout -v < cpp.gperf > cppout.out
+    "	-diff -b cpp-res.exp cppout.out"
   }
 
   GPERF_Files {
     commandflags += -a -D
-    c++.gperf
+    cpp.gperf
   }
 
   Source_Files {
-    c++.cpp
+    cpp.cpp
   }
 }
 
@@ -213,7 +213,7 @@ project(taoinset): gperf_test {
   }
 
   GPERF_Files {
-    commandflags += -c -C -D -E -f 0 -a -o 
+    commandflags += -c -C -D -E -f 0 -a -o
     tao.gperf
   }