From: Tom Tromey Date: Sun, 6 Oct 1996 06:44:05 +0000 (+0000) Subject: remake bug fix (for broken makes) X-Git-Tag: Release-1-1f~5 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=f663d540abb49874912c0e02eb7f7df4a11a9a2a;p=automake.git remake bug fix (for broken makes) --- diff --git a/ChangeLog b/ChangeLog index 3b708dba..765a4b6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Oct 6 00:43:01 1996 Tom Tromey + + * 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 * automake.in (generate_makefile): Put BUILT_SOURCES onto @all if diff --git a/Makefile.in b/Makefile.in index 55afae32..3af4f40e 100644 --- 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 bd5ee21e..89905063 100644 --- 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 9cedcd06..2f318d7e 100644 --- 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 b1874763..2a5ba0fd 100644 --- 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 7c67f562..7fd0ca05 100644 --- 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)