make test target depend on test groupings, which in turn depend on building executabl...

diff --git a/tests/test-table-opts/Makefile.am b/tests/test-table-opts/Makefile.am
index 3deb3babc274541d282db0e6eb6970522ec0da19..a52f6170471a3f84db68e680708ecec8d341b1ce 100644 (file)
--- a/tests/test-table-opts/Makefile.am
+++ b/tests/test-table-opts/Makefile.am
@@ -28,7 +28,6 @@
 # 'test-mul' checks that we can store multiple tables in a single file.
 # ------------------------------------------------
 
-
 FLEX = $(top_builddir)/flex
 
 testname  := test-table-opts
@@ -63,12 +62,11 @@ sertables  := $(addsuffix .tables,$(sertests))
 alltables  := $(addsuffix .tables,$(alltests))
 
 EXTRA_DIST = scanner.l test.input
-CLEANFILES = scanner.c OUTPUT test-*.o test-*.c test-*.tables \
-             all-ser.tables core $(alltests)
+CLEANFILES = scanner.c OUTPUT $(allobj) $(allsrc) $(alltables) \
+             all-ser.tables $(allexe)
 AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
 
-test: test-table-opts
-test-table-opts: $(alltests)
+test: test-opt test-ser test-ver test-mul
 
 test-opt-r%.c: $(srcdir)/scanner.l
        $(FLEX) -L -P $(subst -,_,$(basename $(@F))) --reentrant $*  -o $@ $<
@@ -130,6 +128,5 @@ test-opt-r-%.o:  test-opt-r-%.c  ; $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) -DT
 test-ser-r-%.o:  test-ser-r-%.c  ; $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) -DTEST_HAS_TABLES_EXTERNAL -DTEST_IS_REENTRANT $(CFLAGS) $<
 test-ver-r-%.o:  test-ver-r-%.c  ; $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) -DTEST_HAS_TABLES_EXTERNAL -DTEST_IS_REENTRANT $(CFLAGS) $<
 
-
-.PHONY: test-table-opts test test-opt test-ser test-ver test-mul
+.PHONY: test test-opt test-ser test-ver test-mul
 .SECONDARY: $(allobj) $(allsrc)