use builddir in tests that need it in their include path

diff --git a/tests/TEMPLATE/Makefile.am b/tests/TEMPLATE/Makefile.am
index ee5016d2c393b21da912da494aef79b3e1043667..b3d1f57c005c5fefc06fb241f129631c4ea6933a 100644 (file)
--- a/tests/TEMPLATE/Makefile.am
+++ b/tests/TEMPLATE/Makefile.am
@@ -22,6 +22,8 @@
 BISON = @BISON@
 FLEX = $(top_builddir)/flex
 
+builddir = @builddir@
+
 EXTRA_DIST = scanner.l parser.y test.input
 CLEANFILES = scanner.c scanner.h parser.c parser.h TEMPLATE OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o

diff --git a/tests/test-bison-nr/Makefile.am b/tests/test-bison-nr/Makefile.am
index 92a2f634ba6096761b2a7cad1fbd426a2757f599..2ad07db3ea9a2186dfff9c8307235b78ea48eb49 100644 (file)
--- a/tests/test-bison-nr/Makefile.am
+++ b/tests/test-bison-nr/Makefile.am
@@ -22,11 +22,13 @@
 BISON = @BISON@
 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
 OBJS = scanner.o parser.o main.o
 
-AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
+AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 YFLAGS = --defines --output=parser.c --name-prefix="test"
 

diff --git a/tests/test-bison-yylloc/Makefile.am b/tests/test-bison-yylloc/Makefile.am
index 087fc1aa0fb41a4005655a623f85335a9125636e..542be3af40c505422f0ef814eb04baf9166f3c42 100644 (file)
--- a/tests/test-bison-yylloc/Makefile.am
+++ b/tests/test-bison-yylloc/Makefile.am
@@ -22,11 +22,13 @@
 BISON = @BISON@
 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
 OBJS = scanner.o parser.o main.o
 
-AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
+AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)
 #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 692f2fab02797c8a4ec8726984755fbb6862c621..31ac68a5d7b17d3d53a35614ba5d291cf866ad7b 100644 (file)
--- a/tests/test-bison-yylval/Makefile.am
+++ b/tests/test-bison-yylval/Makefile.am
@@ -22,11 +22,13 @@
 BISON = @BISON@
 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
 OBJS = parser.o scanner.o main.o
 
-AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
+AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 YFLAGS = --defines --output=parser.c --name-prefix="test"
 

diff --git a/tests/test-header-nr/Makefile.am b/tests/test-header-nr/Makefile.am
index ee18dc68e96c070db92194e37479e06c5992db98..b6accfacfe504b1f23312dd8e9839542f1eee95c 100644 (file)
--- a/tests/test-header-nr/Makefile.am
+++ b/tests/test-header-nr/Makefile.am
@@ -22,11 +22,13 @@
 BISON = @BISON@
 FLEX = $(top_builddir)/flex
 
+builddir = @builddir@
+
 EXTRA_DIST = scanner.l  test.input main.c
 CLEANFILES = scanner.c scanner.h test-header-nr $(OBJS) OUTPUT
 OBJS = scanner.o main.o
 
-AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
+AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #YFLAGS = --defines --output=parser.c
 

diff --git a/tests/test-header-r/Makefile.am b/tests/test-header-r/Makefile.am
index 9b1de2b297b8b5520d6bf397b1c4abc57e2a4edc..7661a072cbfcebbd2b5c8f57699effc298180515 100644 (file)
--- a/tests/test-header-r/Makefile.am
+++ b/tests/test-header-r/Makefile.am
@@ -22,11 +22,13 @@
 BISON = @BISON@
 FLEX = $(top_builddir)/flex
 
+builddir = @builddir@
+
 EXTRA_DIST = scanner.l test.input main.c
 CLEANFILES = scanner.c scanner.h test-header-r OUTPUT $(OBJS)
 OBJS = scanner.o main.o
 
-AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
+AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 LFLAGS = --header="scanner.h"
 #YFLAGS = --defines --output=parser.c

diff --git a/tests/test-multiple-scanners-nr/Makefile.am b/tests/test-multiple-scanners-nr/Makefile.am
index 55ede977b1edf6c3c93f7f6a39255ffbb9096740..97858a0b2e1c6231e4ea40d603a6b66c8141f701 100644 (file)
--- a/tests/test-multiple-scanners-nr/Makefile.am
+++ b/tests/test-multiple-scanners-nr/Makefile.am
@@ -22,11 +22,13 @@
 BISON = @BISON@
 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
 OBJS = scanner-1.o scanner-2.o main.o
 
-AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
+AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #YFLAGS = --defines --output=parser.c
 

diff --git a/tests/test-multiple-scanners-r/Makefile.am b/tests/test-multiple-scanners-r/Makefile.am
index 73ce1b8d912857ed923429908787520bdf22d1f3..71e6b8c517b9c80549c342360ddf919eca76730a 100644 (file)
--- a/tests/test-multiple-scanners-r/Makefile.am
+++ b/tests/test-multiple-scanners-r/Makefile.am
@@ -22,13 +22,15 @@
 BISON = @BISON@
 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\
              $(OBJS) scanner-2.c scanner-2.h scanner-1.tables \
              scanner-2.tables
 OBJS = scanner-1.o scanner-2.o main.o
 
-AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
+AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #YFLAGS = --defines --output=parser.c