aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Nerode <neroden@gcc.gnu.org>2003-03-14 20:44:37 +0000
committerNathanael Nerode <neroden@gcc.gnu.org>2003-03-14 20:44:37 +0000
commit93c834b7d7565fb18a31a3613cdc87193d3f18b7 (patch)
tree3f2aee62b96507f3ddd56e57d8e9c98f991cc913
parentcd648cec5c78e596fc86e570f243dac6752ad764 (diff)
downloadgcc-93c834b7d7565fb18a31a3613cdc87193d3f18b7.zip
gcc-93c834b7d7565fb18a31a3613cdc87193d3f18b7.tar.gz
gcc-93c834b7d7565fb18a31a3613cdc87193d3f18b7.tar.bz2
Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES back down.
* Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES back down. * Makefile.in: Regenerate. From-SVN: r64370
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in12
-rw-r--r--Makefile.tpl12
3 files changed, 21 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index a554480..322de53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-14 Nathanael Nerode <neroden@gcc.gnu.org>
+
+ * Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES back down.
+ * Makefile.in: Regenerate.
+
2003-03-14 Michael Chastain <mec@shout.net>
* Makefile.in: Regenerate with correct Makefile.def.
diff --git a/Makefile.in b/Makefile.in
index c40fd81..f70250d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,10 +20,6 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# Don't pass command-line variables to submakes.
-.NOEXPORT:
-MAKEOVERRIDES=
-
# -------------------------------
# Standard Autoconf-set variables
# -------------------------------
@@ -7529,10 +7525,18 @@ AUTOCONF = autoconf
$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
cd $(srcdir) && $(AUTOCONF)
+# ------------------------------
+# Special directives to GNU Make
+# ------------------------------
+
# Tell GNU make 3.79 not to run the top level in parallel. This
# prevents contention for $builddir/$target/config.cache, as well
# as minimizing scatter in file system caches.
NOTPARALLEL = .NOTPARALLEL
$(NOTPARALLEL):
+# Don't pass command-line variables to submakes.
+.NOEXPORT:
+MAKEOVERRIDES=
+
# end of Makefile.in
diff --git a/Makefile.tpl b/Makefile.tpl
index ab37bdf..72e2498 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -23,10 +23,6 @@ in
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# Don't pass command-line variables to submakes.
-.NOEXPORT:
-MAKEOVERRIDES=
-
# -------------------------------
# Standard Autoconf-set variables
# -------------------------------
@@ -1454,10 +1450,18 @@ AUTOCONF = autoconf
$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
cd $(srcdir) && $(AUTOCONF)
+# ------------------------------
+# Special directives to GNU Make
+# ------------------------------
+
# Tell GNU make 3.79 not to run the top level in parallel. This
# prevents contention for $builddir/$target/config.cache, as well
# as minimizing scatter in file system caches.
NOTPARALLEL = .NOTPARALLEL
$(NOTPARALLEL):
+# Don't pass command-line variables to submakes.
+.NOEXPORT:
+MAKEOVERRIDES=
+
# end of Makefile.in