From cf605cdabaebe0ee68713040d99e9f29afb7a945 Mon Sep 17 00:00:00 2001
From: Nathanael Nerode <neroden@gcc.gnu.org>
Date: Wed, 2 Oct 2002 06:29:04 +0000
Subject: [PATCH] 2002-10-02 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.def: Remove order dependency comments.
* Makefile.tpl: Add explicit install-install dependencies.
* Makefile.in: Regenerate.
---
ChangeLog | 4 ++++
Makefile.def | 2 --
Makefile.in | 15 ++++++++++-----
Makefile.tpl | 15 ++++++++++-----
4 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ec66ab1f6..20a5c570c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2002-10-02 Nathanael Nerode <neroden@gcc.gnu.org>
+ * Makefile.def: Remove order dependency comments.
+ * Makefile.tpl: Add explicit install-install dependencies.
+ * Makefile.in: Regenerate.
+
* Makefile.tpl: Remove material now in src-release. (Finally!)
* Makefile.in: Regenerate.
diff --git a/Makefile.def b/Makefile.def
index f1d987847..754b79ee0 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -6,7 +6,6 @@ host_modules= { module= autoconf; };
host_modules= { module= automake; };
host_modules= { module= bash; };
host_modules= { module= bfd; };
-// Put install-opcodes before install-binutils: should be Makefile dependency.
host_modules= { module= opcodes; };
host_modules= { module= binutils; };
host_modules= { module= bison; no_check_cross= true; };
@@ -32,7 +31,6 @@ host_modules= { module= gzip; };
host_modules= { module= hello; };
host_modules= { module= indent; };
host_modules= { module= intl; };
-// Put install-tcl before install-itcl: should be Makefile dependency.
host_modules= { module= tcl; };
host_modules= { module= itcl; };
host_modules= { module= ld; };
diff --git a/Makefile.in b/Makefile.in
index 0121ad820..a3a98bddd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -653,11 +653,6 @@ CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES)
# This is a list of the install targets for all of the modules which are
# compiled using $(FLAGS_TO_PASS).
-# We put install-opcodes before install-binutils because the installed
-# binutils might be on PATH, and they might need the shared opcodes
-# library.
-# We put install-tcl before install-itcl because itcl wants to run a
-# program on installation which uses the Tcl libraries.
INSTALL_MODULES = \
install-ash \
install-autoconf \
@@ -1746,6 +1741,16 @@ install-target: $(INSTALL_TARGET_MODULES)
install-gdb: install-tcl install-tk install-itcl install-tix install-libgui
install-sid: install-tcl install-tk
+# We put install-opcodes before install-binutils because the installed
+# binutils might be on PATH, and they might need the shared opcodes
+# library.
+install-binutils: install-opcodes
+
+# We put install-tcl before install-itcl because itcl wants to run a
+# program on installation which uses the Tcl libraries.
+install-itcl: install-tcl
+
+
# Dependencies of all-target-foo on configure-target-foo.
all-target-libstdc++-v3: configure-target-libstdc++-v3
all-target-newlib: configure-target-newlib
diff --git a/Makefile.tpl b/Makefile.tpl
index 3ee59653a..e2a372a79 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -547,11 +547,6 @@ CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES)
# This is a list of the install targets for all of the modules which are
# compiled using $(FLAGS_TO_PASS).
-# We put install-opcodes before install-binutils because the installed
-# binutils might be on PATH, and they might need the shared opcodes
-# library.
-# We put install-tcl before install-itcl because itcl wants to run a
-# program on installation which uses the Tcl libraries.
INSTALL_MODULES = [+ FOR host_modules+][+ IF no_install +][+ ELSE no_install +]\
install-[+module+] [+ ENDIF no_install +][+ ENDFOR host_modules +]\
$(EXTRA_TARGET_HOST_INSTALL_MODULES)
@@ -1461,6 +1456,16 @@ install-target: $(INSTALL_TARGET_MODULES)
install-gdb: install-tcl install-tk install-itcl install-tix install-libgui
install-sid: install-tcl install-tk
+# We put install-opcodes before install-binutils because the installed
+# binutils might be on PATH, and they might need the shared opcodes
+# library.
+install-binutils: install-opcodes
+
+# We put install-tcl before install-itcl because itcl wants to run a
+# program on installation which uses the Tcl libraries.
+install-itcl: install-tcl
+
+
# Dependencies of all-target-foo on configure-target-foo.
[+ FOR target_modules +]all-target-[+module+]: configure-target-[+module+]
[+ ENDFOR target_modules +]