Only (re)build configure, config.in and cstamp-h.in in maintainer mode.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44577 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 242a2a4..d600c1e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-02  Nick Clifton  <nickc@cambridge.redhat.com>
+
+       * Makefile.in ($(srcdir)/configure): Only rebuild in
+       maintainer mode.
+       ($(srcdir)/config.in): Only define in maintainer mode.
+       ($(srcdir)/cstamp-h.in): Only define in maintainer mode.
+
 2001-08-02  David Edelsohn  <edelsohn@gnu.org>
 
        * doc/install.texi (Install GCC: Binaries): Update Bull info.

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 60823ee..12bd0b3 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -880,7 +880,12 @@ cs-tm_p.h: Makefile
        HEADERS="$(tm_p_file)" DEFINES="" TARGET_CPU_DEFAULT="" \
        $(SHELL) $(srcdir)/mkconfig.sh tm_p.h
 
-$(srcdir)/configure: $(srcdir)/configure.in
+# Don't automatically run autoconf, since configure.in might be accidentally
+# newer than configure.  Also, this writes into the source directory which
+# might be on a read-only file system.  If configured for maintainer mode
+# then do allow autoconf to be run.
+
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in
        (cd $(srcdir) && autoconf)
 
 gccbug:        $(srcdir)/gccbug.in
@@ -898,11 +903,14 @@ mklibgcc: $(srcdir)/mklibgcc.in
 # "echo timestamp" is used instead of touch to be consistent with other
 # packages that use autoconf (??? perhaps also to avoid problems with patch?).
 # ??? Newer versions have a maintainer mode that may be useful here.
-$(srcdir)/config.in: $(srcdir)/cstamp-h.in
-$(srcdir)/cstamp-h.in: $(srcdir)/configure.in $(srcdir)/acconfig.h
-       (cd $(srcdir) && autoheader)
-       @rm -f $(srcdir)/cstamp-h.in
-       echo timestamp > $(srcdir)/cstamp-h.in
+
+# Don't run autoheader automatically either.
+# Only run it if maintainer mode is enabled.
+@MAINT@ $(srcdir)/config.in: $(srcdir)/cstamp-h.in
+@MAINT@ $(srcdir)/cstamp-h.in: $(srcdir)/configure.in $(srcdir)/acconfig.h
+@MAINT@        (cd $(srcdir) && autoheader)
+@MAINT@        @rm -f $(srcdir)/cstamp-h.in
+@MAINT@        echo timestamp > $(srcdir)/cstamp-h.in
 auto-host.h: cstamp-h ; @true
 cstamp-h: config.in config.status
        CONFIG_HEADERS=auto-host.h:config.in LANGUAGES="$(CONFIG_LANGUAGES)" $(SHELL) config.status