From: John Millaway <john43@users.sourceforge.net>
Date: Fri, 19 Apr 2002 21:54:54 +0000 (+0000)
Subject: Added top_builddir to -I path.
X-Git-Tag: flex-2-5-10~75
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ffd33bd186d7f1f1f6d786aad9dd036ffda4469a;p=flex

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 1515512..7963864 100644
--- 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 12dff6a..05236d3 100644
--- 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 b299420..131557c 100644
--- 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 f97f342..c301304 100644
--- 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 0c953e8..8566472 100644
--- 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 43b1335..84883ee 100644
--- 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 339966d..48a990c 100644
--- 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 8e2a64b..d96c7bc 100644
--- 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 b113a88..6301092 100644
--- 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 7320926..880483f 100644
--- 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 26bb1c3..79f07f3 100644
--- 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 9538d34..9c15cd4 100644
--- 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 f0742a5..60df8d3 100644
--- 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 58b8c5f..b0c26c4 100644
--- 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 3ec7ae8..c3d440c 100644
--- 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 7b89d65..c3c5db6 100644
--- 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 97508eb..6e3b696 100644
--- 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 8c36c29..fb5a0df 100644
--- 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 aa3c694..71501f1 100644
--- 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 492962b..8f1c57c 100644
--- 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 a5290e1..e5f2ce6 100644
--- 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 7a23ced..fb36ec3 100644
--- 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 a8e8975..6462d5d 100644
--- 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) $<