change CLEANFILES to include instead of just the testname for the executable

diff --git a/tests/test-array-nr/Makefile.am b/tests/test-array-nr/Makefile.am
index 4b1fe8613509804592b5679f600a2f8e6714e55b..80ce17538cbb3ff7a92d3bf76b5ce0b17004d2cf 100644 (file)
--- a/tests/test-array-nr/Makefile.am
+++ b/tests/test-array-nr/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c parser.c parser.h test-array-nr OUTPUT $(OBJS)
+CLEANFILES = scanner.c parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-array-r/Makefile.am b/tests/test-array-r/Makefile.am
index 5a2fa21267c0e6e5fd1571398c2f0e3bffdbb64d..ff06a987df60d2919bd3c6846c7fb2c1ea4ed7b4 100644 (file)
--- a/tests/test-array-r/Makefile.am
+++ b/tests/test-array-r/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c test-array-r OUTPUT $(OBJS)
+CLEANFILES = scanner.c $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-basic-nr/Makefile.am b/tests/test-basic-nr/Makefile.am
index bdf63400737b4ce5b05eb3d7c1c9818d44fcb718..0563f4dd1e1653a165f788b0b700bdda0d040fcf 100644 (file)
--- a/tests/test-basic-nr/Makefile.am
+++ b/tests/test-basic-nr/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c parser.c parser.h test-basic-nr OUTPUT $(OBJS)
+CLEANFILES = scanner.c parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-basic-r/Makefile.am b/tests/test-basic-r/Makefile.am
index 2907190f842058651672ee4f9c76652baaf95167..7137347a37fc4a06929ecd02fbeb66ce1689b439 100644 (file)
--- a/tests/test-basic-r/Makefile.am
+++ b/tests/test-basic-r/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c parser.c parser.h test-basic-r OUTPUT $(OBJS)
+CLEANFILES = scanner.c parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-bison-nr/Makefile.am b/tests/test-bison-nr/Makefile.am
index 6874df60cfc516f25701a1cf4b844c66ca6a097e..b251572333ee3d176e5b6c4da071e74a69d3656a 100644 (file)
--- a/tests/test-bison-nr/Makefile.am
+++ b/tests/test-bison-nr/Makefile.am
@@ -25,7 +25,7 @@ FLEX = $(top_builddir)/flex
 builddir = @builddir@
 
 EXTRA_DIST = scanner.l parser.y test.input main.c
-CLEANFILES = scanner.c scanner.h parser.c parser.h test-bison-nr $(OBJS) OUTPUT
+CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) $(OBJS) OUTPUT
 OBJS = scanner.o parser.o main.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)

diff --git a/tests/test-bison-yylloc/Makefile.am b/tests/test-bison-yylloc/Makefile.am
index 7f26f4d40202cf587edb2fb716b3b56b8bcb0e81..3be89072afbb550cf66dd73fb9e78e39523b1e08 100644 (file)
--- a/tests/test-bison-yylloc/Makefile.am
+++ b/tests/test-bison-yylloc/Makefile.am
@@ -25,7 +25,7 @@ FLEX = $(top_builddir)/flex
 builddir = @builddir@
 
 EXTRA_DIST = scanner.l parser.y test.input main.c
-CLEANFILES = scanner.c scanner.h parser.c parser.h test-bison-yylloc $(OBJS) OUTPUT
+CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) $(OBJS) OUTPUT
 OBJS = scanner.o parser.o main.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)

diff --git a/tests/test-bison-yylval/Makefile.am b/tests/test-bison-yylval/Makefile.am
index de3071adfb09ff7a61bc3184463d485a012ab54e..e55e8a787003072d17bb4d0f2a95a301d88b4635 100644 (file)
--- a/tests/test-bison-yylval/Makefile.am
+++ b/tests/test-bison-yylval/Makefile.am
@@ -25,7 +25,7 @@ FLEX = $(top_builddir)/flex
 builddir = @builddir@
 
 EXTRA_DIST = scanner.l parser.y test.input main.c
