1999-01-10 Tom Tromey <tromey@cygnus.com>

	* remake-hdr.am: Provide `else' clause for each `if'.
1999-01-10  Alexandre Oliva  <oliva@dcc.unicamp.br>
	* remake-hdr.am: recover from removal of config headers, and try
	to get real timestamps, which is useful for CVS files

diff --git a/ChangeLog b/ChangeLog
index 3dd773ab2004ca869e7a80b6afffc49f980117a4..1d679a3cb670273cb2ce57f6d603141088944412 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-01-10  Tom Tromey  <tromey@cygnus.com>
+
+       * remake-hdr.am: Provide `else' clause for each `if'.
+
+1999-01-10  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * remake-hdr.am: recover from removal of config headers, and try
+       to get real timestamps, which is useful for CVS files
+
 1999-01-10  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (handle_merge_targets): Don't special-case "-local"

diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index 9161aea18cd37893407c76de249d903cec8bf638..d6a144e6b6ec422c9aec2393b1a2f7ff6586aebd 100644 (file)
--- 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, 1997, 1998 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999 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,16 +16,28 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 @CONFIG_HEADER@: @STAMP@
-## Rules without a rule work funny.  So supply a dummy rule.
-       @:
+## Recover from removal of CONFIG_HEADER
+       @if test ! -f $@; then \
+               rm -f @STAMP@; \
+               $(MAKE) @STAMP@; \
+       else :; fi
 ## 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@
+## Try to get a real timestamp; this is useful for CVS
+       @(date || ls -l @CONFIG_HEADER@ || echo timestamp) \
+               > @STAMP@ 2> /dev/null
 ## Explicitly look in srcdir for benefit of non-GNU makes.
 $(srcdir)/@CONFIG_HEADER_IN@: @MAINTAINER_MODE_TRUE@$(srcdir)/@STAMP@.in
+## Recover from removal of CONFIG_HEADER_IN
+       @if test ! -f $@; then \
+               rm -f $(srcdir)/@STAMP@.in; \
+               $(MAKE) $(srcdir)/@STAMP@.in; \
+       else :; fi
 $(srcdir)/@STAMP@.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) @FILES@
        cd $(top_srcdir) && $(AUTOHEADER)
-       @echo timestamp > $(srcdir)/@STAMP@.in
+## Try to get a real timestamp; this is useful for CVS
+       @(date || ls -l $(srcdir)/@CONFIG_HEADER_IN@ || echo timestamp) \
+               > $(srcdir)/@STAMP@.in 2> /dev/null

diff --git a/remake-hdr.am b/remake-hdr.am
index 9161aea18cd37893407c76de249d903cec8bf638..d6a144e6b6ec422c9aec2393b1a2f7ff6586aebd 100644 (file)
--- a/remake-hdr.am
+++ b/remake-hdr.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999 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,16 +16,28 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 @CONFIG_HEADER@: @STAMP@
-## Rules without a rule work funny.  So supply a dummy rule.
-       @:
+## Recover from removal of CONFIG_HEADER
+       @if test ! -f $@; then \
+               rm -f @STAMP@; \
+               $(MAKE) @STAMP@; \
+       else :; fi
 ## 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@
+## Try to get a real timestamp; this is useful for CVS
+       @(date || ls -l @CONFIG_HEADER@ || echo timestamp) \
+               > @STAMP@ 2> /dev/null
 ## Explicitly look in srcdir for benefit of non-GNU makes.
 $(srcdir)/@CONFIG_HEADER_IN@: @MAINTAINER_MODE_TRUE@$(srcdir)/@STAMP@.in
+## Recover from removal of CONFIG_HEADER_IN
+       @if test ! -f $@; then \
+               rm -f $(srcdir)/@STAMP@.in; \
+               $(MAKE) $(srcdir)/@STAMP@.in; \
+       else :; fi
 $(srcdir)/@STAMP@.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) @FILES@
        cd $(top_srcdir) && $(AUTOHEADER)
-       @echo timestamp > $(srcdir)/@STAMP@.in
+## Try to get a real timestamp; this is useful for CVS
+       @(date || ls -l $(srcdir)/@CONFIG_HEADER_IN@ || echo timestamp) \
+               > $(srcdir)/@STAMP@.in 2> /dev/null