minor fixes

diff --git a/ChangeLog b/ChangeLog
index f081032..f8c112d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 Wed Dec  4 00:41:23 1996  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_merge_targets): Use all-recursive-am instead
+       of all-recursive-hack.  The latter is ugly, according to Joel
+       Weber.
+
+       * automake.in (handle_emacs_lisp): Push $(ELCFILES) onto @all.
+
        * automake.in (do_one_clean_target): Allow -local version of clean
        targets.
 

diff --git a/TODO b/TODO
index 5decff5..70d895b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -6,6 +6,9 @@ Priorities for release:
 * `missing' program
 * copyrights on m4 files, aclocal output
 
+* automake must scan aclocal.m4
+  this means Makefile.in must depend on aclocal.m4 as well
+
 * for new autoconf:
   * completely handle multi-":" mode for AC_CONFIG_HEADER
   * Scan multiple input files when Makefile is generated?

diff --git a/automake.in b/automake.in
index b6ba814..619219f 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2642,11 +2642,11 @@ sub handle_merge_targets
                # dependencies to the "all" because that breaks when
                # using parallel makes.  Instead we handle things
                # explicitly.
-               $output_rules .= ('all-recursive-hack: $(CONFIG_HEADER)'
+               $output_rules .= ('all-recursive-am: $(CONFIG_HEADER)'
                                  . "\n\t" . '$(MAKE) all-recursive'
                                  . "\n\n");
-               push (@hackall, 'all-recursive-hack');
-               push (@phony, 'all-recursive-hack');
+               push (@hackall, 'all-recursive-am');
+               push (@phony, 'all-recursive-am');
            }
            else
            {
@@ -3034,6 +3034,8 @@ sub handle_emacs_lisp
        push (@clean, 'lisp');
        &push_phony_cleaners ('lisp');
 
+       push (@all, '$(ELCFILES)');
+
        local ($varname);
        if (&variable_defined ('lisp_LISP'))
        {