-CLEANFILES = scanner.c scanner.h parser.c parser.h test-bison-yylval $(OBJS) OUTPUT
+CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) $(OBJS) OUTPUT
 OBJS = parser.o scanner.o main.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)

diff --git a/tests/test-c++-basic/Makefile.am b/tests/test-c++-basic/Makefile.am
index a90e75a55cce6d360fab6baf8d3885a4a71e154a..dcb76edf08260f342c6a8378e97e4a7fba5c11a6 100644 (file)
--- a/tests/test-c++-basic/Makefile.am
+++ b/tests/test-c++-basic/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.cpp scanner.h test-c++-basic OUTPUT $(OBJS)
+CLEANFILES = scanner.cpp scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-c++-multiple-scanners/Makefile.am b/tests/test-c++-multiple-scanners/Makefile.am
index 97f863cce8d545c482c0f3fa2e2a7f69cacd152b..418e87abba72dac7da4013109f57f41763cd5846 100644 (file)
--- a/tests/test-c++-multiple-scanners/Makefile.am
+++ b/tests/test-c++-multiple-scanners/Makefile.am
@@ -24,7 +24,7 @@ FLEX = $(top_builddir)/flex
 builddir = @builddir@
 
 EXTRA_DIST = scanner-1.l scanner-2.l main.cpp test.input
-CLEANFILES = scanner-1.cpp test-c++-multiple-scanners OUTPUT $(OBJS) scanner-2.cpp
+CLEANFILES = scanner-1.cpp $(testname)$(EXEEXT) OUTPUT $(OBJS) scanner-2.cpp
 OBJS = scanner-1.o scanner-2.o main.o
 
 AM_CXXFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-c++-yywrap/Makefile.am b/tests/test-c++-yywrap/Makefile.am
index 2929f288023887eff449a6d711be53cd06e3acdf..c79d10230eb7d9c93d6de38ce55c5390e1f09b22 100644 (file)
--- a/tests/test-c++-yywrap/Makefile.am
+++ b/tests/test-c++-yywrap/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.cpp scanner.h test-c++-yywrap OUTPUT $(OBJS)
+CLEANFILES = scanner.cpp scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-c-cpp-nr/Makefile.am b/tests/test-c-cpp-nr/Makefile.am
index 6e17e09835575ee1b560b900972072acb8dd76a9..0aea014c096de39d04ceaa2e0409fe9493c3a644 100644 (file)
--- a/tests/test-c-cpp-nr/Makefile.am
+++ b/tests/test-c-cpp-nr/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.cpp test-c-cpp-nr $(OBJS) OUTPUT
+CLEANFILES = scanner.cpp $(testname)$(EXEEXT) $(OBJS) OUTPUT
 OBJS = scanner.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-c-cpp-r/Makefile.am b/tests/test-c-cpp-r/Makefile.am
index a0b929902fb3029ac5cdebef2b7ae15b4399bd7b..0b5317041f542a017a558d04a6eab55263ae688b 100644 (file)
--- a/tests/test-c-cpp-r/Makefile.am
+++ b/tests/test-c-cpp-r/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.cpp test-c-cpp-r $(OBJS) OUTPUT
+CLEANFILES = scanner.cpp $(testname)$(EXEEXT) $(OBJS) OUTPUT
 OBJS = scanner.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-ccl/Makefile.am b/tests/test-ccl/Makefile.am
