Re: 4.2.0-pre-2

[Wayne Davison <wayned@xxxxxxxxxxxxxxxxxxxxx>]

On Wed, Mar 03, 2004 at 10:53:21AM -0800, Wayne Davison wrote:
> I noticed that someone removed the stamp-h idiom from the Makefile
> recently.

I'm attaching a better patch for Makefile.in.  The old rules had
config.h and config.modules intertwined, and this one breaks them
apart so that config.h doesn't get rebuilt when it doesn't need
to be.

Q: Does "config.modules" need to depend on config.h.in?

..wayne..

--- Makefile.in	14 Feb 2004 18:50:16 -0000	1.12
+++ Makefile.in	3 Mar 2004 19:28:47 -0000
@@ -134,7 +134,11 @@ config.status: $(sdir)/configure
 $(sdir)/configure: $(sdir)/aclocal.m4 $(sdir)/aczsh.m4 $(sdir)/configure.ac
 	cd $(sdir) && autoconf
 
-config.h config.modules: $(sdir)/config.h.in config.status
+config.h: stamp-h
+stamp-h: $(sdir)/config.h.in config.status
+	cd $(dir_top) && $(SHELL) ./config.status config.h $@
+
+config.modules: $(sdir)/config.h.in config.status
 	cd $(dir_top) && $(SHELL) ./config.status $@
 
 $(sdir)/config.h.in: $(sdir)/stamp-h.in
--- configure.ac	1 Mar 2004 17:58:55 -0000	1.11
+++ configure.ac	3 Mar 2004 19:28:48 -0000
@@ -2379,6 +2379,7 @@ AC_SUBST_FILE(VERSION_MK)dnl
 AC_CONFIG_FILES(Config/defs.mk Makefile Doc/Makefile Etc/Makefile \
 Src/Makefile Test/Makefile)
 AC_CONFIG_COMMANDS([config.modules], [. ./config.modules.sh])
+AC_CONFIG_COMMANDS([stamp-h], [echo >stamp-h])
 
 AC_OUTPUT