Added top_builddir to -I path.

Changed $(srcdir)/$(testname) to ./$(testname) in 'make test' rule.

diff --git a/tests/TEMPLATE/Makefile.am b/tests/TEMPLATE/Makefile.am
index 15155122de3ac332d57dbc1766137ca7da45bb63..79638647da8034ae686cbf2665b9b7bb5778180c 100644 (file)
--- a/tests/TEMPLATE/Makefile.am
+++ b/tests/TEMPLATE/Makefile.am
@@ -5,7 +5,7 @@ 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
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #LFLAGS = --header="scanner.h"
 #YFLAGS = --defines --output=parser.c
@@ -22,7 +22,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CC) -o $@ $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
-       $(srcdir)/$(testname)$(EXEEXT) < $(srcdir)/test.input
+       ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
        $(CC) -c -o $@ $(INCLUDES) $<

diff --git a/tests/test-array-nr/Makefile.am b/tests/test-array-nr/Makefile.am
index 12dff6aba8a99915349ba037e220cd85de5d3796..05236d3957ff4b6eaa30b9a979d2f6dd646ff886 100644 (file)
--- a/tests/test-array-nr/Makefile.am
+++ b/tests/test-array-nr/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input
 CLEANFILES = scanner.c parser.c parser.h test-array-nr OUTPUT
 OBJS = scanner.o # parser.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #YFLAGS = --defines --output=parser.c
 
@@ -21,7 +21,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CC) -o $@ $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
-       $(srcdir)/$(testname)$(EXEEXT) < $(srcdir)/test.input
+       ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
        $(CC) -c -o $@ $(INCLUDES) $<

diff --git a/tests/test-array-r/Makefile.am b/tests/test-array-r/Makefile.am
index b2994207d0bb9e419756f66ccfedefc98e91ccc5..131557cc63f57a8b9d069218b76eaf0dbf4a5467 100644 (file)
--- a/tests/test-array-r/Makefile.am
+++ b/tests/test-array-r/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input
 CLEANFILES = scanner.c test-array-r OUTPUT
 OBJS = scanner.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #YFLAGS = --defines --output=parser.c
 
@@ -18,7 +18,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CC) -o $@ $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
-       $(srcdir)/$(testname)$(EXEEXT) < $(srcdir)/test.input
+       ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
        $(CC) -c -o $@ $(INCLUDES) $<

diff --git a/tests/test-basic-nr/Makefile.am b/tests/test-basic-nr/Makefile.am
index f97f342bbd8554686f04a7052add053371e0a291..c3013047fd0a4be7dc78e6f2db37fe8d8e30e5b8 100644 (file)
--- a/tests/test-basic-nr/Makefile.am
+++ b/tests/test-basic-nr/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input
 CLEANFILES = scanner.c parser.c parser.h test-basic-nr OUTPUT
 OBJS = scanner.o # parser.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #YFLAGS = --defines --output=parser.c
 
@@ -21,7 +21,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CC) -o $@ $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
-       $(srcdir)/$(testname)$(EXEEXT) < $(srcdir)/test.input
+       ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
        $(CC) -c -o $@ $(INCLUDES) $<

diff --git a/tests/test-basic-r/Makefile.am b/tests/test-basic-r/Makefile.am
index 0c953e816bf054e65a0a75afb8cfe0901a869e03..8566472068f325f38f8c3346148c3e27fefef0b6 100644 (file)
--- a/tests/test-basic-r/Makefile.am
+++ b/tests/test-basic-r/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input
 CLEANFILES = scanner.c parser.c parser.h test-basic-r OUTPUT
 OBJS = scanner.o # parser.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #YFLAGS = --defines --output=parser.c
 
@@ -21,7 +21,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CC) -o $@ $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
-       $(srcdir)/$(testname)$(EXEEXT) < $(srcdir)/test.input
+       ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
        $(CC) -c -o $@ $(INCLUDES) $<

diff --git a/tests/test-bison-yylloc/Makefile.am b/tests/test-bison-yylloc/Makefile.am
index 43b1335467ec01c4c28d0e0d9f3e83787bdf8fff..84883ee78cf00cd11cd71d6161d44bd16f162269 100644 (file)
--- a/tests/test-bison-yylloc/Makefile.am
+++ b/tests/test-bison-yylloc/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l parser.y test.input main.c
 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)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 YFLAGS = --defines --output=parser.c --name-prefix="test"
 
@@ -21,7 +21,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CC) -o $@ $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
-       $(srcdir)/$(testname)$(EXEEXT) < $(srcdir)/test.input
+       ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
        $(CC) -c -o $@ $(INCLUDES) $<