index 0a5fdc09b87c4a8877c722481c9904c80ce20e22..e78df6a6b141e67ba8faa714b6395c667ce84746 100644 (file)
--- a/tests/test-ccl/Makefile.am
+++ b/tests/test-ccl/Makefile.am
@@ -24,7 +24,7 @@ FLEX = $(top_builddir)/flex
 builddir = @builddir@
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c scanner.h  test-ccl OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h  $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-debug-nr/Makefile.am b/tests/test-debug-nr/Makefile.am
index 40d59e8f1681448b618d863e0d456ce80e5b7fd1..c89f1fd5f3b4d6300fcb6c72e13d10a3cc1c47d0 100644 (file)
--- a/tests/test-debug-nr/Makefile.am
+++ b/tests/test-debug-nr/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c scanner.h test-debug-nr OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-debug-r/Makefile.am b/tests/test-debug-r/Makefile.am
index 19371394cd07295f83c98c9509f4522c39a53541..a63b3908a9c7c001297f0e5127dae76a9d231563 100644 (file)
--- a/tests/test-debug-r/Makefile.am
+++ b/tests/test-debug-r/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c test-debug-r OUTPUT $(OBJS)
+CLEANFILES = scanner.c $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o 
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-extended/Makefile.am b/tests/test-extended/Makefile.am
index f1216031af9ce23cf275a061e0b5dda3f766e3b7..7ad79667a1dafc860328e2c6841cb6c8695e388c 100644 (file)
--- a/tests/test-extended/Makefile.am
+++ b/tests/test-extended/Makefile.am
@@ -24,7 +24,7 @@ FLEX = $(top_builddir)/flex
 builddir = @builddir@
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c scanner.h test-extended OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-header-nr/Makefile.am b/tests/test-header-nr/Makefile.am
index 2227acd6763683733345907679b57d1882ca60d0..2c12192d7fae0d370c4ed64ec1f361a2b6052fd7 100644 (file)
--- a/tests/test-header-nr/Makefile.am
+++ b/tests/test-header-nr/Makefile.am
@@ -25,7 +25,7 @@ FLEX = $(top_builddir)/flex
 builddir = @builddir@
 
 EXTRA_DIST = scanner.l  test.input main.c
-CLEANFILES = scanner.c scanner.h test-header-nr $(OBJS) OUTPUT
+CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) $(OBJS) OUTPUT
 OBJS = scanner.o main.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)

diff --git a/tests/test-header-r/Makefile.am b/tests/test-header-r/Makefile.am
index aa86bc17af8b2786b990a52edc853d7dfbd438d3..106403f629323d76bac49f594a76edda49bc9357 100644 (file)
--- a/tests/test-header-r/Makefile.am
+++ b/tests/test-header-r/Makefile.am
@@ -25,7 +25,7 @@ FLEX = $(top_builddir)/flex
 builddir = @builddir@
 
 EXTRA_DIST = scanner.l test.input main.c
-CLEANFILES = scanner.c scanner.h test-header-r OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o main.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)

diff --git a/tests/test-include-by-buffer/Makefile.am b/tests/test-include-by-buffer/Makefile.am
index 92748232da8f873098826f6dfdb3acd16ef302b2..aaaf7f3cb42b94e60b3ed751c226f672ea2bc9fd 100644 (file)
--- a/tests/test-include-by-buffer/Makefile.am
+++ b/tests/test-include-by-buffer/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test-1.input test-2.input test-3.input
-CLEANFILES = scanner.c scanner.h parser.c parser.h test-include-by-buffer OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-include-by-push/Makefile.am b/tests/test-include-by-push/Makefile.am
index 46f700dd4f8733ff095636940407a4b97fc789af..bef63bc6f8a6b33926ff5033b3630368811edb43 100644 (file)
--- a/tests/test-include-by-push/Makefile.am
+++ b/tests/test-include-by-push/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test-1.input test-2.input test-3.input
-CLEANFILES = scanner.c scanner.h parser.c parser.h test-include-by-push OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-include-by-reentrant/Makefile.am b/tests/test-include-by-reentrant/Makefile.am
index 1ce63460fd9ce50922ea8b5144f16ccae4fbe627..e5a4e63b1ce4a0fda80ed15e9564bef96a962fba 100644 (file)
--- a/tests/test-include-by-reentrant/Makefile.am
+++ b/tests/test-include-by-reentrant/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test-1.input test-2.input test-3.input
-CLEANFILES = scanner.c scanner.h parser.c parser.h test-include-by-reentrant OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-linedir-r/Makefile.am b/tests/test-linedir-r/Makefile.am
index f2ea16d3a3a7cedd85ea0067b7848ee4cbd55772..c25df06ca86c2169172b746fffbcfa42ef236bd3 100644 (file)
--- a/tests/test-linedir-r/Makefile.am
+++ b/tests/test-linedir-r/Makefile.am
@@ -25,7 +25,7 @@ FLEX = $(top_builddir)/flex
 builddir = @builddir@
 
 EXTRA_DIST = scanner.l test.input main.c check-lines.awk
