remake bug fix (for broken makes)

diff --git a/ChangeLog b/ChangeLog
index 3b708dba91145b7518df4a0efae82f3e81ebea3e..765a4b6b012de764a1cd6a8b051c3baa1fda65e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Oct  6 00:43:01 1996  Tom Tromey  <tromey@cygnus.com>
+
+       * remake.am (Makefile): Depend on $(srcdir)/Makefile.in, to work
+       around broken makes.  From David A. Swierczek.
+       * remake-subd.am (Makefile): Ditto.
+
 Sat Oct  5 11:29:48 1996  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (generate_makefile): Put BUILT_SOURCES onto @all if

diff --git a/Makefile.in b/Makefile.in
index 55afae3253d656929a3354d53218eb623e8d33d2..3af4f40e1f7e047a4f6c1126c584e01b4b94b911 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -105,7 +105,7 @@ $(srcdir)/Makefile.in: Makefile.am configure.in
 
 # For an explanation of the following Makefile rules, see node
 # `Automatic Remaking' in GNU Autoconf documentation.
-Makefile: Makefile.in config.status
+Makefile: $(srcdir)/Makefile.in config.status
        CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
 config.status: configure
        ./config.status --recheck

diff --git a/m4/Makefile.in b/m4/Makefile.in
index bd5ee21ea3620cd729ca640d47c3e1c5884bfd6e..899050635b7c05c8993fc3ec4b5a3fb2e76b3ea7 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -69,7 +69,7 @@ default: all
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in
        cd $(top_srcdir) && automake $(subdir)/Makefile
 
-Makefile: $(top_builddir)/config.status Makefile.in
+Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in
        cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
 
 install-m4dataDATA: $(m4data_DATA)
@@ -102,7 +102,7 @@ distdir: $(DEP_DISTFILES)
        done
 info:
 dvi:
-check:
+check: all
 installcheck:
 install-exec: 
        $(NORMAL_INSTALL)

diff --git a/remake-subd.am b/remake-subd.am
index 9cedcd063cf73b42ed5f615f54cf92cab2df83ab..2f318d7e14caf45fa157671a43d99fdc5a261c27 100644 (file)
--- a/remake-subd.am
+++ b/remake-subd.am
@@ -18,5 +18,5 @@
 $(srcdir)/Makefile.in: @MAINT@Makefile.am $(top_srcdir)/configure.in
        cd $(top_srcdir) && automake $(subdir)/Makefile
 
-Makefile: $(top_builddir)/config.status Makefile.in
+Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in
        cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status

diff --git a/remake.am b/remake.am
index b1874763b22b9dca8706e732ec17ad7c7ac91b0b..2a5ba0fd9c0f34394724e97f733ad76f4c9d3eaf 100644 (file)
--- a/remake.am
+++ b/remake.am
@@ -20,7 +20,7 @@ $(srcdir)/Makefile.in: @MAINT@Makefile.am configure.in
 
 # For an explanation of the following Makefile rules, see node
 # `Automatic Remaking' in GNU Autoconf documentation.
-Makefile: Makefile.in config.status
+Makefile: $(srcdir)/Makefile.in config.status
        CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
 config.status: configure
        ./config.status --recheck

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 7c67f562bd4f637612a99a240f43ec7cabaf397e..7fd0ca0545723ccd680a93be20023606a9d6a4ea 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -77,7 +77,7 @@ default: all
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in
        cd $(top_srcdir) && automake $(subdir)/Makefile
 
-Makefile: $(top_builddir)/config.status Makefile.in
+Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in
        cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
 tags: TAGS
 TAGS:
@@ -115,7 +115,7 @@ check-TESTS: $(TESTS)
        fi
 info:
 dvi:
-check: check-TESTS
+check: all check-TESTS
 installcheck:
 install-exec: 
        $(NORMAL_INSTALL)