The c++ tests use .cpp instead of .c extensions just to be on the safe side.

diff --git a/tests/test-c-cpp-nr/Makefile.am b/tests/test-c-cpp-nr/Makefile.am
index 9550ef705a9c83a8706c1de1dcbdf29f229a46d2..d2cb1af6f348d6dd542aa4c2ec73d4ef05e6bf96 100644 (file)
--- a/tests/test-c-cpp-nr/Makefile.am
+++ b/tests/test-c-cpp-nr/Makefile.am
@@ -23,7 +23,7 @@ BISON = @BISON@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c parser.c parser.h test-cpp-nr $(OBJS) OUTPUT
+CLEANFILES = scanner.cpp test-cpp-nr $(OBJS) OUTPUT
 OBJS = scanner.o
 
 INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I .
@@ -32,17 +32,14 @@ INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I .
 
 testname = test-c-cpp-nr
 
-scanner.c: $(srcdir)/scanner.l
+scanner.cpp: $(srcdir)/scanner.l
        $(FLEX) $<
 
-parser.c: $(srcdir)/parser.y
-       $(BISON) $(YFLAGS) $<
-
 $(testname)$(EXEEXT): $(OBJS)
        $(CXX) -o $(testname)$(EXEEXT) $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
-.c.o:
-       $(CXX) -c -o $@ $(INCLUDES) $<
+.cpp.o:
+       $(CXX) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $<

diff --git a/tests/test-c-cpp-nr/scanner.l b/tests/test-c-cpp-nr/scanner.l
index cbb4b9f76912d540dccf59380e8d831d760c9724..63543e4ccced34eb7fd08e69dfa49bda10ba3885 100644 (file)
--- a/tests/test-c-cpp-nr/scanner.l
+++ b/tests/test-c-cpp-nr/scanner.l
@@ -32,7 +32,7 @@
 
 %}
 
-%option 8bit outfile="scanner.c" prefix="test"
+%option 8bit outfile="scanner.cpp" prefix="test"
 %option nounput nomain noyywrap 
 %option warn
 

diff --git a/tests/test-c-cpp-r/Makefile.am b/tests/test-c-cpp-r/Makefile.am
index 9ccbff6beb5820d8aa1a6ef2d0bf2381c9b92e62..8bbc8ee2db449a55ef6b9eecd2f6cc8a77058a60 100644 (file)
--- a/tests/test-c-cpp-r/Makefile.am
+++ b/tests/test-c-cpp-r/Makefile.am
@@ -23,7 +23,7 @@ BISON = @BISON@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c parser.c parser.h test-c-cpp-r $(OBJS) OUTPUT
+CLEANFILES = scanner.cpp test-c-cpp-r $(OBJS) OUTPUT
 OBJS = scanner.o
 
 INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I .
@@ -32,17 +32,14 @@ INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir) -I .
 
 testname = test-c-cpp-r
 
-scanner.c: $(srcdir)/scanner.l
+scanner.cpp: $(srcdir)/scanner.l
        $(FLEX) $<
 
-parser.c: $(srcdir)/parser.y
-       $(BISON) $(YFLAGS) $<
-
 $(testname)$(EXEEXT): $(OBJS)
        $(CXX) -o $@ $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
-.c.o:
-       $(CXX) -c -o $@ $(INCLUDES) $<
+.cpp.o:
+       $(CXX) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $<

diff --git a/tests/test-c-cpp-r/scanner.l b/tests/test-c-cpp-r/scanner.l
index 6cba9f7abf8f306f4f68f2ae4b7902315df8e227..3182d1b4f4ba84150871a830f49b5c5ff89a17f7 100644 (file)
--- a/tests/test-c-cpp-r/scanner.l
+++ b/tests/test-c-cpp-r/scanner.l
@@ -32,7 +32,7 @@
 
 %}
 
-%option 8bit outfile="scanner.c" prefix="test"
+%option 8bit outfile="scanner.cpp" prefix="test"
 %option nounput nomain noyywrap 
 %option warn reentrant