From: Tom Tromey <tromey@redhat.com>
Date: Sun, 27 Apr 1997 23:18:44 +0000 (+0000)
Subject: makefile regeneration fixes
X-Git-Tag: pre-ian-conditionals~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5458d5bf760c6a312f7e081129f64b50a08f7f51;p=thirdparty%2Fautomake.git

makefile regeneration fixes
---

diff --git a/ChangeLog b/ChangeLog
index 405f36f73..50c311c93 100644
--- 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 edc374167..b4e0ebf74 100644
--- 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 67790f6a4..078cc274e 100755
--- 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 184071b62..0d4d842cc 100644
--- 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