From 1d9a04215b185b8d758cab2c5c7ea5e9f2a35b49 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 27 Apr 1997 23:48:14 +0000 Subject: [PATCH] remake bugs reported by Phil Nelson --- ChangeLog | 9 +++++++++ THANKS | 1 + automake.in | 2 +- lib/am/remake-hdr.am | 8 +++++--- remake-hdr.am | 8 +++++--- remake.am | 9 ++++++--- 6 files changed, 27 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50c311c93..5418d7dbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ Sun Apr 27 11:03:36 1997 Tom Tromey + * remake.am (config.status): Look in srcdir for config header. + ($(srcdir)/configure): Likewise. + * remake-hdr.am (@STAMP@): Look in srcdir for config header. From + Phil Nelson. + ($(srcdir)/@CONFIG_HEADER_IN@): Likewise. + + * automake.in (handle_aclocal_m4): Make target $(ACLOCAL_M4), not + value spelled out. From Phil Nelson + * automake.in (handle_configure): Don't skip Makefiles; instead skip automake inputs. (handle_merge_targets): Changed interface; put $makefile at diff --git a/THANKS b/THANKS index 9e8c07416..9f6086b93 100644 --- a/THANKS +++ b/THANKS @@ -36,6 +36,7 @@ Michael Brantley Noah Friedman Nyul Laszlo Per Bothner +Phil Nelson Ralph Schleicher Ramón García Fernández Steve M. Robbins diff --git a/automake.in b/automake.in index c4bcc4321..47c56f147 100755 --- a/automake.in +++ b/automake.in @@ -2724,7 +2724,7 @@ sub handle_aclocal_m4 } } - &pretty_print_rule ("\$(srcdir)/aclocal.m4:", "\t\t", @ac_deps); + &pretty_print_rule ("\$(ACLOCAL_M4):", "\t\t", @ac_deps); $output_rules .= ("\t" . 'cd $(srcdir) && $(ACLOCAL)' diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am index 5088e82ec..5e17541d9 100644 --- a/lib/am/remake-hdr.am +++ b/lib/am/remake-hdr.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -16,12 +16,14 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. @CONFIG_HEADER@: @STAMP@ -@STAMP@: @CONFIG_HEADER_IN@ $(top_builddir)/config.status +## Explicitly look in srcdir for benefit of non-GNU makes. +@STAMP@: $(srcdir)/@CONFIG_HEADER_IN@ $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES= CONFIG_HEADERS=@CONFIG_HEADER_FULL@ \ $(SHELL) ./config.status @echo timestamp > @STAMP@ -$(srcdir)/@CONFIG_HEADER_IN@: @MAINT@@STAMP@.in +## Explicitly look in srcdir for benefit of non-GNU makes. +$(srcdir)/@CONFIG_HEADER_IN@: @MAINT@$(srcdir)/@STAMP@.in $(srcdir)/@STAMP@.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) @FILES@ cd $(top_srcdir) && $(AUTOHEADER) echo timestamp > $(srcdir)/@STAMP@.in diff --git a/remake-hdr.am b/remake-hdr.am index 5088e82ec..5e17541d9 100644 --- a/remake-hdr.am +++ b/remake-hdr.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -16,12 +16,14 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. @CONFIG_HEADER@: @STAMP@ -@STAMP@: @CONFIG_HEADER_IN@ $(top_builddir)/config.status +## Explicitly look in srcdir for benefit of non-GNU makes. +@STAMP@: $(srcdir)/@CONFIG_HEADER_IN@ $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES= CONFIG_HEADERS=@CONFIG_HEADER_FULL@ \ $(SHELL) ./config.status @echo timestamp > @STAMP@ -$(srcdir)/@CONFIG_HEADER_IN@: @MAINT@@STAMP@.in +## Explicitly look in srcdir for benefit of non-GNU makes. +$(srcdir)/@CONFIG_HEADER_IN@: @MAINT@$(srcdir)/@STAMP@.in $(srcdir)/@STAMP@.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) @FILES@ cd $(top_srcdir) && $(AUTOHEADER) echo timestamp > $(srcdir)/@STAMP@.in diff --git a/remake.am b/remake.am index 81b2d3320..4c640f51d 100644 --- a/remake.am +++ b/remake.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. +## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -15,7 +15,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -config.status: configure + +## Explicitly look in srcdir for benefit of non-GNU makes. +config.status: $(srcdir)/configure $(SHELL) ./config.status --recheck -$(srcdir)/configure: @MAINT@configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +## Explicitly look in srcdir for benefit of non-GNU makes. +$(srcdir)/configure: @MAINT@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) -- 2.11.4.GIT