Tests now respect CFLAGS, CPPFLAGS, etc..

diff --git a/tests/TEMPLATE/Makefile.am b/tests/TEMPLATE/Makefile.am
index ef04e591319d3683cf140a2d167287e93da6e2ae..fb052e69176bcfd1066c2aba607e4f2b7d9cff29 100644 (file)
--- a/tests/TEMPLATE/Makefile.am
+++ b/tests/TEMPLATE/Makefile.am
@@ -40,10 +40,10 @@ parser.c: $(srcdir)/parser.y
        $(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-array-nr/Makefile.am b/tests/test-array-nr/Makefile.am
index 4b056a28a14f19b82c91e5581efad6e1ab40ee5d..8e220f43013025ef4c3812ea73f6e7059cae9833 100644 (file)
--- a/tests/test-array-nr/Makefile.am
+++ b/tests/test-array-nr/Makefile.am
@@ -39,10 +39,10 @@ parser.c: $(srcdir)/parser.y
        $(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-array-r/Makefile.am b/tests/test-array-r/Makefile.am
index ef58124a1db206be0aa6b3b87e2ccd74625676c1..7a301dce4c02dcf17a3f613da22181d6ab6b4f92 100644 (file)
--- a/tests/test-array-r/Makefile.am
+++ b/tests/test-array-r/Makefile.am
@@ -36,10 +36,10 @@ scanner.c: $(srcdir)/scanner.l
        $(FLEX) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-basic-nr/Makefile.am b/tests/test-basic-nr/Makefile.am
index fa7e57eedf285f14baf530c772302680aeb7303d..b65b6194e03baa4a3cd513c40c295839c647b211 100644 (file)
--- a/tests/test-basic-nr/Makefile.am
+++ b/tests/test-basic-nr/Makefile.am
@@ -39,10 +39,10 @@ parser.c: $(srcdir)/parser.y
        $(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-basic-r/Makefile.am b/tests/test-basic-r/Makefile.am
index 922fd8f78e2defe4487795d76b1caa43735c9300..530d3809d50719be18ece17133a0d0e00aa074c5 100644 (file)
--- a/tests/test-basic-r/Makefile.am
+++ b/tests/test-basic-r/Makefile.am
@@ -39,10 +39,10 @@ parser.c: $(srcdir)/parser.y
        $(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-bison-yylloc/Makefile.am b/tests/test-bison-yylloc/Makefile.am
index 308242e9d7c5eb261bee9dc220fc94399c642a4e..efcf0f38de9962ca0fb4d2a30191283ef3d10692 100644 (file)
--- a/tests/test-bison-yylloc/Makefile.am
+++ b/tests/test-bison-yylloc/Makefile.am
@@ -39,13 +39,13 @@ parser.c: $(srcdir)/parser.y
        $(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<
 
 parser.h: parser.c
 scanner.c main.o: parser.h

diff --git a/tests/test-bison-yylval/Makefile.am b/tests/test-bison-yylval/Makefile.am
index 6705add48db87b7038367ebb9726908082927c15..275e901d6579fc4baff949956a1d47ec3c5b51f8 100644 (file)
--- a/tests/test-bison-yylval/Makefile.am
+++ b/tests/test-bison-yylval/Makefile.am
@@ -39,13 +39,13 @@ parser.c: $(srcdir)/parser.y
        $(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<
 
 parser.h: parser.c
 main.o: parser.h

diff --git a/tests/test-c-cpp-nr/Makefile.am b/tests/test-c-cpp-nr/Makefile.am
index d2cb1af6f348d6dd542aa4c2ec73d4ef05e6bf96..3948d64558989d0ae37b416654a7b2e480a4dcce 100644 (file)
--- a/tests/test-c-cpp-nr/Makefile.am
+++ b/tests/test-c-cpp-nr/Makefile.am
@@ -36,7 +36,7 @@ scanner.cpp: $(srcdir)/scanner.l
        $(FLEX) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CXX) -o $(testname)$(EXEEXT) $(OBJS) $(LDFLAGS)
+       $(CXX) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input

diff --git a/tests/test-c-cpp-r/Makefile.am b/tests/test-c-cpp-r/Makefile.am
index 8bbc8ee2db449a55ef6b9eecd2f6cc8a77058a60..1c42da5556c76a8a07d1bc338dc33372710a7ac3 100644 (file)
--- a/tests/test-c-cpp-r/Makefile.am
+++ b/tests/test-c-cpp-r/Makefile.am
@@ -36,7 +36,7 @@ scanner.cpp: $(srcdir)/scanner.l
        $(FLEX) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CXX) -o $@ $(OBJS) $(LDFLAGS)
+       $(CXX) -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 4096694c8dd53030b6b7fb70040d259bcc32fb86..920271e479f85ab002c1277c209aa252ed121c7c 100644 (file)
--- a/tests/test-debug-nr/Makefile.am
+++ b/tests/test-debug-nr/Makefile.am
@@ -35,10 +35,10 @@ scanner.c: $(srcdir)/scanner.l
        $(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-debug-r/Makefile.am b/tests/test-debug-r/Makefile.am
index 76595cdcf3091429c44d6675102b2bdcc0b18383..cbaca0e4c00a2dd01abfa198537c13206a1aac9b 100644 (file)
--- a/tests/test-debug-r/Makefile.am
+++ b/tests/test-debug-r/Makefile.am
@@ -35,10 +35,10 @@ scanner.c: $(srcdir)/scanner.l
        $(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-header-nr/Makefile.am b/tests/test-header-nr/Makefile.am
index 9e706fd0a2236d223b03d867a18549763f208527..5b23caaf5e6962d61a51f28be1a909a2bcedd1e8 100644 (file)
--- a/tests/test-header-nr/Makefile.am
+++ b/tests/test-header-nr/Makefile.am
@@ -39,13 +39,13 @@ parser.c: $(srcdir)/parser.y
        $(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<
 
 scanner.h: scanner.c
 main.o: scanner.h

diff --git a/tests/test-header-r/Makefile.am b/tests/test-header-r/Makefile.am
index 82f3198a906b97426838bea0dfaae0afe4ad4455..2db25570be51ba3d6c7bf1745da30500f6cefa43 100644 (file)
--- a/tests/test-header-r/Makefile.am
+++ b/tests/test-header-r/Makefile.am
@@ -40,13 +40,13 @@ parser.c: $(srcdir)/parser.y
        $(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<
 
 scanner.h: scanner.c
 main.o: scanner.h

diff --git a/tests/test-include-by-buffer/Makefile.am b/tests/test-include-by-buffer/Makefile.am
index 20d6fae8f453a816e229f07cfeefd52281606361..f741fe5193c8587b499c41c5e885bda3b6598a10 100644 (file)
--- a/tests/test-include-by-buffer/Makefile.am
+++ b/tests/test-include-by-buffer/Makefile.am
@@ -40,10 +40,10 @@ parser.c: $(srcdir)/parser.y
        $(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) $(srcdir)/test-1.input
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-include-by-reentrant/Makefile.am b/tests/test-include-by-reentrant/Makefile.am
index a570f85ea3c65215b967a930caad9607d5dcffbc..793071d4c417fc3daa778e04306e6bffce7fdd2c 100644 (file)
--- a/tests/test-include-by-reentrant/Makefile.am
+++ b/tests/test-include-by-reentrant/Makefile.am
@@ -40,10 +40,10 @@ parser.c: $(srcdir)/parser.y
        $(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname) $(srcdir)/test-1.input
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-lineno-nr/Makefile.am b/tests/test-lineno-nr/Makefile.am
index 63a944bd9b3731bf69c02972a5d6376f0b174ced..6bfc0aa58ddad439ebde592f23598584df732759 100644 (file)
--- a/tests/test-lineno-nr/Makefile.am
+++ b/tests/test-lineno-nr/Makefile.am
@@ -35,11 +35,11 @@ scanner.c: $(srcdir)/scanner.l
 
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        test `./$(testname)$(EXEEXT)   < $(srcdir)/test.input` -eq \
             `./$(testname)$(EXEEXT) 1 < $(srcdir)/test.input` || exit 1
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-lineno-r/Makefile.am b/tests/test-lineno-r/Makefile.am
index 2dd15055d083513e380025987a19b009156e7fbf..020c9132ecc8f195cd0fe85ff613195a525cb750 100644 (file)
--- a/tests/test-lineno-r/Makefile.am
+++ b/tests/test-lineno-r/Makefile.am
@@ -35,11 +35,11 @@ scanner.c: $(srcdir)/scanner.l
 
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        test `./$(testname)$(EXEEXT)   < $(srcdir)/test.input` -eq \
             `./$(testname)$(EXEEXT) 1 < $(srcdir)/test.input` || exit 1
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-mem-nr/Makefile.am b/tests/test-mem-nr/Makefile.am
index 191d9c495cb969630b1b0c0f18b94b9c17869ab9..d775db8ee95ed6091d21508469fe2fcb957f1b1b 100644 (file)
--- a/tests/test-mem-nr/Makefile.am
+++ b/tests/test-mem-nr/Makefile.am
@@ -35,10 +35,10 @@ scanner.c: $(srcdir)/scanner.l
        $(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-mem-r/Makefile.am b/tests/test-mem-r/Makefile.am
index c3499eead002f5a90b1b7261bf8471a46a89bf70..bf32246d78d0b98e1a8db790312b7d670b4e0443 100644 (file)
--- a/tests/test-mem-r/Makefile.am
+++ b/tests/test-mem-r/Makefile.am
@@ -35,10 +35,10 @@ scanner.c: $(srcdir)/scanner.l
        $(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-multiple-scanners-nr/Makefile.am b/tests/test-multiple-scanners-nr/Makefile.am
index a74e099bf74fe0a64c075d0269bf0b40c93fd38f..1db3b8a50275eadaa45d5c68f6548e63c42d068a 100644 (file)
--- a/tests/test-multiple-scanners-nr/Makefile.am
+++ b/tests/test-multiple-scanners-nr/Makefile.am
@@ -39,13 +39,13 @@ scanner-2.c: $(srcdir)/scanner-2.l
        $(FLEX) $(LFLAGS) --header=scanner-2.h $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT)
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<
 
 main.o: scanner-1.h scanner-2.h
 scanner-1.h: scanner-1.c

diff --git a/tests/test-multiple-scanners-r/Makefile.am b/tests/test-multiple-scanners-r/Makefile.am
index 16973a5a1bb9d4c25d28244e822854fda00a458d..5faf89f4d96bc5435b65cd3b34864ec4ee9c50b5 100644 (file)
--- a/tests/test-multiple-scanners-r/Makefile.am
+++ b/tests/test-multiple-scanners-r/Makefile.am
@@ -39,13 +39,13 @@ scanner-2.c: $(srcdir)/scanner-2.l
        $(FLEX) $(LFLAGS) --header=scanner-2.h $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT)
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<
 
 main.o: scanner-1.h scanner-2.h
 scanner-1.h: scanner-1.c

diff --git a/tests/test-posix/Makefile.am b/tests/test-posix/Makefile.am
index d26e80164b4319f747ed924f8ef73dee309ec93b..128bd35c4247517eff5e2bc7d8c4c8cd4d46c5fa 100644 (file)
--- a/tests/test-posix/Makefile.am
+++ b/tests/test-posix/Makefile.am
@@ -36,10 +36,10 @@ scanner.c: $(srcdir)/scanner.l
        $(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT)
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-posixly-correct/Makefile.am b/tests/test-posixly-correct/Makefile.am
index 8133bd7f211ba1d52e3563a12953468e0caf9eaf..7501274dda993bfc1ffe357b0060748d590a37ad 100644 (file)
--- a/tests/test-posixly-correct/Makefile.am
+++ b/tests/test-posixly-correct/Makefile.am
@@ -36,10 +36,10 @@ scanner.c: $(srcdir)/scanner.l
        POSIXLY_CORRECT=1 $(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT)
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-prefix-nr/Makefile.am b/tests/test-prefix-nr/Makefile.am
index 7e094c144f9a56e76de656329a4c820f2cc12ef4..8e41071745808be149fba3a1915d1e59885f72ba 100644 (file)
--- a/tests/test-prefix-nr/Makefile.am
+++ b/tests/test-prefix-nr/Makefile.am
@@ -40,10 +40,10 @@ parser.c: $(srcdir)/parser.y
        $(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-prefix-r/Makefile.am b/tests/test-prefix-r/Makefile.am
index 8fd0483fb9316593c6070d09c69e3afa05a92a56..1015fd567607217863866822d0a36d22b0fc695b 100644 (file)
--- a/tests/test-prefix-r/Makefile.am
+++ b/tests/test-prefix-r/Makefile.am
@@ -40,10 +40,10 @@ parser.c: $(srcdir)/parser.y
        $(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-pthread/Makefile.am b/tests/test-pthread/Makefile.am
index 4de6dacb8d8f9da43a89d83ebdeebf7e8d569a16..396645c6bc36b063b5897d4dc8ffadd33256a5e2 100644 (file)
--- a/tests/test-pthread/Makefile.am
+++ b/tests/test-pthread/Makefile.am
@@ -37,10 +37,10 @@ scanner.c: $(srcdir)/scanner.l
        $(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname) $(srcdir)/test-*.input
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-string-nr/Makefile.am b/tests/test-string-nr/Makefile.am
index 72468579e2169eac00b82fc51d252e142220f139..ff2bd50c5d57221fcaf40f5a7fef8643d328e535 100644 (file)
--- a/tests/test-string-nr/Makefile.am
+++ b/tests/test-string-nr/Makefile.am
@@ -37,10 +37,10 @@ scanner.c: $(srcdir)/scanner.l
        $(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT)
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-string-r/Makefile.am b/tests/test-string-r/Makefile.am
index a786e61e70a1d2fd6b84a830fa56c4b98157a706..96e495a99014b80138de1dde61092c8146ba7afa 100644 (file)
--- a/tests/test-string-r/Makefile.am
+++ b/tests/test-string-r/Makefile.am
@@ -37,10 +37,10 @@ scanner.c: $(srcdir)/scanner.l
        $(FLEX) $(LFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT)
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<

diff --git a/tests/test-table-opts/Makefile.am b/tests/test-table-opts/Makefile.am
index 63ab9fe9986e3f2287d35601b69a4e0cf8b9d335..d92fc5f270493c5b3756277b762717d7efbe40e6 100644 (file)
--- a/tests/test-table-opts/Makefile.am
+++ b/tests/test-table-opts/Makefile.am
@@ -48,7 +48,7 @@ test-opt-nr%.c: $(srcdir)/scanner.l
        $(FLEX) $* -o $@ $<
 
 test-opt%$(EXEEXT): test-opt%.o
-       $(CC) -o $@ $< $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $< $(LOADLIBES)
 
 test: $(alltestexe)
        for t in $(alltestexe) ; do \
@@ -56,7 +56,7 @@ test: $(alltestexe)
        done
 
 .c.o:
-       $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<
 
 .PHONY: test-table-opts
 .SECONDARY: $(alltestobj) $(alltestsrc)

diff --git a/tests/test-yyextra/Makefile.am b/tests/test-yyextra/Makefile.am
index 59ee3515201bc45622e199a9d0b355f82750f52a..6c14ca87b3f46adaee88ef9b0c457d61d8893471 100644 (file)
--- a/tests/test-yyextra/Makefile.am
+++ b/tests/test-yyextra/Makefile.am
@@ -40,10 +40,10 @@ parser.c: $(srcdir)/parser.y
        $(BISON) $(YFLAGS) $<
 
 $(testname)$(EXEEXT): $(OBJS)
-       $(CC) -o $@ $(OBJS) $(LDFLAGS)
+       $(CC) -o $@ $(LDFLAGS) $(OBJS) $(LOADLIBES)
 
 test: $(testname)$(EXEEXT)
        ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
-       $(CC) -c -o $@ $(INCLUDES) $<
+       $(CC) -c -o $@ $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<