diff --git a/tests/test-bison-yylval/Makefile.am b/tests/test-bison-yylval/Makefile.am
index 339966de6b7fb6ac8297f3edede9be7eb3fb3cc8..48a990c03496d4fe10f685255c22c42e8897748e 100644 (file)
--- a/tests/test-bison-yylval/Makefile.am
+++ b/tests/test-bison-yylval/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l parser.y test.input main.c
 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)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 YFLAGS = --defines --output=parser.c --name-prefix="test"
 
@@ -21,7 +21,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CC) -o $@ $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
-       $(srcdir)/$(testname)$(EXEEXT) < $(srcdir)/test.input
+       ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
        $(CC) -c -o $@ $(INCLUDES) $<

diff --git a/tests/test-c-cpp-nr/Makefile.am b/tests/test-c-cpp-nr/Makefile.am
index 8e2a64b8e349e8f14a0e9ac129665996882e5145..d96c7bc280f957e1772508124310fe79b1ffaf10 100644 (file)
--- a/tests/test-c-cpp-nr/Makefile.am
+++ b/tests/test-c-cpp-nr/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input
 CLEANFILES = scanner.c parser.c parser.h test-cpp-nr$(OBJS) OUTPUT
 OBJS = scanner.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #YFLAGS = --defines --output=parser.c
 
@@ -21,7 +21,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CXX) -o $(testname)$(EXEEXT) $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
-       $(srcdir)/$(testname)$(EXEEXT) < $(srcdir)/test.input
+       ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
        $(CC) -c -o $@ $(INCLUDES) $<

diff --git a/tests/test-c-cpp-r/Makefile.am b/tests/test-c-cpp-r/Makefile.am
index b113a88481e15a2ec3f59cb14b099cd70826a132..6301092ee50fb2ea2d85e5cddbbefcc54bd7f8d4 100644 (file)
--- a/tests/test-c-cpp-r/Makefile.am
+++ b/tests/test-c-cpp-r/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input
 CLEANFILES = scanner.c parser.c parser.h test-c-cpp-r $(OBJS) OUTPUT
 OBJS = scanner.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #YFLAGS = --defines --output=parser.c
 
@@ -21,7 +21,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CXX) -o $@ $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
-       $(srcdir)/$(testname)$(EXEEXT) < $(srcdir)/test.input
+       ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
        $(CC) -c -o $@ $(INCLUDES) $<

diff --git a/tests/test-header-nr/Makefile.am b/tests/test-header-nr/Makefile.am
index 73209262dca06dc80c96ed630b57abb36df91d3b..880483fd7be4ffafbae64eaecad11fe34fd0d776 100644 (file)
--- a/tests/test-header-nr/Makefile.am
+++ b/tests/test-header-nr/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l  test.input main.c
 CLEANFILES = scanner.c scanner.h test-header-nr $(OBJS) OUTPUT
 OBJS = scanner.o main.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #YFLAGS = --defines --output=parser.c
 
@@ -21,7 +21,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CC) -o $@ $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
-       $(srcdir)/$(testname)$(EXEEXT) < $(srcdir)/test.input
+       ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
        $(CC) -c -o $@ $(INCLUDES) $<

diff --git a/tests/test-header-r/Makefile.am b/tests/test-header-r/Makefile.am
index 26bb1c393ab322d227acee5e66f61bee6a0bb654..79f07f3e9ad352d75217678c84ac9d0f68cb11e9 100644 (file)
--- a/tests/test-header-r/Makefile.am
+++ b/tests/test-header-r/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input main.c
 CLEANFILES = scanner.c scanner.h test-header-r OUTPUT $(OBJS)
 OBJS = scanner.o main.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 LFLAGS = --header="scanner.h"
 #YFLAGS = --defines --output=parser.c
@@ -22,7 +22,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CC) -o $@ $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
-       $(srcdir)/$(testname)$(EXEEXT) < $(srcdir)/test.input
+       ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
        $(CC) -c -o $@ $(INCLUDES) $<

diff --git a/tests/test-include-by-buffer/Makefile.am b/tests/test-include-by-buffer/Makefile.am
index 9538d3475da0a2af0fc9db68f30886a99b7d746b..9c15cd4e7478cb62cff89b1b8e123c9d34967096 100644 (file)
--- a/tests/test-include-by-buffer/Makefile.am
+++ b/tests/test-include-by-buffer/Makefile.am
@@ -5,7 +5,7 @@ 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)
 OBJS = scanner.o # parser.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #LFLAGS = --header="scanner.h"
 #YFLAGS = --defines --output=parser.c
