Toplevel patch: determine 'install'ed subdirs at configure time
Nathanael Nerode
neroden@twcny.rr.com
Mon Nov 18 05:17:00 GMT 2002
This replaces the dependencies of 'install' with dependencies determined
at configure time. It depends on my previous patches being in. For 3.4bib.
Tested by configuring on i686-pc-linux-gnu. Everything works the way
it's supposed to. Yay!
Together with my previous outstanding patches this clears the way for
some large autogeneration changes which will come soon.
* Makefile.tpl: Determine subdirs to 'install' at configure time.
* configure.in: Determine subdirs to 'install' at configure time.
Remove bogus exports. Normalize style.
* Makefile.in: Regenerate.
--- Makefile.tpl.3 2002-11-18 07:58:18.000000000 -0500
+++ Makefile.tpl 2002-11-18 08:08:35.000000000 -0500
@@ -793,12 +793,7 @@
# Installation targets.
.PHONY: install uninstall source-vault binary-vault vault-install
-install:
- installdirs \
- install-gcc \
- $(INSTALL_MODULES) \
- $(INSTALL_TARGET_MODULES) \
- $(INSTALL_X11_MODULES)
+install: installdirs @install_host_modules@ @install_target_modules@
uninstall:
@echo "the uninstall target is not supported in this tree"
@@ -832,12 +827,8 @@
# install-no-fixedincludes is used because Cygnus can not distribute
# the fixed header files.
.PHONY: install-no-fixedincludes
-install-no-fixedincludes: \
- installdirs \
- $(INSTALL_MODULES) \
- $(INSTALL_TARGET_MODULES) \
- $(INSTALL_X11_MODULES) \
- gcc-no-fixedincludes
+install-no-fixedincludes: installdirs @install_host_modules_nogcc@ \
+ @install_target_modules@ gcc-no-fixedincludes
# Install the gcc headers files, but not the fixed include files,
# which Cygnus is not allowed to distribute. This rule is very
--- configure.in.3 2002-11-18 07:58:34.000000000 -0500
+++ configure.in 2002-11-18 08:08:13.000000000 -0500
@@ -1350,23 +1350,24 @@
# This is the final value for target_configdirs. configdirs already
# has its final value. It's time to create some lists of valid targets.
-all_host_modules=""
-check_host_modules=""
+all_host_modules=
+check_host_modules=
+install_host_modules=
for module in ${configdirs} ; do
all_host_modules="${all_host_modules} all-${module}"
check_host_modules="${check_host_modules} check-${module}"
+ install_host_modules="${install_host_modules} install-${module}"
done
-export all_host_modules
-export check_host_modules
+install_host_modules_nogcc=`echo "${install_host_modules}" | sed -e 's/install-gcc//g'`
all_target_modules=
check_target_modules=
+install_target_modules=
for module in ${target_configdirs} ; do
all_target_modules="${all_target_modules} all-target-${module}"
check_target_modules="${check_target_modules} check-target-${module}"
+ install_target_modules="${install_target_modules} install-target-${module}"
done
-export all_target_modules
-export check_target_modules
# Base args. Strip norecursion, cache-file, srcdir, host, build, target.
# These are the ones we might not want to pass down to subconfigures.
@@ -1566,8 +1567,11 @@
cat >$sedtemp <<EOF
s%@all_host_modules@%${all_host_modules}%
s%@check_host_modules@%${check_host_modules}%
+s%@install_host_modules@%${install_host_modules}%
+s%@install_host_modules_nogcc@%${install_host_modules_nogcc}%
s%@all_target_modules@%${all_target_modules}%
s%@check_target_modules@%${check_target_modules}%
+s%@install_target_modules@%${install_target_modules}%
s:@target_configdirs@:${target_configdirs}:
s%@target_configargs@%${targargs}%
s%@FLAGS_FOR_TARGET@%${FLAGS_FOR_TARGET}%
--- Makefile.in.3 2002-11-18 07:58:08.000000000 -0500
+++ Makefile.in 2002-11-18 08:08:43.000000000 -0500
@@ -1479,12 +1479,7 @@
# Installation targets.
.PHONY: install uninstall source-vault binary-vault vault-install
-install:
- installdirs \
- install-gcc \
- $(INSTALL_MODULES) \
- $(INSTALL_TARGET_MODULES) \
- $(INSTALL_X11_MODULES)
+install: installdirs @install_host_modules@ @install_target_modules@
uninstall:
@echo "the uninstall target is not supported in this tree"
@@ -1518,12 +1513,8 @@
# install-no-fixedincludes is used because Cygnus can not distribute
# the fixed header files.
.PHONY: install-no-fixedincludes
-install-no-fixedincludes: \
- installdirs \
- $(INSTALL_MODULES) \
- $(INSTALL_TARGET_MODULES) \
- $(INSTALL_X11_MODULES) \
- gcc-no-fixedincludes
+install-no-fixedincludes: installdirs @install_host_modules_nogcc@ \
+ @install_target_modules@ gcc-no-fixedincludes
# Install the gcc headers files, but not the fixed include files,
# which Cygnus is not allowed to distribute. This rule is very
More information about the Gdb-patches
mailing list