-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[Adding automake-patches; other lists can be dropped in replies.]
> > According to H.Merijn Brand on 10/18/2007 1:43 AM:
> > >
> > > Please convince the GNU world to add 'make test' as alias for
> > > 'make check'.
> >
> > It won't work for coreutils, where test is the name of a built program.
> > That's why the GNU Coding Standards mandate 'make check', but mention
> > nothing about 'make test'. However, patches to automake are welcome.
>
> like attached?
>
> --
> H.Merijn Brand Amsterdam Perl Mongers (http://amsterdam.pm.org/)
Do you have copyright assignment for automake? By the time you fix this
patch to add documentation, it might not be trivial any longer.
> @@ -563,7 +563,7 @@ documentation targets, and that the `che
> # Then, define the other targets needed by Automake Makefiles.
> .PHONY: dvi pdf ps info html check
> dvi pdf ps info html:
> - check: test
> + test check: test
That looks like a circular dependency to me. And you need to make sure
that automake still works for coreutils, which builds a test utility.
- --
Don't work too hard, make some time for fun as well!
Eric Blake [EMAIL PROTECTED]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFHF1Nh84KuGfSFAYARAoBPAJ9U9ae+ySLxcD5F2LPVUk5HUue/qgCgxFro
iSP32DS/OGlq+1O4AEBAzMY=
=Eb7/
-----END PGP SIGNATURE-----
diff -pur automake-1.10/automake.in automake-1.10_01/automake.in
--- automake-1.10/automake.in 2006-10-15 18:19:37 +0200
+++ automake-1.10_01/automake.in 2007-10-18 14:21:43 +0200
@@ -4400,7 +4400,7 @@ sub do_check_merge_target ()
depend '.PHONY', 'check', 'check-am';
# Handle recursion. We have to honor BUILT_SOURCES like for `all:'.
- $output_rules .= ("check: "
+ $output_rules .= ("test check: "
. (var ('BUILT_SOURCES')
? "\$(BUILT_SOURCES)\n\t\$(MAKE) \$(AM_MAKEFLAGS) "
: '')
diff -pur automake-1.10/doc/Makefile.in automake-1.10_01/doc/Makefile.in
--- automake-1.10/doc/Makefile.in 2006-10-15 19:25:24 +0200
+++ automake-1.10_01/doc/Makefile.in 2007-10-18 14:21:49 +0200
@@ -477,7 +477,7 @@ distdir: $(DISTFILES)
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-info
check-am: all-am
-check: check-am
+test check: check-am
all-am: Makefile $(INFO_DEPS) $(DATA)
installdirs:
for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(docdir)"; do \
diff -pur automake-1.10/doc/automake.info-2 automake-1.10_01/doc/automake.info-2
--- automake-1.10/doc/automake.info-2 2006-10-15 19:41:52 +0200
+++ automake-1.10_01/doc/automake.info-2 2007-10-18 14:22:24 +0200
@@ -563,7 +563,7 @@ documentation targets, and that the `che
# Then, define the other targets needed by Automake Makefiles.
.PHONY: dvi pdf ps info html check
dvi pdf ps info html:
- check: test
+ test check: test
A similar idea that does not use `include' is to write a proxy
`Makefile' that dispatches rules to the real `Makefile', either with
diff -pur automake-1.10/doc/automake.texi automake-1.10_01/doc/automake.texi
--- automake-1.10/doc/automake.texi 2006-10-15 19:41:24 +0200
+++ automake-1.10_01/doc/automake.texi 2007-10-18 14:22:02 +0200
@@ -9362,7 +9362,7 @@ include Makefile
# Then, define the other targets needed by Automake Makefiles.
.PHONY: dvi pdf ps info html check
dvi pdf ps info html:
-check: test
+test check: test
@end example
@cindex Proxy @file{Makefile} for third-party packages
diff -pur automake-1.10/lib/Automake/Makefile.in automake-1.10_01/lib/Automake/Makefile.in
--- automake-1.10/lib/Automake/Makefile.in 2006-10-15 19:25:24 +0200
+++ automake-1.10_01/lib/Automake/Makefile.in 2007-10-18 14:22:33 +0200
@@ -435,7 +435,7 @@ distdir: $(DISTFILES)
fi; \
done
check-am: all-am
-check: check-recursive
+test check: check-recursive
all-am: Makefile $(DATA)
installdirs: installdirs-recursive
installdirs-am:
diff -pur automake-1.10/lib/Automake/tests/Makefile.in automake-1.10_01/lib/Automake/tests/Makefile.in
--- automake-1.10/lib/Automake/tests/Makefile.in 2006-10-15 19:25:24 +0200
+++ automake-1.10_01/lib/Automake/tests/Makefile.in 2007-10-18 14:22:37 +0200
@@ -280,7 +280,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
+test check: check-am
all-am: Makefile
installdirs:
install: install-am
diff -pur automake-1.10/lib/Makefile.in automake-1.10_01/lib/Makefile.in
--- automake-1.10/lib/Makefile.in 2006-10-15 19:25:25 +0200
+++ automake-1.10_01/lib/Makefile.in 2007-10-18 14:22:30 +0200
@@ -411,7 +411,7 @@ distdir: $(DISTFILES)
fi; \
done
check-am: all-am
-check: check-recursive
+test check: check-recursive
all-am: Makefile $(DATA)
installdirs: installdirs-recursive
installdirs-am:
diff -pur automake-1.10/lib/am/Makefile.in automake-1.10_01/lib/am/Makefile.in
--- automake-1.10/lib/am/Makefile.in 2006-10-15 19:25:24 +0200
+++ automake-1.10_01/lib/am/Makefile.in 2007-10-18 14:22:40 +0200
@@ -268,7 +268,7 @@ distdir: $(DISTFILES)
fi; \
done
check-am: all-am
-check: check-am
+test check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(amdir)"; do \
diff -pur automake-1.10/m4/Makefile.in automake-1.10_01/m4/Makefile.in
--- automake-1.10/m4/Makefile.in 2006-10-15 19:25:24 +0200
+++ automake-1.10_01/m4/Makefile.in 2007-10-18 14:22:45 +0200
@@ -264,7 +264,7 @@ distdir: $(DISTFILES)
fi; \
done
check-am: all-am
-check: check-am
+test check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(m4datadir)"; do \
