From: Dennis Clarke <dclarke@blastwave.org>
Date: Wed, 31 Oct 2012 21:40:38 +0000 (-0400)
Subject: add CFLAGS and CXXFLAGS options as appropriate to testsuite Makefile.am files
X-Git-Tag: flex-2.5.38-rc1~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b7d125b117f520b033de65b597e80c21abc3be5;p=flex

add CFLAGS and CXXFLAGS options as appropriate to testsuite Makefile.am files

Signed-off-by: Will Estes <westes575@gmail.com>
---

diff --git a/tests/TEMPLATE/Makefile.am b/tests/TEMPLATE/Makefile.am
index 5495991..531d931 100644
--- a/tests/TEMPLATE/Makefile.am
+++ b/tests/TEMPLATE/Makefile.am
@@ -41,7 +41,7 @@ parser.c: $(srcdir)/parser.y
 	$(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-alloc-extra/Makefile.am b/tests/test-alloc-extra/Makefile.am
index e149d0d..04509b6 100644
--- a/tests/test-alloc-extra/Makefile.am
+++ b/tests/test-alloc-extra/Makefile.am
@@ -40,7 +40,7 @@ parser.c: $(srcdir)/parser.y
 	$(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-array-nr/Makefile.am b/tests/test-array-nr/Makefile.am
index 80ce175..a54e3fc 100644
--- a/tests/test-array-nr/Makefile.am
+++ b/tests/test-array-nr/Makefile.am
@@ -39,7 +39,7 @@ parser.c: $(srcdir)/parser.y
 	$(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-array-r/Makefile.am b/tests/test-array-r/Makefile.am
index ff06a98..b60c917 100644
--- a/tests/test-array-r/Makefile.am
+++ b/tests/test-array-r/Makefile.am
@@ -36,7 +36,7 @@ scanner.c: $(srcdir)/scanner.l
 	$(FLEX) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-basic-nr/Makefile.am b/tests/test-basic-nr/Makefile.am
index 0563f4d..956b068 100644
--- a/tests/test-basic-nr/Makefile.am
+++ b/tests/test-basic-nr/Makefile.am
@@ -39,7 +39,7 @@ parser.c: $(srcdir)/parser.y
 	$(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-basic-r/Makefile.am b/tests/test-basic-r/Makefile.am
index 7137347..beca2e7 100644
--- a/tests/test-basic-r/Makefile.am
+++ b/tests/test-basic-r/Makefile.am
@@ -39,7 +39,7 @@ parser.c: $(srcdir)/parser.y
 	$(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-bison-nr/Makefile.am b/tests/test-bison-nr/Makefile.am
index 91edc35..9bc8af3 100644
--- a/tests/test-bison-nr/Makefile.am
+++ b/tests/test-bison-nr/Makefile.am
@@ -46,7 +46,7 @@ parser.h: parser.c
 main.o: scanner.h parser.h
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-bison-yylloc/Makefile.am b/tests/test-bison-yylloc/Makefile.am
index 1da3257..dc41b0f 100644
--- a/tests/test-bison-yylloc/Makefile.am
+++ b/tests/test-bison-yylloc/Makefile.am
@@ -46,7 +46,7 @@ parser.h: parser.c
 main.o: scanner.h parser.h
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-bison-yylval/Makefile.am b/tests/test-bison-yylval/Makefile.am
index aa9d93a..d8e27f7 100644
--- a/tests/test-bison-yylval/Makefile.am
+++ b/tests/test-bison-yylval/Makefile.am
@@ -46,7 +46,7 @@ parser.h: parser.c
 main.o: scanner.h parser.h
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-c++-basic/Makefile.am b/tests/test-c++-basic/Makefile.am
index dcb76ed..ccfc884 100644
--- a/tests/test-c++-basic/Makefile.am
+++ b/tests/test-c++-basic/Makefile.am
@@ -36,10 +36,10 @@ scanner.cpp: $(srcdir)/scanner.l
 	$(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CXX) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CXX) $(CXXFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .cpp.o:
-	$(CXX) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $<
+	$(CXX) $(CXXFLAGS) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $<
diff --git a/tests/test-c++-multiple-scanners/Makefile.am b/tests/test-c++-multiple-scanners/Makefile.am
index 418e87a..9bcc9f8 100644
--- a/tests/test-c++-multiple-scanners/Makefile.am
+++ b/tests/test-c++-multiple-scanners/Makefile.am
@@ -40,7 +40,7 @@ scanner-2.cpp: $(srcdir)/scanner-2.l
 	$(FLEX) -+ $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CXX) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CXX) $(CXXFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	$(builddir)/$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-c++-yywrap/Makefile.am b/tests/test-c++-yywrap/Makefile.am
index c79d102..014452b 100644
--- a/tests/test-c++-yywrap/Makefile.am
+++ b/tests/test-c++-yywrap/Makefile.am
@@ -36,10 +36,10 @@ scanner.cpp: $(srcdir)/scanner.l
 	$(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CXX) -o $@ $(LDFLAGS) $(OBJS)
+	$(CXX) $(CXXFLAGS) -o $@ $(LDFLAGS) $(OBJS)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) $(srcdir)/test.input $(srcdir)/test.input $(srcdir)/test.input
 
 .cpp.o:
-	$(CXX) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $<
+	$(CXX) $(CXXFLAGS) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $<
diff --git a/tests/test-c-cpp-nr/Makefile.am b/tests/test-c-cpp-nr/Makefile.am
index 0aea014..9aec3b2 100644
--- a/tests/test-c-cpp-nr/Makefile.am
+++ b/tests/test-c-cpp-nr/Makefile.am
@@ -36,10 +36,10 @@ scanner.cpp: $(srcdir)/scanner.l
 	$(FLEX) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CXX) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CXX) $(CXXFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .cpp.o:
-	$(CXX) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $<
+	$(CXX) $(CXXFLAGS) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $<
diff --git a/tests/test-c-cpp-r/Makefile.am b/tests/test-c-cpp-r/Makefile.am
index 0b53170..1c9c23e 100644
--- a/tests/test-c-cpp-r/Makefile.am
+++ b/tests/test-c-cpp-r/Makefile.am
@@ -36,10 +36,10 @@ scanner.cpp: $(srcdir)/scanner.l
 	$(FLEX) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CXX) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CXX) $(CXXFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .cpp.o:
-	$(CXX) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $<
+	$(CXX) $(CXXFLAGS) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $<
diff --git a/tests/test-ccl/Makefile.am b/tests/test-ccl/Makefile.am
index e78df6a..0a92bb2 100644
--- a/tests/test-ccl/Makefile.am
+++ b/tests/test-ccl/Makefile.am
@@ -35,7 +35,7 @@ scanner.c: $(srcdir)/scanner.l
 	$(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-debug-nr/Makefile.am b/tests/test-debug-nr/Makefile.am
index c89f1fd..8e4ae82 100644
--- a/tests/test-debug-nr/Makefile.am
+++ b/tests/test-debug-nr/Makefile.am
@@ -35,7 +35,7 @@ scanner.c: $(srcdir)/scanner.l
 	$(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-debug-r/Makefile.am b/tests/test-debug-r/Makefile.am
index a63b390..6496892 100644
--- a/tests/test-debug-r/Makefile.am
+++ b/tests/test-debug-r/Makefile.am
@@ -35,7 +35,7 @@ scanner.c: $(srcdir)/scanner.l
 	$(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-extended/Makefile.am b/tests/test-extended/Makefile.am
index 92841f0..53c40da 100644
--- a/tests/test-extended/Makefile.am
+++ b/tests/test-extended/Makefile.am
@@ -35,7 +35,7 @@ scanner.c: $(srcdir)/scanner.l
 	$(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input | diff -q $(srcdir)/test.input -
diff --git a/tests/test-header-nr/Makefile.am b/tests/test-header-nr/Makefile.am
index 2c12192..11b6ff4 100644
--- a/tests/test-header-nr/Makefile.am
+++ b/tests/test-header-nr/Makefile.am
@@ -41,7 +41,7 @@ parser.c: $(srcdir)/parser.y
 	$(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-header-r/Makefile.am b/tests/test-header-r/Makefile.am
index 106403f..abd22a2 100644
--- a/tests/test-header-r/Makefile.am
+++ b/tests/test-header-r/Makefile.am
@@ -42,7 +42,7 @@ parser.c: $(srcdir)/parser.y
 	$(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-include-by-buffer/Makefile.am b/tests/test-include-by-buffer/Makefile.am
index aaaf7f3..78e43af 100644
--- a/tests/test-include-by-buffer/Makefile.am
+++ b/tests/test-include-by-buffer/Makefile.am
@@ -40,7 +40,7 @@ parser.c: $(srcdir)/parser.y
 	$(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) $(srcdir)/test-1.input
diff --git a/tests/test-include-by-push/Makefile.am b/tests/test-include-by-push/Makefile.am
index bef63bc..fac4a0e 100644
--- a/tests/test-include-by-push/Makefile.am
+++ b/tests/test-include-by-push/Makefile.am
@@ -40,7 +40,7 @@ parser.c: $(srcdir)/parser.y
 	$(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) $(srcdir)/test-1.input
diff --git a/tests/test-include-by-reentrant/Makefile.am b/tests/test-include-by-reentrant/Makefile.am
index e5a4e63..3f4d1d5 100644
--- a/tests/test-include-by-reentrant/Makefile.am
+++ b/tests/test-include-by-reentrant/Makefile.am
@@ -40,7 +40,7 @@ parser.c: $(srcdir)/parser.y
 	$(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname) $(srcdir)/test-1.input
diff --git a/tests/test-linedir-r/Makefile.am b/tests/test-linedir-r/Makefile.am
index c25df06..d7f3bf7 100644
--- a/tests/test-linedir-r/Makefile.am
+++ b/tests/test-linedir-r/Makefile.am
@@ -42,7 +42,7 @@ parser.c: $(srcdir)/parser.y
 	$(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-lineno-nr/Makefile.am b/tests/test-lineno-nr/Makefile.am
index 35b28dc..2db8e64 100644
--- a/tests/test-lineno-nr/Makefile.am
+++ b/tests/test-lineno-nr/Makefile.am
@@ -35,7 +35,7 @@ scanner.c: $(srcdir)/scanner.l
 
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	test `./$(testname)$(EXEEXT)   < $(srcdir)/test.input` -eq \
diff --git a/tests/test-lineno-r/Makefile.am b/tests/test-lineno-r/Makefile.am
index 3ee4980..8ded4b3 100644
--- a/tests/test-lineno-r/Makefile.am
+++ b/tests/test-lineno-r/Makefile.am
@@ -35,7 +35,7 @@ scanner.c: $(srcdir)/scanner.l
 
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	test `./$(testname)$(EXEEXT)   < $(srcdir)/test.input` -eq \
diff --git a/tests/test-mem-nr/Makefile.am b/tests/test-mem-nr/Makefile.am
index 5d1f87d..4ad450d 100644
--- a/tests/test-mem-nr/Makefile.am
+++ b/tests/test-mem-nr/Makefile.am
@@ -35,7 +35,7 @@ scanner.c: $(srcdir)/scanner.l
 	$(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-mem-r/Makefile.am b/tests/test-mem-r/Makefile.am
index 91d55fd..ae06bd2 100644
--- a/tests/test-mem-r/Makefile.am
+++ b/tests/test-mem-r/Makefile.am
@@ -35,7 +35,7 @@ scanner.c: $(srcdir)/scanner.l
 	$(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-multiple-scanners-nr/Makefile.am b/tests/test-multiple-scanners-nr/Makefile.am
index 6299d6a..950dd23 100644
--- a/tests/test-multiple-scanners-nr/Makefile.am
+++ b/tests/test-multiple-scanners-nr/Makefile.am
@@ -41,7 +41,7 @@ scanner-2.c: $(srcdir)/scanner-2.l
 	$(FLEX) $(LFLAGS) --header=scanner-2.h $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT)
diff --git a/tests/test-multiple-scanners-r/Makefile.am b/tests/test-multiple-scanners-r/Makefile.am
index e2e777e..5f0df8c 100644
--- a/tests/test-multiple-scanners-r/Makefile.am
+++ b/tests/test-multiple-scanners-r/Makefile.am
@@ -43,7 +43,7 @@ scanner-2.c: $(srcdir)/scanner-2.l
 	$(FLEX) $(LFLAGS) --header=scanner-2.h $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT)
diff --git a/tests/test-noansi-nr/Makefile.am b/tests/test-noansi-nr/Makefile.am
index 39ee4a2..a2a327e 100644
--- a/tests/test-noansi-nr/Makefile.am
+++ b/tests/test-noansi-nr/Makefile.am
@@ -39,7 +39,7 @@ parser.c: $(srcdir)/parser.y
 	$(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-noansi-r/Makefile.am b/tests/test-noansi-r/Makefile.am
index 9e44f4a..ec123fe 100644
--- a/tests/test-noansi-r/Makefile.am
+++ b/tests/test-noansi-r/Makefile.am
@@ -39,7 +39,7 @@ parser.c: $(srcdir)/parser.y
 	$(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-posix/Makefile.am b/tests/test-posix/Makefile.am
index ef12c04..2fd3271 100644
--- a/tests/test-posix/Makefile.am
+++ b/tests/test-posix/Makefile.am
@@ -36,7 +36,7 @@ scanner.c: $(srcdir)/scanner.l
 	$(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT)
diff --git a/tests/test-posixly-correct/Makefile.am b/tests/test-posixly-correct/Makefile.am
index d8f4cce..6821cf7 100644
--- a/tests/test-posixly-correct/Makefile.am
+++ b/tests/test-posixly-correct/Makefile.am
@@ -36,7 +36,7 @@ scanner.c: $(srcdir)/scanner.l
 	POSIXLY_CORRECT=1 $(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT)
diff --git a/tests/test-prefix-nr/Makefile.am b/tests/test-prefix-nr/Makefile.am
index 8b2d467..712ce3f 100644
--- a/tests/test-prefix-nr/Makefile.am
+++ b/tests/test-prefix-nr/Makefile.am
@@ -40,7 +40,7 @@ parser.c: $(srcdir)/parser.y
 	$(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-prefix-r/Makefile.am b/tests/test-prefix-r/Makefile.am
index 7e08ef6..1021029 100644
--- a/tests/test-prefix-r/Makefile.am
+++ b/tests/test-prefix-r/Makefile.am
@@ -40,7 +40,7 @@ parser.c: $(srcdir)/parser.y
 	$(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-pthread/Makefile.am b/tests/test-pthread/Makefile.am
index 87474f7..fe5d545 100644
--- a/tests/test-pthread/Makefile.am
+++ b/tests/test-pthread/Makefile.am
@@ -37,7 +37,7 @@ scanner.c: $(srcdir)/scanner.l
 	$(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LIBS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname) $(srcdir)/test-*.input
diff --git a/tests/test-quotes/Makefile.am b/tests/test-quotes/Makefile.am
index f726b7e..8bc2590 100644
--- a/tests/test-quotes/Makefile.am
+++ b/tests/test-quotes/Makefile.am
@@ -35,7 +35,7 @@ scanner.c: $(srcdir)/scanner.l
 	$(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	grep TEST_XXX < $(srcdir)/scanner.l | sed 's/^ *//' > l.out
diff --git a/tests/test-reject/Makefile.am b/tests/test-reject/Makefile.am
index 64de331..902d7be 100644
--- a/tests/test-reject/Makefile.am
+++ b/tests/test-reject/Makefile.am
@@ -46,16 +46,16 @@ test-reject-r.c: $(srcdir)/scanner.l
 	$(FLEX) --reentrant -o $@ $(LFLAGS) $<
 
 test-reject-nr$(EXEEXT): test-reject-nr.o
-	$(CC) -o $@ $(LDFLAGS) $< $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $< $(LOADLIBES)
 
 test-reject-ver$(EXEEXT): test-reject-ver.o
-	$(CC) -o $@ $(LDFLAGS) $< $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $< $(LOADLIBES)
 
 test-reject-ser$(EXEEXT): test-reject-ser.o
-	$(CC) -o $@ $(LDFLAGS) $< $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $< $(LOADLIBES)
 
 test-reject-r$(EXEEXT): test-reject-r.o
-	$(CC) -o $@ $(LDFLAGS) $< $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $< $(LOADLIBES)
 
 $(testname)$(EXEEXT): $(OBJS)
 
diff --git a/tests/test-rescan-nr/Makefile.am b/tests/test-rescan-nr/Makefile.am
index 5e3b88e..3d23a55 100644
--- a/tests/test-rescan-nr/Makefile.am
+++ b/tests/test-rescan-nr/Makefile.am
@@ -38,7 +38,7 @@ scanner.c: $(srcdir)/scanner.l
 	$(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) $(srcdir)/test.input
diff --git a/tests/test-rescan-r/Makefile.am b/tests/test-rescan-r/Makefile.am
index 2108512..b24a152 100644
--- a/tests/test-rescan-r/Makefile.am
+++ b/tests/test-rescan-r/Makefile.am
@@ -38,7 +38,7 @@ scanner.c: $(srcdir)/scanner.l
 	$(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) $(srcdir)/test.input
diff --git a/tests/test-string-nr/Makefile.am b/tests/test-string-nr/Makefile.am
index dbf8e0f..1b06765 100644
--- a/tests/test-string-nr/Makefile.am
+++ b/tests/test-string-nr/Makefile.am
@@ -37,7 +37,7 @@ scanner.c: $(srcdir)/scanner.l
 	$(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT)
diff --git a/tests/test-string-r/Makefile.am b/tests/test-string-r/Makefile.am
index 2c93007..ec3d4da 100644
--- a/tests/test-string-r/Makefile.am
+++ b/tests/test-string-r/Makefile.am
@@ -37,7 +37,7 @@ scanner.c: $(srcdir)/scanner.l
 	$(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT)
diff --git a/tests/test-table-opts/Makefile.am b/tests/test-table-opts/Makefile.am
index a52f617..235e6c8 100644
--- a/tests/test-table-opts/Makefile.am
+++ b/tests/test-table-opts/Makefile.am
@@ -87,13 +87,13 @@ test-ver-nr%.c: $(srcdir)/scanner.l
 	$(FLEX) -L -P $(subst -,_,$(basename $(@F))) --tables-file="test-ver-nr$*.tables" --tables-verify $* -o $@ $<
 
 test-opt%$(EXEEXT): test-opt%.o
-	$(CC) -o $@ $(LDFLAGS) $< $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $< $(LOADLIBES)
 
 test-ser%$(EXEEXT): test-ser%.o
-	$(CC) -o $@ $(LDFLAGS) $< $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $< $(LOADLIBES)
 
 test-ver%$(EXEEXT): test-ver%.o
-	$(CC) -o $@ $(LDFLAGS) $< $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $< $(LOADLIBES)
 
 test-opt: $(optexe)
 	for t in $(optexe) ; do \
diff --git a/tests/test-top/Makefile.am b/tests/test-top/Makefile.am
index f855545..681cadb 100644
--- a/tests/test-top/Makefile.am
+++ b/tests/test-top/Makefile.am
@@ -42,7 +42,7 @@ parser.c: $(srcdir)/parser.y
 	$(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input
diff --git a/tests/test-yyextra/Makefile.am b/tests/test-yyextra/Makefile.am
index 96ec982..d55f74e 100644
--- a/tests/test-yyextra/Makefile.am
+++ b/tests/test-yyextra/Makefile.am
@@ -40,7 +40,7 @@ parser.c: $(srcdir)/parser.y
 	$(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
+	$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
 	./$(testname)$(EXEEXT) < $(srcdir)/test.input