diff options
| author | neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-03-14 20:44:37 +0000 |
|---|---|---|
| committer | neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-03-14 20:44:37 +0000 |
| commit | 523318a0eae3035ba9eea721c192ba19b8e7f316 (patch) | |
| tree | 3f2aee62b96507f3ddd56e57d8e9c98f991cc913 | |
| parent | 53fffe66067d85062e7736d487e94049ffccc644 (diff) | |
| download | gcc-523318a0eae3035ba9eea721c192ba19b8e7f316.tar.gz | |
* Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES back down.
* Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@64370 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 12 | ||||
| -rw-r--r-- | Makefile.tpl | 12 |
3 files changed, 21 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index a55448047c1..322de53b3a3 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 c40fd8155be..f70250dd8d7 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 ab37bdf2beb..72e24983c57 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 |