Use CXXFLAGS instead of CFLAGS for C++ compiling. Patch from Diego 'Flameeyes'

Pettenò.

git-svn-id: http://svn.complang.org/ragel/trunk@471 052ea7fc-9027-0410-9066-f65837a77df0

diff --git a/CREDITS b/CREDITS
index 108f639..fb810e1 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -37,4 +37,4 @@ missed.
     Judson Lester, Barry Arthur, Tim Potter, Ryan Phelps, David Waite,
     Kenny MacDermid, MenTaLguY, Manoj Rajagopalan, Tim Chklovski,
     Mikkel Fahnøe Jørgensen, Andrei Polushin, Evan Phoenix, David Balmain,
-    Ross Thomas, Mitchell Foral, John D. Mitchell
+    Ross Thomas, Mitchell Foral, John D. Mitchell, Diego 'Flameeyes' Pettenò

diff --git a/common/Makefile.in b/common/Makefile.in
index 54ed940..112e59c 100644 (file)
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -21,7 +21,7 @@
 INCS += -I../aapl
 DEFS +=
 
-CFLAGS += -g -Wall
+CXXFLAGS += -g -Wall
 LDFLAGS +=
 
 CC_SRCS = common.cpp
@@ -58,7 +58,7 @@ version.h: ../version.mk
 
 %.o: %.cpp
        @$(CXX) -M $(DEFS) $(INCS) $< > .$*.d
-       $(CXX) -c $(CFLAGS) $(DEFS) $(INCS) -o $@ $<
+       $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCS) -o $@ $<
 
 distclean: clean
        rm -f Makefile config.h

diff --git a/examples/Makefile b/examples/Makefile
index a392aa8..b9fcc21 100644 (file)
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -21,7 +21,6 @@
 RAGEL = ../ragel/ragel
 FLEX = flex
 RE2C = re2c
-CFLAGS = -Wall -g -O3
 
 TARGS = \
        atoi awkemu clang concurrent cppscan format gotocallret mailbox params \
@@ -38,7 +37,7 @@ distclean clean:
        gcc $(CFLAGS) -Wall -g -c -O3 -o $@ $<
 
 %.o: %.cpp
-       g++ $(CFLAGS) -Wall -g -c -O3 -o $@ $<
+       g++ $(CXXFLAGS) -Wall -g -c -O3 -o $@ $<
 
 #########################################
 

diff --git a/ragel/Makefile.in b/ragel/Makefile.in
index 6190a5f..204b855 100644 (file)
--- a/ragel/Makefile.in
+++ b/ragel/Makefile.in
@@ -21,7 +21,7 @@
 INCS += -I../common -I../aapl -I../redfsm
 DEFS +=
 
-CFLAGS += -g -Wall
+CXXFLAGS += -g -Wall
 LDFLAGS +=
 
 CC_SRCS = \
@@ -82,7 +82,7 @@ endif
 
 %.o: %.cpp
        @$(CXX) -M $(DEFS) $(INCS) $< > .$*.d
-       $(CXX) -c $(CFLAGS) $(DEFS) $(INCS) -o $@ $<
+       $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCS) -o $@ $<
 
 distclean: clean
        rm -f Makefile 

diff --git a/redfsm/Makefile.in b/redfsm/Makefile.in
index fc28171..a4c6737 100644 (file)
--- a/redfsm/Makefile.in
+++ b/redfsm/Makefile.in
@@ -21,7 +21,7 @@
 INCS += -I../common -I../aapl
 DEFS +=
 
-CFLAGS += -g -Wall
+CXXFLAGS += -g -Wall
 LDFLAGS +=
 
 CC_SRCS = redfsm.cpp gendata.cpp xmltags.cpp xmlscan.cpp xmlparse.cpp
@@ -69,7 +69,7 @@ endif
 
 %.o: %.cpp
        @$(CXX) -M $(DEFS) $(INCS) $< > .$*.d
-       $(CXX) -c $(CFLAGS) $(DEFS) $(INCS) -o $@ $<
+       $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCS) -o $@ $<
 
 distclean: clean
        rm -f Makefile

diff --git a/rlgen-cd/Makefile.in b/rlgen-cd/Makefile.in
index 6d4a293..49031e3 100644 (file)
--- a/rlgen-cd/Makefile.in
+++ b/rlgen-cd/Makefile.in
@@ -21,7 +21,7 @@
 INCS += -I../common -I../redfsm -I../aapl
 DEFS +=
 
