AM_MAKEFLAGS patch from Ian

diff --git a/ChangeLog b/ChangeLog
index 550270f..6247466 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 17 11:58:27 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+       * automake.in: Use $(AM_MAKEFLAGS) in every invocation of $(MAKE).
+       * subdirs.am: Likewise.
+
 Thu Jul 16 18:09:03 1998  Ian Lance Taylor  <ian@cygnus.com>
 
        * remake.am (config.status): Depend upon

diff --git a/Makefile.in b/Makefile.in
index 16c3492..f7ed177 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -102,10 +102,10 @@ TEXINFOS = automake.texi
 DATA =  $(pkgdata_DATA)
 
 DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-Makefile.in NEWS THANKS TODO aclocal.in aclocal.m4 ansi2knr.1 \
-ansi2knr.c automake.in config.guess config.sub configure configure.in \
-elisp-comp install-sh mdate-sh missing mkinstalldirs stamp-vti \
-texinfo.tex version.texi ylwrap
+Makefile.in NEWS README-alpha THANKS TODO aclocal.in aclocal.m4 \
+ansi2knr.1 ansi2knr.c automake.in config.guess config.sub configure \
+configure.in elisp-comp install-sh mdate-sh missing mkinstalldirs \
+stamp-vti texinfo.tex version.texi ylwrap
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