-CLEANFILES = scanner.c scanner.h test-linedir-r OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o main.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)

diff --git a/tests/test-lineno-nr/Makefile.am b/tests/test-lineno-nr/Makefile.am
index 8ccf49da6e99628f8c91abbe79e5472107bb528b..35b28dcdaae0ac8236addff793ce7e87e5e4741d 100644 (file)
--- a/tests/test-lineno-nr/Makefile.am
+++ b/tests/test-lineno-nr/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c test-lineno-nr OUTPUT $(OBJS)
+CLEANFILES = scanner.c $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-lineno-r/Makefile.am b/tests/test-lineno-r/Makefile.am
index 2ea85f65fe6638ecb1fb56c46494edd6c071e66a..3ee49804eb220636eefdeb56d4c611223f2ced27 100644 (file)
--- a/tests/test-lineno-r/Makefile.am
+++ b/tests/test-lineno-r/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c test-lineno-r OUTPUT $(OBJS)
+CLEANFILES = scanner.c $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-mem-nr/Makefile.am b/tests/test-mem-nr/Makefile.am
index a79fe070951d5102321a7ded47ecfdabe8bada90..5d1f87d80145f68f13d6a02a5a9ea4ef33bdc982 100644 (file)
--- a/tests/test-mem-nr/Makefile.am
+++ b/tests/test-mem-nr/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c scanner.h test-mem-nr OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-mem-r/Makefile.am b/tests/test-mem-r/Makefile.am
index 85db163d89d5fbf9a1b9d164dda2275fb8f7e8f0..91d55fd534b4cd305e4b8a3c9ccc8211597d18ed 100644 (file)
--- a/tests/test-mem-r/Makefile.am
+++ b/tests/test-mem-r/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c scanner.h test-mem-r OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-multiple-scanners-nr/Makefile.am b/tests/test-multiple-scanners-nr/Makefile.am
index 52ef1002b3430ad44cd617b3d7c36e5546ea85db..6299d6a0cacfa176e111b58f3e4e0c7b32512153 100644 (file)
--- a/tests/test-multiple-scanners-nr/Makefile.am
+++ b/tests/test-multiple-scanners-nr/Makefile.am
@@ -25,7 +25,7 @@ FLEX = $(top_builddir)/flex
 builddir = @builddir@
 
 EXTRA_DIST = scanner-1.l scanner-2.l main.c
-CLEANFILES = scanner-1.c scanner-1.h test-multiple-scanners-nr OUTPUT $(OBJS) scanner-2.c scanner-2.h
+CLEANFILES = scanner-1.c scanner-1.h $(testname)$(EXEEXT) OUTPUT $(OBJS) scanner-2.c scanner-2.h
 OBJS = scanner-1.o scanner-2.o main.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)

diff --git a/tests/test-multiple-scanners-r/Makefile.am b/tests/test-multiple-scanners-r/Makefile.am
index 6ece425f01e9dac6cf307dbc03209f8386b15861..e2e777e86cc4daca3e1103c27f6fce8ff4557c3e 100644 (file)
--- a/tests/test-multiple-scanners-r/Makefile.am
+++ b/tests/test-multiple-scanners-r/Makefile.am
@@ -25,7 +25,7 @@ FLEX = $(top_builddir)/flex
 builddir = @builddir@
 
 EXTRA_DIST = scanner-1.l scanner-2.l main.c