-CFLAGS += -g -Wall
+CXXFLAGS += -g -Wall
 LDFLAGS +=
 
 CC_SRCS = main.cpp fsmcodegen.cpp \
@@ -57,7 +57,7 @@ rlgen-cd.a: $(LIBS) $(OBJS)
 
 %.o: %.cpp
        @$(CXX) -M $(DEFS) $(INCS) $< > .$*.d
-       $(CXX) -c $(CFLAGS) $(DEFS) $(INCS) -o $@ $<
+       $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCS) -o $@ $<
 
 distclean: clean
        rm -f Makefile

diff --git a/rlgen-csharp/Makefile.in b/rlgen-csharp/Makefile.in
index 24d992b..fa57e49 100644 (file)
--- a/rlgen-csharp/Makefile.in
+++ b/rlgen-csharp/Makefile.in
@@ -21,7 +21,7 @@
 INCS += -I../common -I../redfsm -I../aapl
 DEFS +=
 
-CFLAGS += -g -Wall
+CXXFLAGS += -g -Wall
 LDFLAGS +=
 
 CC_SRCS = main.cpp fsmcodegen.cpp \
@@ -57,7 +57,7 @@ rlgen-csharp.a: $(LIBS) $(OBJS)
 
 %.o: %.cpp
        @$(CXX) -M $(DEFS) $(INCS) $< > .$*.d
-       $(CXX) -c $(CFLAGS) $(DEFS) $(INCS) -o $@ $<
+       $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCS) -o $@ $<
 
 distclean: clean
        rm -f Makefile

diff --git a/rlgen-dot/Makefile.in b/rlgen-dot/Makefile.in
index 3f7b7f6..5b359f7 100644 (file)
--- a/rlgen-dot/Makefile.in
+++ b/rlgen-dot/Makefile.in
@@ -21,7 +21,7 @@
 INCS += -I../common -I../redfsm -I../aapl
 DEFS +=
 
-CFLAGS += -g -Wall
+CXXFLAGS += -g -Wall
 LDFLAGS +=
 
 CC_SRCS = main.cpp gvdotgen.cpp 
@@ -53,7 +53,7 @@ rlgen-dot.a: $(LIBS) $(OBJS)
 
 %.o: %.cpp
        @$(CXX) -M $(DEFS) $(INCS) $< > .$*.d
-       $(CXX) -c $(CFLAGS) $(DEFS) $(INCS) -o $@ $<
+       $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCS) -o $@ $<
 
 distclean: clean
        rm -f Makefile

diff --git a/rlgen-java/Makefile.in b/rlgen-java/Makefile.in
index e242a64..2fe5cd7 100644 (file)
--- a/rlgen-java/Makefile.in
+++ b/rlgen-java/Makefile.in
@@ -21,7 +21,7 @@
 INCS += -I../common -I../redfsm -I../aapl
 DEFS +=
 
-CFLAGS += -g -Wall
+CXXFLAGS += -g -Wall
 LDFLAGS +=
 
 CC_SRCS = main.cpp javacodegen.cpp
@@ -54,7 +54,7 @@ rlgen-java.a: $(LIBS) $(OBJS)
 
 %.o: %.cpp
        @$(CXX) -M $(DEFS) $(INCS) $< > .$*.d
-       $(CXX) -c $(CFLAGS) $(DEFS) $(INCS) -o $@ $<
+       $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCS) -o $@ $<
 
 distclean: clean
        rm -f Makefile

diff --git a/rlgen-ruby/Makefile.in b/rlgen-ruby/Makefile.in
index c9bd4f1..a0a2d52 100644 (file)
--- a/rlgen-ruby/Makefile.in
+++ b/rlgen-ruby/Makefile.in
@@ -21,7 +21,7 @@
 INCS += -I../common -I../redfsm -I../aapl
 DEFS +=
 
-CFLAGS += -g -Wall
+CXXFLAGS += -g -Wall
 LDFLAGS +=
 
 CC_SRCS = main.cpp ruby-codegen.cpp ruby-tabcodegen.cpp ruby-ftabcodegen.cpp \
@@ -55,7 +55,7 @@ rlgen-ruby.a: $(LIBS) $(OBJS)
 
 %.o: %.cpp
        @$(CXX) -M $(DEFS) $(INCS) $< > .$*.d
-       $(CXX) -c $(CFLAGS) $(DEFS) $(INCS) -o $@ $<
+       $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCS) -o $@ $<
 
 distclean: clean
        rm -f Makefile