@@ -22,7 +22,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CC) -o $@ $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
-       $(srcdir)/$(testname)$(EXEEXT) $(srcdir)/test-1.input
+       ./$(testname)$(EXEEXT) $(srcdir)/test-1.input
 
 .c.o:
        $(CC) -c -o $@ $(INCLUDES) $<

diff --git a/tests/test-include-by-reentrant/Makefile.am b/tests/test-include-by-reentrant/Makefile.am
index f0742a5114edba60a1d70160a65b4080cab4bb38..60df8d3be8a44f5a01f47e86bcd3a7cd38622646 100644 (file)
--- a/tests/test-include-by-reentrant/Makefile.am
+++ b/tests/test-include-by-reentrant/Makefile.am
@@ -5,7 +5,7 @@ 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)
 OBJS = scanner.o # parser.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #LFLAGS = --header="scanner.h"
 #YFLAGS = --defines --output=parser.c

diff --git a/tests/test-lineno-nr/Makefile.am b/tests/test-lineno-nr/Makefile.am
index 58b8c5f705223f155e38e5be15e59e8b115cf8e0..b0c26c4ce8d46f1690f6b44934a51546aa7fe210 100644 (file)
--- a/tests/test-lineno-nr/Makefile.am
+++ b/tests/test-lineno-nr/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input
 CLEANFILES = scanner.c test-lineno-nr OUTPUT $(OBJS)
 OBJS = scanner.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 
 testname = test-lineno-nr
 

diff --git a/tests/test-lineno-r/Makefile.am b/tests/test-lineno-r/Makefile.am
index 3ec7ae80aab8f875ce6e2c9c552f407d2b06f8df..c3d440cbd79433768818c93fb81bc3d3e3a5a255 100644 (file)
--- a/tests/test-lineno-r/Makefile.am
+++ b/tests/test-lineno-r/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input
 CLEANFILES = scanner.c test-lineno-r OUTPUT $(OBJS)
 OBJS = scanner.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 
 testname = test-lineno-r
 

diff --git a/tests/test-multiple-scanners-nr/Makefile.am b/tests/test-multiple-scanners-nr/Makefile.am
index 7b89d6594f79cad3a6ad9cbd6422dc9cd9abd1b7..c3c5db6f0cc9034cdbb0488d2ea885c6cc02b7e6 100644 (file)
--- a/tests/test-multiple-scanners-nr/Makefile.am
+++ b/tests/test-multiple-scanners-nr/Makefile.am
@@ -5,7 +5,7 @@ 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
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #YFLAGS = --defines --output=parser.c
 
@@ -21,7 +21,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CC) -o $@ $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
-       $(srcdir)/$(testname)$(EXEEXT)
+       ./$(testname)$(EXEEXT)
 
 .c.o:
        $(CC) -c -o $@ $(INCLUDES) $<

diff --git a/tests/test-multiple-scanners-r/Makefile.am b/tests/test-multiple-scanners-r/Makefile.am
index 97508eb26e19767070317738821b716a197c54c7..6e3b69604d454cd07a47122cdbbb8069f01c5b8d 100644 (file)
--- a/tests/test-multiple-scanners-r/Makefile.am
+++ b/tests/test-multiple-scanners-r/Makefile.am
@@ -5,7 +5,7 @@ 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
 OBJS = scanner-1.o scanner-2.o main.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #YFLAGS = --defines --output=parser.c
 
@@ -21,7 +21,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CC) -o $@ $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
-       $(srcdir)/$(testname)$(EXEEXT)
+       ./$(testname)$(EXEEXT)
 
 .c.o:
        $(CC) -c -o $@ $(INCLUDES) $<

diff --git a/tests/test-prefix-nr/Makefile.am b/tests/test-prefix-nr/Makefile.am
index 8c36c29096f12cd7430b32e129cc5b0243970dfd..fb5a0df32402f98626d2204005e44387bd5dc395 100644 (file)
--- a/tests/test-prefix-nr/Makefile.am
+++ b/tests/test-prefix-nr/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input
 CLEANFILES = scanner.c scanner.h parser.c parser.h test-prefix-nr OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #LFLAGS = --header="scanner.h"
 #YFLAGS = --defines --output=parser.c
@@ -22,7 +22,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CC) -o $@ $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
-       $(srcdir)/$(testname)$(EXEEXT) < $(srcdir)/test.input
+       ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
        $(CC) -c -o $@ $(INCLUDES) $<