-CLEANFILES = scanner-1.c scanner-1.h test-multiple-scanners-r OUTPUT\
+CLEANFILES = scanner-1.c scanner-1.h $(testname)$(EXEEXT) OUTPUT\
              $(OBJS) scanner-2.c scanner-2.h scanner-1.tables \
              scanner-2.tables
 OBJS = scanner-1.o scanner-2.o main.o

diff --git a/tests/test-noansi-nr/Makefile.am b/tests/test-noansi-nr/Makefile.am
index e3575038f029e177dc74390aeeab96a427715550..39ee4a2483bdc690974eb68becc3b89689bf34c1 100644 (file)
--- a/tests/test-noansi-nr/Makefile.am
+++ b/tests/test-noansi-nr/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c parser.c parser.h test-noansi-nr OUTPUT $(OBJS)
+CLEANFILES = scanner.c parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-noansi-r/Makefile.am b/tests/test-noansi-r/Makefile.am
index c0a33df416847c9ceaf22774d0c3a20505564bf0..9e44f4abe656d6a40108f9cd146d5425007f6458 100644 (file)
--- a/tests/test-noansi-r/Makefile.am
+++ b/tests/test-noansi-r/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c parser.c parser.h test-noansi-r OUTPUT $(OBJS)
+CLEANFILES = scanner.c parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-posix/Makefile.am b/tests/test-posix/Makefile.am
index ffdc15ecb1b141a2b39f0d799dbb112fcd2b3060..ef12c04cd4f2b4150c9b2a52bfaac043e6b83a4a 100644 (file)
--- a/tests/test-posix/Makefile.am
+++ b/tests/test-posix/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l
-CLEANFILES = scanner.c scanner.h test-posix OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-posixly-correct/Makefile.am b/tests/test-posixly-correct/Makefile.am
index 5ccbea0bb07c316c95424572a68e0f55d26feffc..d8f4cceb475982059f035958b861e4c75c944b09 100644 (file)
--- a/tests/test-posixly-correct/Makefile.am
+++ b/tests/test-posixly-correct/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l
-CLEANFILES = scanner.c scanner.h test-posixly-correct OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o 
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-prefix-nr/Makefile.am b/tests/test-prefix-nr/Makefile.am
index 2fcdcafbca143b70a530130eedffe2023373df86..8b2d46719af4999016fcc7cf688b23676d372063 100644 (file)
--- a/tests/test-prefix-nr/Makefile.am
+++ b/tests/test-prefix-nr/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c scanner.h parser.c parser.h test-prefix-nr OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-prefix-r/Makefile.am b/tests/test-prefix-r/Makefile.am
index 531c919a08e271d7756c52d68a03868ce9aca51f..7e08ef6acd443f3159b8d6cd51fc451c4559c9d3 100644 (file)
--- a/tests/test-prefix-r/Makefile.am
+++ b/tests/test-prefix-r/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c scanner.h parser.c parser.h test-prefix-r OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-pthread/Makefile.am b/tests/test-pthread/Makefile.am
index e011ebd0b2ac34ce2b4b87e137b0c37316366a26..7d2d062fb6ce36320595e21c454b53c4d8d0432e 100644 (file)
--- a/tests/test-pthread/Makefile.am
+++ b/tests/test-pthread/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test-1.input test-2.input test-3.input test-4.input test-5.input
-CLEANFILES = scanner.c scanner.h parser.c parser.h test-pthread OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-quotes/Makefile.am b/tests/test-quotes/Makefile.am
index 5a3c7c1b4fe295e01bf443680d24f72c1b06cb16..77bfe6f769c28ed78759778c2c586d66d8c98556 100644 (file)
--- a/tests/test-quotes/Makefile.am
+++ b/tests/test-quotes/Makefile.am
@@ -24,7 +24,7 @@ FLEX = $(top_builddir)/flex
 builddir = @builddir@
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c scanner.h test-quotes OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-reject/Makefile.am b/tests/test-reject/Makefile.am
index 8fe5d7cebc466d6b5c6673ccc942d0d0c541c9a2..64de33140fe23d4b5b87a5f3ccba12e4d381fc6f 100644 (file)
--- a/tests/test-reject/Makefile.am
+++ b/tests/test-reject/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c test-reject-* OUTPUT $(OBJS)
+CLEANFILES = scanner.c $(testname)$(EXEEXT)-* OUTPUT $(OBJS)
 OBJS = test-reject-nr.o test-reject-r.o test-reject-ver.o \
        test-reject-ser.o
 

