now that config.h lives in the top-level directory, we need to tell the testsuite

diff --git a/tests/TEMPLATE/Makefile.am b/tests/TEMPLATE/Makefile.am
index ba590c1d7453ca20b2724e79018c23ec0a40776a..c7f46e17e8f3dd3f66dffd7e6934e89424764971 100644 (file)
--- a/tests/TEMPLATE/Makefile.am
+++ b/tests/TEMPLATE/Makefile.am
@@ -2,7 +2,7 @@ BISON = @BISON@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l parser.y test.input
-CLEANFILES = scanner.c parser.c parser.h TEMPLATE
+CLEANFILES = scanner.c parser.c parser.h TEMPLATE OUTPUT
 OBJS = scanner.o # parser.o
 
 INCLUDES = -I $(srcdir) -I $(top_srcdir)

diff --git a/tests/test-array-nr/Makefile.am b/tests/test-array-nr/Makefile.am
index a6e9335178b93bb46210f2395a43e5d859da14e9..12dff6aba8a99915349ba037e220cd85de5d3796 100644 (file)
--- a/tests/test-array-nr/Makefile.am
+++ b/tests/test-array-nr/Makefile.am
@@ -2,10 +2,10 @@ BISON = @BISON@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c parser.c parser.h test-array-nr
+CLEANFILES = scanner.c parser.c parser.h test-array-nr OUTPUT
 OBJS = scanner.o # parser.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)/tests
+INCLUDES = -I $(srcdir) -I $(top_srcdir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #YFLAGS = --defines --output=parser.c
 

diff --git a/tests/test-array-r/Makefile.am b/tests/test-array-r/Makefile.am
index dd731a64c1eaeb8c5b44dd1772c971023e40753c..b2994207d0bb9e419756f66ccfedefc98e91ccc5 100644 (file)
--- a/tests/test-array-r/Makefile.am
+++ b/tests/test-array-r/Makefile.am
@@ -2,10 +2,10 @@ BISON = @BISON@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
- CLEANFILES = scanner.c test-array-r
+CLEANFILES = scanner.c test-array-r OUTPUT
 OBJS = scanner.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)/tests
+INCLUDES = -I $(srcdir) -I $(top_srcdir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #YFLAGS = --defines --output=parser.c
 

diff --git a/tests/test-basic-nr/Makefile.am b/tests/test-basic-nr/Makefile.am
index bc69c50e29b7b1dcd289ca11035961330419a8b0..f97f342bbd8554686f04a7052add053371e0a291 100644 (file)
--- a/tests/test-basic-nr/Makefile.am
+++ b/tests/test-basic-nr/Makefile.am
@@ -2,10 +2,10 @@ BISON = @BISON@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c parser.c parser.h test-basic-nr
+CLEANFILES = scanner.c parser.c parser.h test-basic-nr OUTPUT
 OBJS = scanner.o # parser.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)/tests
+INCLUDES = -I $(srcdir) -I $(top_srcdir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #YFLAGS = --defines --output=parser.c
 

diff --git a/tests/test-basic-r/Makefile.am b/tests/test-basic-r/Makefile.am
index 45ee61afb7e8f5a09cc884e63d8a0e750bc624e7..0c953e816bf054e65a0a75afb8cfe0901a869e03 100644 (file)
--- a/tests/test-basic-r/Makefile.am
+++ b/tests/test-basic-r/Makefile.am
@@ -2,10 +2,10 @@ BISON = @BISON@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c parser.c parser.h test-basic-r
+CLEANFILES = scanner.c parser.c parser.h test-basic-r OUTPUT
 OBJS = scanner.o # parser.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)/tests
+INCLUDES = -I $(srcdir) -I $(top_srcdir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #YFLAGS = --defines --output=parser.c
 

diff --git a/tests/test-bison-yylloc/Makefile.am b/tests/test-bison-yylloc/Makefile.am
index 91801ac5f18cacf2398fbb04516bc2359022e7c1..013f9694c6bbd4de6e5eee11e3d167101ca616b2 100644 (file)
--- a/tests/test-bison-yylloc/Makefile.am
+++ b/tests/test-bison-yylloc/Makefile.am
@@ -2,10 +2,10 @@ BISON = @BISON@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l parser.y test.input
-CLEANFILES = scanner.c parser.c parser.h test-bison-yylloc $(OBJS)
+CLEANFILES = scanner.c parser.c parser.h test-bison-yylloc $(OBJS) OUTPUT
 OBJS = scanner.o parser.o main.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)/tests
+INCLUDES = -I $(srcdir) -I $(top_srcdir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 YFLAGS = --defines --output=parser.c --name-prefix="test"
 

diff --git a/tests/test-bison-yylval/Makefile.am b/tests/test-bison-yylval/Makefile.am
index 0b9651b4d15198ea3d7d7b3575db61d6b80be2c0..339966de6b7fb6ac8297f3edede9be7eb3fb3cc8 100644 (file)
--- a/tests/test-bison-yylval/Makefile.am
+++ b/tests/test-bison-yylval/Makefile.am
@@ -2,10 +2,10 @@ BISON = @BISON@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l parser.y test.input main.c
-CLEANFILES = scanner.c parser.c parser.h test-bison-yylval $(OBJS)
+CLEANFILES = scanner.c parser.c parser.h test-bison-yylval $(OBJS) OUTPUT
 OBJS = parser.o scanner.o main.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)/tests
+INCLUDES = -I $(srcdir) -I $(top_srcdir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 YFLAGS = --defines --output=parser.c --name-prefix="test"
 

diff --git a/tests/test-c-cpp-nr/Makefile.am b/tests/test-c-cpp-nr/Makefile.am
index 671f15f7444be45cd6f576f3580f6782b2cf7dcf..a94f21b21f7a544095f028ed8077b3225dfc3881 100644 (file)
--- a/tests/test-c-cpp-nr/Makefile.am
+++ b/tests/test-c-cpp-nr/Makefile.am
@@ -2,9 +2,10 @@ BISON = @BISON@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l parser.y test.input
+CLEANFILES = scanner.c parser.c parser.h test-cpp-nr$(OBJS) OUTPUT
 OBJS = $(srcdir)/scanner.o # $(srcdir)/parser.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)/tests
+INCLUDES = -I $(srcdir) -I $(top_srcdir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #YFLAGS = --defines --output=parser.c
 

diff --git a/tests/test-c-cpp-r/Makefile.am b/tests/test-c-cpp-r/Makefile.am
index 03bdf5c1ecf46133bc05743e4e1b44be397ddf86..2db24fa17a855f3f7ce47683ebbbc79dfbec1775 100644 (file)
--- a/tests/test-c-cpp-r/Makefile.am
+++ b/tests/test-c-cpp-r/Makefile.am
@@ -2,10 +2,10 @@ BISON = @BISON@
 FLEX = $(top_builddir)/flex
 
 EXTRA_DIST = scanner.l parser.y test.input
-CLEANFILES = scanner.c parser.c parser.h test-c-cpp-r
+CLEANFILES = scanner.c parser.c parser.h test-c-cpp-r $(OBJS) OUTPUT
 OBJS = scanner.o # parser.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)/tests
+INCLUDES = -I $(srcdir) -I $(top_srcdir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #YFLAGS = --defines --output=parser.c