diff --git a/tests/test-prefix-r/Makefile.am b/tests/test-prefix-r/Makefile.am
index aa3c69472ba9532434d2a9e6c1d096e776e89647..71501f146d0343d4e56497d3516a6922f9cd6740 100644 (file)
--- a/tests/test-prefix-r/Makefile.am
+++ b/tests/test-prefix-r/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input
 CLEANFILES = scanner.c scanner.h parser.c parser.h test-prefix-r OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #LFLAGS = --header="scanner.h"
 #YFLAGS = --defines --output=parser.c
@@ -22,7 +22,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CC) -o $@ $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
-       $(srcdir)/$(testname)$(EXEEXT) < $(srcdir)/test.input
+       ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
        $(CC) -c -o $@ $(INCLUDES) $<

diff --git a/tests/test-pthread/Makefile.am b/tests/test-pthread/Makefile.am
index 492962bbe2f74a3390d809e451845a015e427d54..8f1c57c6f7da330ae0cb2f4f187a3469aec2f2aa 100644 (file)
--- a/tests/test-pthread/Makefile.am
+++ b/tests/test-pthread/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test-1.input test-2.input test-3.input test-4.input test-
 CLEANFILES = scanner.c scanner.h parser.c parser.h test-pthread OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 LDFLAGS = -lpthread
 #LFLAGS = --header="scanner.h"
 #YFLAGS = --defines --output=parser.c
@@ -19,7 +19,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CC) -o $@ $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
-       $(srcdir)/$(testname) $(srcdir)/test-*.input
+       ./$(testname) $(srcdir)/test-*.input
 
 .c.o:
        $(CC) -c -o $@ $(INCLUDES) $<

diff --git a/tests/test-string-nr/Makefile.am b/tests/test-string-nr/Makefile.am
index a5290e12f16c6ef2918160d472a4e2d15637b6df..e5f2ce6a356dd84c7e40cb257d1595b2c62cd6ad 100644 (file)
--- a/tests/test-string-nr/Makefile.am
+++ b/tests/test-string-nr/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l
 CLEANFILES = scanner.c scanner.h parser.c parser.h test-string-nr OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #LFLAGS = --header="scanner.h"
 #YFLAGS = --defines --output=parser.c
@@ -19,7 +19,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CC) -o $@ $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
-       $(srcdir)/$(testname)$(EXEEXT)
+       ./$(testname)$(EXEEXT)
 
 .c.o:
        $(CC) -c -o $@ $(INCLUDES) $<

diff --git a/tests/test-string-r/Makefile.am b/tests/test-string-r/Makefile.am
index 7a23ceda4f717c2b0581dbf08dd846623ef5e2b6..fb36ec30d5a9eb6e4a006d2fcb3bc6292051ddf2 100644 (file)
--- a/tests/test-string-r/Makefile.am
+++ b/tests/test-string-r/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l
 CLEANFILES = scanner.c scanner.h parser.c parser.h test-string-r OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #LFLAGS = --header="scanner.h"
 #YFLAGS = --defines --output=parser.c
@@ -19,7 +19,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CC) -o $@ $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
-       $(srcdir)/$(testname)$(EXEEXT)
+       ./$(testname)$(EXEEXT)
 
 .c.o:
        $(CC) -c -o $@ $(INCLUDES) $<

diff --git a/tests/test-yyextra/Makefile.am b/tests/test-yyextra/Makefile.am
index a8e8975a22f17a5ca257ea8ca9c39df80aca0676..6462d5d71362dddc9f3a4dabb8de62bb020a0799 100644 (file)
--- a/tests/test-yyextra/Makefile.am
+++ b/tests/test-yyextra/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = scanner.l test.input
 CLEANFILES = scanner.c scanner.h parser.c parser.h test-yyextra OUTPUT $(OBJS)
 OBJS = scanner.o # parser.o
 
-INCLUDES = -I $(srcdir) -I $(top_srcdir)
+INCLUDES = -I $(srcdir) -I $(top_srcdir) -I $(top_builddir)
 #LDFLAGS = $(top_srcdir)/libfl.a 
 #LFLAGS = --header="scanner.h"
 #YFLAGS = --defines --output=parser.c
@@ -22,7 +22,7 @@ $(testname)$(EXEEXT): $(OBJS)
        $(CC) -o $@ $(OBJS) $(LDFLAGS)
 
 test: $(testname)$(EXEEXT)
-       $(srcdir)/$(testname)$(EXEEXT) < $(srcdir)/test.input
+       ./$(testname)$(EXEEXT) < $(srcdir)/test.input
 
 .c.o:
        $(CC) -c -o $@ $(INCLUDES) $<