diff --git a/tests/test-rescan-nr/Makefile.am b/tests/test-rescan-nr/Makefile.am
index 326c5825a943bb818cfb1b7b7a657e00546c58f2..5e3b88ebbfb341cc85373f3f47aae64b54b6f25f 100644 (file)
--- a/tests/test-rescan-nr/Makefile.am
+++ b/tests/test-rescan-nr/Makefile.am
@@ -24,7 +24,7 @@ FLEX = $(top_builddir)/flex
 builddir = @builddir@
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c scanner.h test-rescan-nr OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o 
 
 AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-rescan-r/Makefile.am b/tests/test-rescan-r/Makefile.am
index 9ff7735cea5098110e071dfce67f3ce61e560b19..2108512896449e004ba53a6f21233c054c3c617e 100644 (file)
--- a/tests/test-rescan-r/Makefile.am
+++ b/tests/test-rescan-r/Makefile.am
@@ -24,7 +24,7 @@ FLEX = $(top_builddir)/flex
 builddir = @builddir@
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c scanner.h test-rescan-r OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-string-nr/Makefile.am b/tests/test-string-nr/Makefile.am
index 3fd33bf6dda658171e8505c5fb36c11114329182..dbf8e0fe415518c4308c7a77fde0dea47b51501d 100644 (file)
--- a/tests/test-string-nr/Makefile.am
+++ b/tests/test-string-nr/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l 
-CLEANFILES = scanner.c scanner.h parser.c parser.h test-string-nr OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-string-r/Makefile.am b/tests/test-string-r/Makefile.am
index e2c1e0f4fba4d544c83c02b7ffa483927cb96e8c..2c930076cc087bcc981f89b7bde251e550ab47ba 100644 (file)
--- a/tests/test-string-r/Makefile.am
+++ b/tests/test-string-r/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l
-CLEANFILES = scanner.c scanner.h parser.c parser.h test-string-r OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)

diff --git a/tests/test-top/Makefile.am b/tests/test-top/Makefile.am
index 51e6d6bfdf958f77823abf8aca9b8932f9145441..f855545ab26e2e648e52c37391194e699e05486f 100644 (file)
--- a/tests/test-top/Makefile.am
+++ b/tests/test-top/Makefile.am
@@ -25,7 +25,7 @@ FLEX = $(top_builddir)/flex
 builddir = @builddir@
 
 EXTRA_DIST = scanner.l test.input main.c
-CLEANFILES = scanner.c scanner.h test-top OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o main.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)

diff --git a/tests/test-yyextra/Makefile.am b/tests/test-yyextra/Makefile.am
index 440c08b5e6f9eafa7554fba718c0f2cbcd209d5b..96ec982647bc15a81e1df63aff854a153a288300 100644 (file)
--- a/tests/test-yyextra/Makefile.am
+++ b/tests/test-yyextra/Makefile.am
@@ -23,7 +23,7 @@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c scanner.h parser.c parser.h test-yyextra OUTPUT $(OBJS)
+CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o
 
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)