From 2ca2adc218a797ead3c942ff593a7d7463d6086e Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 26 Feb 2001 10:34:05 +0000 Subject: [PATCH] * automake.in (&target_cmp, &dist_cmp): Do not prototype comparing routines, otherwise the elements to compare are passed in @_ instead of $a and $b. --- ChangeLog | 6 +++++ Makefile.in | 68 +++++++++++++++++++++++------------------------ automake.in | 4 +-- m4/Makefile.in | 36 +++++++++++++------------ tests/Makefile.in | 32 +++++++++++----------- 5 files changed, 78 insertions(+), 68 deletions(-) diff --git a/ChangeLog b/ChangeLog index 767753e5..c23866b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-02-26 Akim Demaille + + * automake.in (&target_cmp, &dist_cmp): Do not prototype comparing + routines, otherwise the elements to compare are passed in @_ + instead of $a and $b. + 2001-02-26 Akim Demaille * automake.in (%required_targets): `installcheck-am' is needed. diff --git a/Makefile.in b/Makefile.in index 3f12b648..c923b538 100644 --- a/Makefile.in +++ b/Makefile.in @@ -129,12 +129,12 @@ DVIS = automake.dvi TEXINFOS = automake.texi DATA = $(dist_pkgdata_DATA) $(dist_script_DATA) -DIST_COMMON = mkinstalldirs automake.in install-sh version.texi \ -aclocal.m4 README-alpha ansi2knr.c Makefile.am mdate-sh NEWS COPYING \ -stamp-vti ansi2knr.1 AUTHORS compile Makefile.in configure.in README \ -depcomp THANKS configure ylwrap elisp-comp py-compile ChangeLog missing \ -config.sub texinfo.tex INSTALL $(dist_script_DATA) aclocal.in \ -config.guess TODO $(dist_pkgdata_DATA) +DIST_COMMON = README $(dist_pkgdata_DATA) $(dist_script_DATA) AUTHORS \ +COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS README-alpha \ +THANKS TODO aclocal.in aclocal.m4 ansi2knr.1 ansi2knr.c automake.in \ +compile config.guess config.sub configure configure.in depcomp \ +elisp-comp install-sh mdate-sh missing mkinstalldirs py-compile \ +stamp-vti texinfo.tex version.texi ylwrap DIST_SUBDIRS = $(SUBDIRS) all: all-recursive @@ -531,9 +531,37 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -rm -f Makefile.in +clean: clean-recursive + +clean-am: clean-generic mostlyclean-am + +dist-all: dist + +distclean: distclean-recursive + -rm -f config.status + +distclean-am: clean-am distclean-generic distclean-tags + +install-data-am: install-dist_pkgdataDATA install-dist_scriptDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + +install-exec-am: install-binSCRIPTS + +install-man: + +installcheck-am: installcheck-local + +maintainer-clean: maintainer-clean-recursive + -rm -f config.status + maintainer-clean-am: distclean-am maintainer-clean-aminfo \ maintainer-clean-generic maintainer-clean-vti +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-aminfo mostlyclean-generic mostlyclean-vti + uninstall-am: uninstall-binSCRIPTS uninstall-dist_pkgdataDATA \ uninstall-dist_scriptDATA uninstall-info @@ -555,34 +583,6 @@ uninstall-am: uninstall-binSCRIPTS uninstall-dist_pkgdataDATA \ uninstall-dist_pkgdataDATA uninstall-dist_scriptDATA \ uninstall-info uninstall-recursive -install-man: - -distclean: distclean-recursive - -rm -f config.status - -clean-am: clean-generic mostlyclean-am - -install-exec-am: install-binSCRIPTS - -install-data-am: install-dist_pkgdataDATA install-dist_scriptDATA - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook - -distclean-am: clean-am distclean-generic distclean-tags - -dist-all: dist - -maintainer-clean: maintainer-clean-recursive - -rm -f config.status - -mostlyclean-am: mostlyclean-aminfo mostlyclean-generic mostlyclean-vti - -mostlyclean: mostlyclean-recursive - -clean: clean-recursive - -installcheck-am: installcheck-local - install-data-hook: @$(POST_INSTALL) diff --git a/automake.in b/automake.in index 7f317dfe..1bb1f705 100755 --- a/automake.in +++ b/automake.in @@ -2528,7 +2528,7 @@ sub handle_multilib # Usenet-compliant shar file (in these, README must be first). # # FIXME: do more ordering of files here. -sub dist_cmp ($$) +sub dist_cmp { return 0 if $a eq $b; @@ -3687,7 +3687,7 @@ sub depend # &target_cmp ($A, $B) # -------------------- # Subroutine for &handle_factored_dependencies to let `.PHONY' be last. -sub target_cmp ($$) +sub target_cmp { return 0 if $a eq $b; diff --git a/m4/Makefile.in b/m4/Makefile.in index 89529f20..f51de231 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -180,37 +180,39 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -rm -f Makefile.in -maintainer-clean-am: distclean-am maintainer-clean-generic - -uninstall-am: uninstall-m4dataDATA - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-m4dataDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - uninstall uninstall-am uninstall-m4dataDATA +clean: clean-am -install-man: +clean-am: clean-generic mostlyclean-am distclean: distclean-am -clean-am: clean-generic mostlyclean-am +distclean-am: clean-am distclean-generic + +install-data-am: install-m4dataDATA install-exec-am: -install-data-am: install-m4dataDATA +install-man: -distclean-am: clean-am distclean-generic +installcheck-am: maintainer-clean: maintainer-clean-am -mostlyclean-am: mostlyclean-generic +maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am -clean: clean-am +mostlyclean-am: mostlyclean-generic + +uninstall-am: uninstall-m4dataDATA + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-m4dataDATA install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + uninstall uninstall-am uninstall-m4dataDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/Makefile.in b/tests/Makefile.in index 2e1eb4fa..42f4c867 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -484,35 +484,37 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -rm -f Makefile.in -maintainer-clean-am: distclean-am maintainer-clean-generic - -.PHONY: all all-am check check-TESTS check-am clean clean-generic \ - distclean distclean-generic distclean-local distdir dvi dvi-am \ - info info-am install install-am install-data install-data-am \ - install-exec install-exec-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - uninstall uninstall-am +clean: clean-am -install-man: +clean-am: clean-generic mostlyclean-am distclean: distclean-am -clean-am: clean-generic mostlyclean-am +distclean-am: clean-am distclean-generic distclean-local + +install-data-am: install-exec-am: -install-data-am: +install-man: -distclean-am: clean-am distclean-generic distclean-local +installcheck-am: maintainer-clean: maintainer-clean-am -mostlyclean-am: mostlyclean-generic +maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am -clean: clean-am +mostlyclean-am: mostlyclean-generic + +.PHONY: all all-am check check-TESTS check-am clean clean-generic \ + distclean distclean-generic distclean-local distdir dvi dvi-am \ + info info-am install install-am install-data install-data-am \ + install-exec install-exec-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + uninstall uninstall-am distclean-local: -- 2.43.5