makefile regeneration fixes

diff --git a/ChangeLog b/ChangeLog
index 405f36f7383bc08098d494937ac9ca0ccb90efea..50c311c9351f7d78ac83056ab48e19aa54b8dea9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 Sun Apr 27 11:03:36 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_configure): Don't skip Makefiles; instead
+       skip automake inputs.
+       (handle_merge_targets): Changed interface; put $makefile at
+       beginning of @all (rather than Makefile at end).
+
        * automake.in (handle_yacc_lex_cxx): Correctly compute
        de_ansi_sources.
 

diff --git a/Makefile.in b/Makefile.in
index edc374167add46602d2ed35a4b74273f713ddf38..b4e0ebf74fabe88a6a8f0f4931005c60c2643da5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -110,7 +110,7 @@ GZIP = --best
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .texi .texinfo .info .dvi .ps
+.SUFFIXES: .dvi .info .ps .texi .texinfo
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnits Makefile
 
@@ -411,7 +411,7 @@ dvi: $(DVIS) dvi-recursive
 check: all-am
        $(MAKE) check-recursive
 installcheck: installcheck-recursive installcheck-local
-all-am: $(INFO_DEPS) $(SCRIPTS) $(DATA) Makefile
+all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(DATA)
 
 install-exec-am: install-binSCRIPTS
 

diff --git a/automake.in b/automake.in
index 67790f6a44017e30ca1afed69d8866112e1dcdcf..078cc274e0fdf31b77b11ab4b9b3f9a7cfd83d76 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -548,7 +548,7 @@ sub generate_makefile
     &handle_dependencies;
     &handle_tests;
     &handle_footer;
-    &handle_merge_targets;
+    &handle_merge_targets ($makefile);
     &handle_installdirs;
     &handle_clean;
     &handle_phony;
@@ -2969,10 +2969,10 @@ sub handle_configure
        # Skip files not in this directory.
        next unless &dirname ($file) eq $relative_dir;
 
-       # Skip any Makefile.
-       next if $local eq 'Makefile';
+       # Skip any file that is an automake input.
+       next if -f $file . '.am';
 
-       # Some users might be tempted to put `stamp-h' in the
+       # Some users have been tempted to put `stamp-h' in the
        # AC_OUTPUT line.  This won't do the right thing, so we
        # explicitly fail here.
        if ($local eq 'stamp-h')
@@ -3144,6 +3144,8 @@ sub handle_installdirs
 # avoid double colon rules, otherwise we'd use them instead.
 sub handle_merge_targets
 {
+    local ($makefile) = @_;
+
     # There are a few install-related variables that you should not define.
     local ($var);
     foreach $var ('PRE_INSTALL', 'POST_INSTALL', 'NORMAL_INSTALL')
@@ -3154,7 +3156,10 @@ sub handle_merge_targets
        }
     }
 
-    push (@all, 'Makefile');
+    # Put this at the beginning for the sake of non-GNU makes.  This
+    # is still wrong if these makes can run parallel jobs.  But it is
+    # right enough.
+    unshift (@all, &basename ($makefile));
 
     local ($one_name);
     foreach $one_name (@config_names)

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 184071b6289942f9e2d351943c9ae3909efcb9a7..0d4d842cca03a67bb7ce53df823a84c9f20f9dab 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -138,7 +138,7 @@ install: install-exec install-data all
 
 uninstall: uninstall-m4dataDATA
 
-all: $(DATA) Makefile
+all: Makefile $(DATA)
 
 install-strip:
        $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install