test suite changes

2 files changed, 27 insertions, 66 deletions

diff --git a/tests/test-basic-r/Makefile.am b/tests/test-basic-r/Makefile.am
new file mode 100644
index 0000000..45ee61a
--- /dev/null
+++ b/tests/test-basic-r/Makefile.am
@@ -0,0 +1,27 @@
+BISON = @BISON@
+FLEX = $(top_builddir)/flex
+
+EXTRA_DIST = scanner.l test.input
+CLEANFILES = scanner.c parser.c parser.h test-basic-r
+OBJS = scanner.o # parser.o
+
+INCLUDES = -I $(srcdir) -I $(top_srcdir)/tests
+#LDFLAGS = $(top_srcdir)/libfl.a 
+#YFLAGS = --defines --output=parser.c
+
+testname = test-basic-r
+
+scanner.c: $(srcdir)/scanner.l
+	$(FLEX) $<
+
+parser.c: $(srcdir)/parser.y
+	$(BISON) $(YFLAGS) $<
+
+$(testname)$(EXEEXT): $(OBJS)
+	$(CC) -o $@ $(OBJS) $(LDFLAGS)
+
+test: $(testname)$(EXEEXT)
+	$(srcdir)/$(testname)$(EXEEXT) < $(srcdir)/test.input
+
+.c.o:
+	$(CC) -c -o $@ $(INCLUDES) $<
diff --git a/tests/test-basic-r/Makefile.in b/tests/test-basic-r/Makefile.in
deleted file mode 100644
index 730bd83..0000000
--- a/tests/test-basic-r/Makefile.in
+++ /dev/null
@@ -1,66 +0,0 @@
-# Makefile.in for a single TEST.
-#
-# By default this Makefile will build the target "$(TESTNAME)"
-# from the sources "scanner.l" and "parser.y".
-#
-# $(TESTNAME) is supplied by the calling Makefile.
-# "parser.y"  is not necessary. You may delete this file
-#             if you do not require a parser.
-# "scanner.l" is necessary. It should build "scanner.c".
-#
-
-@SET_MAKE@
-
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@ -I. -I"@srcdir@" -I..
-DEFS = @DEFS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-SHELL = /bin/sh
-srcdir = @srcdir@
-VPATH = @srcdir@
-LN_S = @LN_S@
-YACC = @YACC@
-CC = @CC@
-AR = ar
-RANLIB = @RANLIB@
-YACC = @YACC@
-
-# Edit these if necessary for your specific test.
-FLEX = ../../flex
-YFLAGS = --defines --output-file="parser.c" --name-prefix="test" 
-OBJS = scanner.o # parser.o
-
-# Force YACC to be bison (autoconf generates 'bison -y')
-YACC = @BISON@
-
-TESTNAME = test-basic-r
-all: $(TESTNAME)
-
-$(TESTNAME): $(OBJS)
-	$(CC) $(CFLAGS) -o $(TESTNAME) $(OBJS) $(LDFLAGS) $(LIBS)
-
-scanner.c: $(srcdir)/scanner.l
-	$(FLEX) $(srcdir)/scanner.l
-
-scanner.o: scanner.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c scanner.c
-
-parser.c: $(srcdir)/parser.y
-	$(YACC) $(YFLAGS) $(srcdir)/parser.y
-
-parser.o: parser.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c parser.c
-
-test: check
-
-check: $(TESTNAME)
-	./$(TESTNAME) < $(srcdir)/test.input 
-
-clean:
-	rm -f scanner.o scanner.c parser.o parser.c  parser.h $(TESTNAME)
-
-
-distclean: clean
-	rm -f Makefile
-