diff --git a/NEWS b/NEWS
index b42e5fb..9bc76e0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 New in 1.3a:
 * Added `AM_FOOFLAGS' variable for each compiler invocation;
   e.g. AM_CFLAGS can be used in Makefile.am to set C compiler flags
+* Bug fixes
 \f
 New in 1.3:
 * Bug fixes

diff --git a/TODO b/TODO
index c43c241..67725eb 100644 (file)
--- a/TODO
+++ b/TODO
@@ -449,6 +449,7 @@ document how to use Automake with CVS.  Idea from Mark Galassi.  Also
 include Greg Woods' more sophisticated "cvs-dist" target.
 
 document rebuilding configure.  CONFIGURE_DEPENDENCIES
+CONFIG_STATUS_DEPENDENCIES
 
 -- must document all variables that are supposed
    to be public knowledge

diff --git a/automake.in b/automake.in
index 84c1602..0ebdd96 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -821,11 +821,13 @@ sub get_object_extension
            else
            {
                $output_rules .= ("\tcd " . &dirname ($options{'ansi2knr'})
-                                 . " && \$(MAKE) ansi2knr\n\n");
+                                 . " && \$(MAKE) \$(AM_MAKEFLAGS) "
+                                 . "ansi2knr\n\n");
                # This is required for non-GNU makes.
                $output_rules .= ($options{'ansi2knr'} . ".o:\n");
                $output_rules .= ("\tcd " . &dirname ($options{'ansi2knr'})
-                                 . " && \$(MAKE) ansi2knr.o\n\n");
+                                 . " && \$(MAKE) \$(AM_MAKEFLAGS) "
+                                 . "ansi2knr.o\n\n");
            }
 
            # Make sure ansi2knr can be found: if no path specified,
@@ -2282,12 +2284,12 @@ sub handle_man_pages
     # Generate list of install dirs.
     $output_rules .= ("install-man: \$(MANS)\n"
                      . "\t\@\$(NORMAL_INSTALL)\n");
-    &pretty_print_rule ("\t\$(MAKE)", "\t ", @namelist);
+    &pretty_print_rule ("\t\$(MAKE) \$(AM_MAKEFLAGS)", "\t ", @namelist);
     push (@phony, 'install-man');
 
     $output_rules .= "uninstall-man:\n\t\@\$(NORMAL_UNINSTALL)\n";
     grep ($_ = 'un' . $_, @namelist);
-    &pretty_print_rule ("\t\$(MAKE)", "\t ", @namelist);
+    &pretty_print_rule ("\t\$(MAKE) \$(AM_MAKEFLAGS)", "\t ", @namelist);
     push (@phony, 'uninstall-man');
 
     $output_vars .= &file_contents ('mans-vars');
@@ -2319,7 +2321,8 @@ sub handle_tags
                          . "\tlist=\'\$(SUBDIRS)\'; for subdir in \$\$list; do \\\n"
                          # Never fail here if a subdir fails; it
                          # isn't important.
-                         . "\t  (cd \$\$subdir && \$(MAKE) tags); \\\n"
+                         . "\t  (cd \$\$subdir"
+                         . " && \$(MAKE) \$(AM_MAKEFLAGS) tags); \\\n"
                          . "\tdone\n");
        push (@tag_deps, 'tags-recursive');
        push (@phony, 'tags-recursive');
@@ -2526,7 +2529,8 @@ sub handle_dist_worker
             . "\t" . '  || mkdir $(distdir)/$$subdir ' . "\\\n"
             . "\t" . '  || exit 1; ' . "\\\n"
             . "\t" . '  chmod 777 $(distdir)/$$subdir; ' . "\\\n"
-            . "\t" . '  (cd $$subdir && $(MAKE) top_distdir=../$('
+            . "\t" . '  (cd $$subdir'
+            . ' && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$('
             . (($relative_dir eq '.') ? 'distdir' : 'top_distdir')
             . ') distdir=../$(distdir)/$$subdir distdir) ' . "\\\n"
             . "\t" . '    || exit 1; ' . "\\\n"
@@ -2543,7 +2547,9 @@ sub handle_dist_worker
     {
        # We must explicitly set distdir and top_distdir for these
        # sub-makes.
-       $output_rules .= "\t\$(MAKE) top_distdir=\"\$(top_distdir)\" distdir=\"\$(distdir)\" $targ\n";
+       $output_rules .= ("\t\$(MAKE) \$(AM_MAKEFLAGS)"
+                         . " top_distdir=\"\$(top_distdir)\""
+                         . " distdir=\"\$(distdir)\" $targ\n");
     }
 
     push (@phony, 'distdir');
@@ -2644,7 +2650,8 @@ distcheck: dist
        mkdir $(distdir)/=inst
        dc_install_base=`cd $(distdir)/=inst && pwd`; \\'
                          . (defined $contents{'distcheck-hook'}
-                            ? "\t\$(MAKE) distcheck-hook"
+                            ? ("\t\$(MAKE) \$(AM_MAKEFLAGS)"
+                               . " distcheck-hook")
                             : '')
                          . '
        cd $(distdir)/=build \\
@@ -2652,12 +2659,12 @@ distcheck: dist
 
                          . ($seen_gettext ? '--with-included-gettext ' : '')
                          . '--srcdir=.. --prefix=$$dc_install_base \\
-         && $(MAKE) \\
-         && $(MAKE) dvi \\
-         && $(MAKE) check \\
-         && $(MAKE) install \\
-         && $(MAKE) installcheck \\
-         && $(MAKE) dist
+         && $(MAKE) $(AM_MAKEFLAGS) \\
+         && $(MAKE) $(AM_MAKEFLAGS) dvi \\
+         && $(MAKE) $(AM_MAKEFLAGS) check \\
+         && $(MAKE) $(AM_MAKEFLAGS) install \\
+         && $(MAKE) $(AM_MAKEFLAGS) installcheck \\
+         && $(MAKE) $(AM_MAKEFLAGS) dist
        -rm -rf $(distdir)
        @echo "========================"; \\
        echo "$(distdir).tar.gz is ready for distribution"; \\
@@ -3494,7 +3501,9 @@ sub handle_merge_targets
                # using parallel makes.  Instead we handle things
                # explicitly.
                $output_rules .= ("all-recursive-am: ${local_headers}"
-                                 . "\n\t" . '$(MAKE) all-recursive'
+                                 . "\n\t"
+                                 . '$(MAKE) $(AM_MAKEFLAGS)'
+                                 . " all-recursive"
                                  . "\n\n");
                push (@hackall, 'all-recursive-am');
                push (@phony, 'all-recursive-am');
@@ -3567,7 +3576,9 @@ sub handle_merge_targets
     $output_rules .= "\t\@\$(NORMAL_INSTALL)\n";
     if (defined $contents{'install-exec-hook'})
     {
-       $output_rules .= "\t" . '$(MAKE) install-exec-hook' . "\n";
+       $output_rules .= ("\t"
+                         . '$(MAKE) $(AM_MAKEFLAGS) install-exec-hook'
+                         . "\n");
     }
     $output_rules .= "\n";
     push (@install, 'install-exec') if !$recursive_install;
@@ -3579,7 +3590,9 @@ sub handle_merge_targets
     $output_rules .= "\t\@\$(NORMAL_INSTALL)\n";
     if (defined $contents{'install-data-hook'})
     {
-       $output_rules .= "\t" . '$(MAKE) install-data-hook' . "\n";
+       $output_rules .= ("\t"
+                         . '$(MAKE) $(AM_MAKEFLAGS) install-data-hook'
+                         . "\n");
     }
     $output_rules .= "\n";
     push (@install, 'install-data') if !$recursive_install;
@@ -3610,7 +3623,7 @@ sub handle_merge_targets
     # Generate the new 'install-strip' target.  Must set
     # INSTALL_SCRIPT to avoid stripping scripts.
     $output_rules .= ("install-strip:\n\t"
-                     . '$(MAKE) INSTALL_PROGRAM=\'$(INSTALL_PROGRAM) -s\' INSTALL_SCRIPT=\'$(INSTALL_PROGRAM)\' install'
+                     . '$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM=\'$(INSTALL_PROGRAM) -s\' INSTALL_SCRIPT=\'$(INSTALL_PROGRAM)\' install'
                      . "\n");
 }
 
@@ -3671,7 +3684,7 @@ sub do_check_merge_target
     # provide any real synchronization facilities?  The official
     # answer is that you can push the dependencies out to the leaves
     # of the dependency tree.  That seems fairly gross to me.
-    &pretty_print_rule ("\t\$(MAKE)", "\t  ", @check_tests)
+    &pretty_print_rule ("\t\$(MAKE) \$(AM_MAKEFLAGS)", "\t  ", @check_tests)
        if @check_tests;
 }
 

diff --git a/configure b/configure
index 2f90472..666ba5c 100755 (executable)
--- a/configure
+++ b/configure
@@ -688,7 +688,7 @@ fi
 
 PACKAGE=automake
 
-VERSION=1.3
+VERSION=1.3a
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }

diff --git a/configure.in b/configure.in
index 67d2261..7da7fd4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(automake.in)
 
-AM_INIT_AUTOMAKE(automake, 1.3)
+AM_INIT_AUTOMAKE(automake, 1.3a)
 
 # Find an appropriate tar for use in "dist" targets.  A "best guess"
 # is good enough -- if we can't find GNU tar, we don't really care.

diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am
index 5eb3057..3452df4 100644 (file)
--- a/lib/am/subdirs.am
+++ b/lib/am/subdirs.am
@@ -31,7 +31,7 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
        list='$(SUBDIRS)'; for subdir in $$list; do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
-         (cd $$subdir && $(MAKE) $$target) \
+         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target) \
 ## This trick allows "-k" to keep its natural meaning when running a
 ## recursive rule.
           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
@@ -52,7 +52,7 @@ maintainer-clean-recursive:
        for subdir in $$rev; do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
-         (cd $$subdir && $(MAKE) $$target) \
+         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target) \
 ## This trick allows "-k" to keep its natural meaning when running a
 ## recursive rule.
           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \

diff --git a/m4/Makefile.in b/m4/Makefile.in
index a883fc8..1f6990b 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -32,7 +32,7 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DESTDIR =
+DISTDIR =
 
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -135,6 +135,7 @@ distdir: $(DISTFILES)
 info:
 dvi:
 check: all
+       $(MAKE)
 installcheck:
 install-exec: 
        @$(NORMAL_INSTALL)
@@ -154,14 +155,19 @@ installdirs:
 
 
 mostlyclean-generic:
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
        -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-generic
 
 clean:  clean-generic mostlyclean

diff --git a/stamp-vti b/stamp-vti
index 0cc49d7..2fcbcb0 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,3 +1,3 @@
 @set UPDATED 23 June 1998
-@set EDITION 1.3
-@set VERSION 1.3
+@set EDITION 1.3a
+@set VERSION 1.3a

diff --git a/subdirs.am b/subdirs.am
index 5eb3057..3452df4 100644 (file)
--- a/subdirs.am
+++ b/subdirs.am
@@ -31,7 +31,7 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
        list='$(SUBDIRS)'; for subdir in $$list; do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
-         (cd $$subdir && $(MAKE) $$target) \
+         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target) \
 ## This trick allows "-k" to keep its natural meaning when running a
 ## recursive rule.
           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
@@ -52,7 +52,7 @@ maintainer-clean-recursive:
        for subdir in $$rev; do \
          target=`echo $@ | sed s/-recursive//`; \
          echo "Making $$target in $$subdir"; \
-         (cd $$subdir && $(MAKE) $$target) \
+         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target) \
 ## This trick allows "-k" to keep its natural meaning when running a
 ## recursive rule.
           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 4d3650d..c77eb9a 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -32,7 +32,7 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DESTDIR =
+DISTDIR =
 
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -182,14 +182,19 @@ installdirs:
 
 
 mostlyclean-generic:
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+       -rm -f Makefile $(DISTCLEANFILES)
        -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-generic
 
 clean:  clean-generic mostlyclean

diff --git a/version.texi b/version.texi
index 0cc49d7..2fcbcb0 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
 @set UPDATED 23 June 1998
-@set EDITION 1.3
-@set VERSION 1.3
+@set EDITION 1.3a
+@set VERSION 1.3a