* Makefile.am (TESTS): Added clean.am.

	* clean.test: New file.
	* ansi2.test: Updated test for new SUBDIRS change.
	* noinst.test: Updated test for new SUBDIRS change.
	* checkall.test: Added check to make sure check-local is handled.
	Updated test for new SUBDIRS change.
	* java.test: Updated test for new SUBDIRS change.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index f2ff446..95a553d 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,13 @@
+Mon Sep 28 01:46:34 1998  Tom Tromey  <tromey@cygnus.com>
+
+       * Makefile.am (TESTS): Added clean.am.
+       * clean.test: New file.
+       * ansi2.test: Updated test for new SUBDIRS change.
+       * noinst.test: Updated test for new SUBDIRS change.
+       * checkall.test: Added check to make sure check-local is handled.
+       Updated test for new SUBDIRS change.
+       * java.test: Updated test for new SUBDIRS change.
+
 Sun Sep 27 20:01:20 1998  Tom Tromey  <tromey@cygnus.com>
 
        * Makefile.am (TESTS): Added else.test.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9449c28..2e0e4ca 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -32,7 +32,8 @@ texinfo5.test aclocali.test texinfo6.test condman2.test colon4.test \
 java.test sinclude.test javaprim.test javasubst.test aclocalii.test \
 lex2.test libobj8.test version3.test instdata.test exdir2.test \
 colon5.test library.test syntax.test cond4.test cond5.test recurs.test \
-ansi3.test cond6.test colon6.test texinfo7.test parse.test else.test
+ansi3.test cond6.test colon6.test texinfo7.test parse.test else.test \
+clean.am
 
 EXTRA_DIST = defs $(TESTS)
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 63de455..47eb07f 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -95,7 +95,8 @@ texinfo5.test aclocali.test texinfo6.test condman2.test colon4.test \
 java.test sinclude.test javaprim.test javasubst.test aclocalii.test \
 lex2.test libobj8.test version3.test instdata.test exdir2.test \
 colon5.test library.test syntax.test cond4.test cond5.test recurs.test \
-ansi3.test cond6.test colon6.test texinfo7.test parse.test else.test
+ansi3.test cond6.test colon6.test texinfo7.test parse.test else.test \
+clean.am
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -106,8 +107,7 @@ DIST_COMMON =  ChangeLog Makefile.am Makefile.in
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 GZIP = --best
-all: Makefile
-
+all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
        cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/Makefile
@@ -134,7 +134,7 @@ distdir: $(DISTFILES)
          d=$(srcdir); \
          if test -d $$d/$$file; then \
            cp -pr $$/$$file $(distdir)/$$file; \
-         else\
+         else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
            || cp -p $$d/$$file $(distdir)/$$file; \
@@ -165,22 +165,28 @@ check-TESTS: $(TESTS)
        echo "$$banner"; \
        echo "$$dashes"; \
        test "$$failed" -eq 0
-info:
-dvi:
-check: all
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
        $(MAKE) $(AM_MAKEFLAGS) check-TESTS
-installcheck:
-install-exec: 
-       @$(NORMAL_INSTALL)
-
-install-data: 
-       @$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-       @:
-
-uninstall: 
-
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: install-exec-am install-data-am install-exec-am \
+               install-data-am install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile
+all-redirect: all-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:
@@ -195,19 +201,29 @@ distclean-generic:
        -rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean:  mostlyclean-generic
+mostlyclean-am:  mostlyclean-generic clean-am
 
-clean:  clean-generic mostlyclean
+mostlyclean: mostlyclean-am
 
-distclean:  distclean-generic clean distclean-local
+clean-am:  clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-generic clean-am distclean-local
        -rm -f config.status
 
-maintainer-clean:  maintainer-clean-generic distclean
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-generic distclean-am
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
 
-.PHONY: tags distdir check-TESTS info dvi installcheck install-exec \
-install-data install uninstall all installdirs mostlyclean-generic \
+maintainer-clean: maintainer-clean-am
+
+.PHONY: tags distdir check-TESTS info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
 distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 

diff --git a/tests/ansi2.test b/tests/ansi2.test
index ae84559..9f51f8e 100755 (executable)
--- a/tests/ansi2.test
+++ b/tests/ansi2.test
@@ -19,4 +19,4 @@ END
 
 $AUTOMAKE || exit 1
 
-grep 'all:.*ANSI2KNR' Makefile.in
+grep '^all[-a-z]*:.*ANSI2KNR' Makefile.in

diff --git a/tests/checkall.test b/tests/checkall.test
index c329a4b..34b7230 100755 (executable)
--- a/tests/checkall.test
+++ b/tests/checkall.test
@@ -12,4 +12,5 @@ END
 
 $AUTOMAKE || exit 1
 
-grep '^check:.* all' Makefile.in
+grep '^check-am:.*all-am' Makefile.in || exit 1
+grep 'MAKE.*check-local' Makefile.in

diff --git a/tests/clean.test b/tests/clean.test
new file mode 100755 (executable)
index 0000000..e34173f
--- /dev/null
+++ b/tests/clean.test
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+# Test to make sure a clean target depends on previous one.
+
+. $srcdir/defs || exit 1
+
+: > Makefile.am
+
+$AUTOMAKE || exit 1
+
+grep '^clean-am:.*mostlyclean-am' Makefile.in

diff --git a/tests/java.test b/tests/java.test
index ed3c2df..47a2992 100755 (executable)
--- a/tests/java.test
+++ b/tests/java.test
@@ -10,4 +10,4 @@ java_JAVA = a.java b.java c.java
 END
 
 $AUTOMAKE || exit 1
-grep '^all:.*classjava\.stamp' Makefile.in
+grep '^all[-a-z]*:.*classjava\.stamp' Makefile.in

diff --git a/tests/noinst.test b/tests/noinst.test
index 4ed15f4..d5970a8 100755 (executable)
--- a/tests/noinst.test
+++ b/tests/noinst.test
@@ -12,4 +12,4 @@ END
 
 $AUTOMAKE || exit 1
 
-grep '^install:.* all' Makefile.in
+grep '^install[-a-z]*:.* all' Makefile.in