X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.in;h=b8d4994cd5182301511b760235fc9150ffc5c06d;hb=fdd378489f9a55005a08f8592988ecaa45478a35;hp=3eef34f24c543b3c967067dbc26ba80a224d6518;hpb=f46d03c51f9d580cfdd75dd20b96acaa51f7faa0;p=deliverable%2Fbinutils-gdb.git

diff --git a/Makefile.in b/Makefile.in
index 3eef34f24c..b8d4994cd5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -163,7 +163,7 @@ OTHERS =
 
 # This is set by the configure script to the list of directories which
 # should be built using the target tools.
-TARGET_CONFIGDIRS = libiberty libgloss newlib libio librx libstdc++ libg++ winsup opcodes cygmon
+TARGET_CONFIGDIRS = libiberty libgloss newlib libio librx libstdc++ libg++ winsup opcodes libstub cygmon
 
 # Target libraries are put under this directory:
 # Changed by configure to $(target_alias) if cross.
@@ -191,8 +191,8 @@ INSTALL_TARGET = installdirs \
 	$(INSTALL_MODULES) \
 	$(INSTALL_TARGET_MODULES) \
 	$(INSTALL_X11_MODULES) \
-	$(INSTALL_DOSREL)
-
+	$(INSTALL_DOSREL) \
+	$(EXTRA_TARGET_HOST_INSTALL_MODULES)
 
 CC_FOR_TARGET = ` \
   if [ -f $$r/gcc/xgcc ] ; then \
@@ -329,6 +329,18 @@ NM_FOR_TARGET = ` \
     fi; \
   fi`
 
+# The first rule in the file had better be this one.  Don't put any above it.
+# This lives here to allow makefile fragments to contain dependencies.
+all: all.normal
+.PHONY: all
+
+# These can be overridden by config/mt-*.
+# The _TARGET_ is because they're specified in mt-foo.
+# The _HOST_ is because they're programs that run on the host.
+EXTRA_TARGET_HOST_ALL_MODULES =
+EXTRA_TARGET_HOST_INSTALL_MODULES =
+EXTRA_TARGET_HOST_CHECK_MODULES =
+
 #### host and target specific makefile fragments come in here.
 ###
 
@@ -464,15 +476,15 @@ EXTRA_GCC_FLAGS = \
 	'RANLIB=$$(RANLIB_FOR_TARGET)' \
 	'WINDRES=$$(WINDRES_FOR_TARGET)' \
 	"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
-	"`if test x'$(LANGUAGES)' != x; then echo 'LANGUAGES=$(LANGUAGES)'; else echo 'XFOO=bar'; fi`" \
-	"`if test x'$(STMP_FIXPROTO)' != x; then echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)'; else echo 'XFOO=bar'; fi`" \
-	"`if test x'$(LIMITS_H_TEST)' != x; then echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)'; else echo 'XFOO=bar'; fi`" \
-	"`if test x'$(LIBGCC1_TEST)' != x; then echo 'LIBGCC1_TEST=$(LIBGCC1_TEST)'; else echo 'XFOO=bar'; fi`" \
-	"`if test x'$(LIBGCC2_CFLAGS)' != x; then echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)'; else echo 'XFOO=bar'; fi`" \
-	"`if test x'$(LIBGCC2_DEBUG_CFLAGS)' != x; then echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)'; else echo 'XFOO=bar'; fi`" \
-	"`if test x'$(LIBGCC2_INCLUDES)' != x; then echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)'; else echo 'XFOO=bar'; fi`" \
-	"`if test x'$(ENQUIRE)' != x; then echo 'ENQUIRE=$(ENQUIRE)'; else echo 'XFOO=bar'; fi`" \
-	"`if test x'$(BOOT_CFLAGS)' != x; then echo 'BOOT_CFLAGS=$(BOOT_CFLAGS)'; else echo 'XFOO=bar'; fi`"
+	"`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'LIBGCC1_TEST=$(LIBGCC1_TEST)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'ENQUIRE=$(ENQUIRE)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'BOOT_CFLAGS=$(BOOT_CFLAGS)' | sed -e s/.*=$$/XFOO=/`"
 
 GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS)
 
@@ -480,6 +492,7 @@ GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS)
 # using $(FLAGS_TO_PASS).
 ALL_MODULES = \
 	all-apache \
+	all-ash \
 	all-autoconf \
 	all-automake \
 	all-bash \
@@ -487,6 +500,9 @@ ALL_MODULES = \
 	all-binutils \
 	all-bison \
 	all-byacc \
+	$(start-sanitize-cygnus) \
+	all-cgen \
+	$(end-sanitize-cygnus) \
 	all-cvssrc \
 	all-db \
 	all-dejagnu \
@@ -497,6 +513,9 @@ ALL_MODULES = \
 	all-findutils \
 	all-find \
 	all-flex \
+	$(start-sanitize-cygnus) \
+	all-flexlm \
+	$(end-sanitize-cygnus) \
 	all-gas \
 	all-gawk \
 	all-gettext \
@@ -524,6 +543,7 @@ ALL_MODULES = \
 	all-libide \
 	all-libidetcl \
 	$(end-sanitize-ide) \
+	all-libtool \
 	all-m4 \
 	all-make \
 	all-mmalloc \
@@ -539,7 +559,9 @@ ALL_MODULES = \
 	all-send-pr \
 	all-shellutils \
 	all-sim \
+	$(start-sanitize-cygnus) \
 	all-snavigator \
+	$(end-sanitize-cygnus) \
 	all-tar \
 	all-tcl \
 	all-texinfo \
@@ -550,7 +572,8 @@ ALL_MODULES = \
 	$(start-sanitize-ide) \
 	all-vmake \
 	$(end-sanitize-ide) \
-	all-wdiff 
+	all-wdiff \
+	$(EXTRA_TARGET_HOST_ALL_MODULES)
 
 # This is a list of the check targets for all of the modules which are
 # compiled using $(FLAGS_TO_PASS).
@@ -565,6 +588,7 @@ NATIVE_CHECK_MODULES = \
 
 CROSS_CHECK_MODULES = \
 	check-apache \
+	check-ash \
 	check-autoconf \
 	check-automake \
 	check-bash \
@@ -578,6 +602,9 @@ CROSS_CHECK_MODULES = \
 	check-fileutils \
 	check-findutils \
 	check-find \
+	$(start-sanitize-cygnus) \
+	check-flexlm \
+	$(end-sanitize-cygnus) \
 	check-gas \
 	check-gawk \
 	check-gettext \
@@ -604,6 +631,7 @@ CROSS_CHECK_MODULES = \
 	check-libide \
 	check-libidetcl \
 	$(end-sanitize-ide) \
+	check-libtool \
 	check-m4 \
 	check-make \
 	check-mmcheckoc \
@@ -617,7 +645,9 @@ CROSS_CHECK_MODULES = \
 	check-sed \
 	check-send-pr \
 	check-shellutils \
+	$(start-sanitize-cygnus) \
 	check-snavigator \
+	$(end-sanitize-cygnus) \
 	check-sim \
 	check-tar \
 	check-tcl \
@@ -629,7 +659,8 @@ CROSS_CHECK_MODULES = \
 	$(start-sanitize-ide) \
 	check-vmake \
 	$(end-sanitize-ide) \
-	check-wdiff
+	check-wdiff \
+	$(EXTRA_TARGET_HOST_CHECK_MODULES)
 
 CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES)
 
@@ -642,6 +673,7 @@ CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES)
 # program on installation which uses the Tcl libraries.
 INSTALL_MODULES = \
 	install-apache \
+	install-ash \
 	install-autoconf \
 	install-automake \
 	install-bash \
@@ -660,6 +692,9 @@ INSTALL_MODULES = \
 	install-findutils \
 	install-find \
 	install-flex \
+	$(start-sanitize-cygnus) \
+	install-flexlm \
+	$(end-sanitize-cygnus) \
 	install-gas \
 	install-gawk \
 	install-gettext \
@@ -688,6 +723,7 @@ INSTALL_MODULES = \
 	install-libide \
 	install-libidetcl \
 	$(end-sanitize-ide) \
+	install-libtool \
 	install-m4 \
 	install-make \
 	install-mmalloc \
@@ -701,7 +737,9 @@ INSTALL_MODULES = \
 	install-send-pr \
 	install-shellutils \
 	install-sim \
+	$(start-sanitize-cygnus) \
 	install-snavigator \
+	$(end-sanitize-cygnus) \
 	install-tar \
 	install-texinfo \
 	install-textutils \
@@ -764,6 +802,11 @@ ALL_TARGET_MODULES = \
 	all-target-libiberty \
 	all-target-gperf \
 	all-target-examples \
+	all-target-libstub \
+	$(start-sanitize-java) \
+	all-target-libjava \
+	all-target-boehm-gc \
+	$(end-sanitize-java) \
 	all-target-cygmon
 
 # This is a list of the configure targets for all of the modules which
@@ -779,6 +822,11 @@ CONFIGURE_TARGET_MODULES = \
 	configure-target-libiberty \
 	configure-target-gperf \
 	configure-target-examples \
+	configure-target-libstub \
+	$(start-sanitize-java) \
+	configure-target-libjava \
+	configure-target-boehm-gc \
+	$(end-sanitize-java) \
 	configure-target-cygmon
 
 # This is a list of the check targets for all of the modules which are
@@ -790,6 +838,10 @@ CHECK_TARGET_MODULES = \
 	check-target-newlib \
 	check-target-winsup \
 	check-target-libiberty \
+	$(start-sanitize-java) \
+	check-target-libjava \
+	check-target-boehm-gc \
+	$(end-sanitize-java) \
 	check-target-gperf
 
 # This is a list of the install targets for all of the modules which are
@@ -802,11 +854,16 @@ INSTALL_TARGET_MODULES = \
 	install-target-winsup \
 	install-target-libgloss \
 	install-target-libiberty \
+	$(start-sanitize-java) \
+	install-target-libjava \
+	install-target-boehm-gc \
+	$(end-sanitize-java) \
 	install-target-gperf
 
 # This is a list of the targets for which we can do a clean-{target}.
 CLEAN_MODULES = \
 	clean-apache \
+	clean-ash \
 	clean-autoconf \
 	clean-automake \
 	clean-bash \
@@ -814,6 +871,9 @@ CLEAN_MODULES = \
 	clean-binutils \
 	clean-bison \
 	clean-byacc \
+	$(start-sanitize-cygnus) \
+	clean-cgen \
+	$(end-sanitize-cygnus) \
 	clean-cvssrc \
 	clean-db \
 	clean-dejagnu \
@@ -824,6 +884,9 @@ CLEAN_MODULES = \
 	clean-findutils \
 	clean-find \
 	clean-flex \
+	$(start-sanitize-cygnus) \
+	clean-flexlm \
+	$(end-sanitize-cygnus) \
 	clean-gas \
 	clean-gawk \
 	clean-gettext \
@@ -851,6 +914,7 @@ CLEAN_MODULES = \
 	clean-libide \
 	clean-libidetcl \
 	$(end-sanitize-ide) \
+	clean-libtool \
 	clean-m4 \
 	clean-make \
 	clean-mmalloc \
@@ -866,7 +930,9 @@ CLEAN_MODULES = \
 	clean-send-pr \
 	clean-shellutils \
 	clean-sim \
+	$(start-sanitize-cygnus) \
 	clean-snavigator \
+	$(end-sanitize-cygnus) \
 	clean-tar \
 	clean-tcl \
 	clean-texinfo \
@@ -891,6 +957,11 @@ CLEAN_TARGET_MODULES = \
 	clean-target-libiberty \
 	clean-target-gperf \
 	clean-target-examples \
+	clean-target-libstub \
+	$(start-sanitize-java) \
+	clean-target-libjava \
+	clean-target-boehm-gc \
+	$(end-sanitize-java) \
 	clean-target-cygmon
 
 # All of the x11 modules that can be cleaned
@@ -905,10 +976,6 @@ CLEAN_X11_MODULES = \
 	clean-tk \
 	clean-tix
 
-# The first rule in the file had better be this one.  Don't put any above it.
-all: all.normal
-.PHONY: all
-
 # The target built for a native build.
 .PHONY: all.normal
 all.normal: \
@@ -1105,6 +1172,7 @@ install-no-fixedincludes: \
 	$(INSTALL_MODULES) \
 	$(INSTALL_TARGET_MODULES) \
 	$(INSTALL_X11_MODULES) \
+	$(EXTRA_TARGET_HOST_INSTALL_MODULES) \
 	gcc-no-fixedincludes 
 
 # Install the gcc headers files, but not the fixed include files,
@@ -1229,6 +1297,11 @@ $(CONFIGURE_TARGET_MODULES):
 		mv $(TARGET_SUBDIR)/$${dir}/tmpmulti.out $(TARGET_SUBDIR)/$${dir}/multilib.out; \
 	      fi; \
 	    else \
+	      if echo '.;' | cmp - $(TARGET_SUBDIR)/$${dir}/tmpmulti.out >/dev/null 2>&1; then \
+		true; \
+	      else \
+		rm -f $(TARGET_SUBDIR)/$${dir}/Makefile; \
+	      fi; \
 	      mv $(TARGET_SUBDIR)/$${dir}/tmpmulti.out $(TARGET_SUBDIR)/$${dir}/multilib.out; \
 	    fi; \
 	  fi; \
@@ -1462,16 +1535,27 @@ install-dosrel-fake:
 
 # This is a list of inter-dependencies among modules.
 all-apache:
+all-ash:
 all-autoconf: all-m4 all-texinfo
 all-automake:
 all-bash:
-all-bfd:
-all-binutils: all-libiberty all-opcodes all-bfd all-flex all-bison all-byacc
+all-bfd: all-libiberty all-intl
+all-binutils: all-libiberty all-opcodes all-bfd all-flex all-bison all-byacc all-intl
 all-bison: all-texinfo
+# start-sanitize-java
+all-target-boehm-gc: configure-target-boehm-gc
+# end-sanitize-java
 all-byacc:
+# start-sanitize-cygnus
+all-cgen:
+# These two have dependencies on cgen, and while this section is alphabetically
+# sorted, I wish to keep these together until things settle.
+all-opcodes: all-cgen
+all-sim: all-cgen
+# end-sanitize-cygnus
 all-cvssrc:
 configure-target-cygmon: $(ALL_GCC)
-all-target-cygmon: configure-target-cygmon all-gas all-ld all-gcc all-target-libiberty all-target-newlib all-target-libio
+all-target-cygmon: configure-target-cygmon all-gas all-ld all-gcc all-target-libiberty all-target-newlib all-target-libio all-target-libstub
 all-db:
 all-dejagnu: all-tcl all-expect all-tk
 all-diff: all-libiberty
@@ -1485,7 +1569,10 @@ all-fileutils: all-libiberty
 all-findutils:
 all-find:
 all-flex: all-libiberty all-bison all-byacc
-all-gas: all-libiberty all-opcodes all-bfd
+# start-sanitize-cygnus
+all-flexlm:
+# end-sanitize-cygnus
+all-gas: all-libiberty all-opcodes all-bfd all-intl
 all-gash: all-tcl
 all-gawk:
 ALL_GCC = all-gcc
@@ -1500,8 +1587,7 @@ all-gettext:
 all-gnuserv:
 configure-target-gperf: $(ALL_GCC)
 all-target-gperf: configure-target-gperf all-target-libiberty all-target-libstdc++
-all-gprof: all-libiberty all-bfd all-opcodes
-all-grep: all-libiberty
+all-gprof: all-libiberty all-bfd all-opcodes all-intl
 all-grez: all-libiberty all-bfd all-opcodes
 all-gui: all-gdb all-libproc all-target-librx
 all-guile:
@@ -1518,7 +1604,7 @@ all-itcl: all-tcl all-tk
 # start-sanitize-ide
 all-jstools: all-tcl all-tk all-tix all-libgui all-libide all-libidetcl
 # end-sanitize-ide
-all-ld: all-libiberty all-bfd all-opcodes all-bison all-byacc all-flex
+all-ld: all-libiberty all-bfd all-opcodes all-bison all-byacc all-flex all-intl
 configure-target-libg++: $(ALL_GCC) configure-target-librx
 all-target-libg++: configure-target-libg++ all-gas all-ld all-gcc all-target-libiberty all-target-newlib all-target-libio all-target-librx all-target-libstdc++
 configure-target-libgloss: $(ALL_GCC)
@@ -1532,10 +1618,17 @@ all-libiberty:
 all-libide: all-ilu
 all-libidetcl: all-tcl all-tk all-itcl all-ilu all-libgui all-libide
 # end-sanitize-ide
+# start-sanitize-java
+configure-target-libjava: $(ALL_GCC) configure-target-boehm-gc
+all-target-libjava: configure-target-libjava all-gcc all-target-newlib all-target-boehm-gc
+# end-sanitize-java
 configure-target-librx: $(ALL_GCC) configure-target-newlib
 all-target-librx: configure-target-librx
 configure-target-libstdc++: $(ALL_GCC)
 all-target-libstdc++: configure-target-libstdc++ all-gas all-ld all-gcc all-target-libiberty all-target-newlib all-target-libio
+configure-target-libstub: $(ALL_GCC)
+all-target-libstub: configure-target-libstub
+all-libtool:
 all-m4: all-libiberty
 all-make: all-libiberty
 all-mmalloc:
@@ -1552,7 +1645,9 @@ all-sed: all-libiberty
 all-send-pr: all-prms
 all-shellutils:
 all-sim: all-libiberty all-bfd all-opcodes all-readline
-all-snavigator: all-tcl all-tk all-tix all-itcl all-db all-grep
+# start-sanitize-cygnus
+all-snavigator: all-tcl all-tk all-tix all-itcl all-db all-grep all-flexlm all-libgui
+# end-sanitize-cygnus
 all-tar: all-libiberty
 all-tcl:
 all-tclX: all-tcl all-tk
@@ -1574,7 +1669,7 @@ all-target-libiberty: configure-target-libiberty all-gcc all-ld all-target-newli
 all-target: $(ALL_TARGET_MODULES)
 install-target: $(INSTALL_TARGET_MODULES)
 # start-sanitize-gdbtk
-install-gdbtk: install-tcl install-tk install-itcl install-tix install-libgui install-gdb
+install-gdb: install-tcl install-tk install-itcl install-tix install-libgui
 #end-sanitize-gdbtk
 ### other supporting targets
 
@@ -1637,7 +1732,7 @@ SUPPORT_FILES = list-of-support-files-for-tool-in-question
 
 taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \
   texinfo/texinfo.tex texinfo/gpl.texinfo texinfo/lgpl.texinfo
-	# Take out texinfo from a few places; make simple BISON=bison line.
+	# Take out texinfo from a few places.
 	sed -e '/^all\.normal: /s/\all-texinfo //' \
 	    -e '/^	install-texinfo /d' \
 	<Makefile.in >tmp
@@ -1709,14 +1804,14 @@ TEXINFO_SUPPORT= texinfo/texinfo.tex texinfo/gpl.texinfo texinfo/lgpl.texinfo
 DIST_SUPPORT= $(DEVO_SUPPORT) $(TEXINFO_SUPPORT)
 
 .PHONY: gas.tar.gz
-GAS_SUPPORT_DIRS= bfd include libiberty opcodes setup.com makefile.vms
+GAS_SUPPORT_DIRS= bfd include libiberty opcodes intl setup.com makefile.vms
 gas.tar.gz: $(DIST_SUPPORT) $(GAS_SUPPORT_DIRS) gas
 	$(MAKE) -f Makefile.in taz TOOL=gas \
 		SUPPORT_FILES="$(GAS_SUPPORT_DIRS)"
 
 # The FSF "binutils" release includes gprof and ld.
 .PHONY: binutils.tar.gz
-BINUTILS_SUPPORT_DIRS= bfd gas include libiberty opcodes ld gprof setup.com makefile.vms
+BINUTILS_SUPPORT_DIRS= bfd gas include libiberty opcodes ld gprof intl setup.com makefile.vms
 binutils.tar.gz: $(DIST_SUPPORT) $(BINUTILS_SUPPORT_DIRS) binutils
 	$(MAKE) -f Makefile.in taz TOOL=binutils \
 		SUPPORT_FILES="$(BINUTILS_SUPPORT_DIRS) makeall.bat configure.bat"
@@ -1739,7 +1834,7 @@ gnats.tar.gz: $(DIST_SUPPORT) $(GNATS_SUPPORT_DIRS) gnats
 		SUPPORT_FILES="$(GNATS_SUPPORT_DIRS)"
 
 .PHONY: gdb.tar.gz
-GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline sim utils
+GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline sim utils intl
 GDBTK_SUPPORT_DIRS= `if [ -d tcl -a -d tk ] ; then echo tcl tk ; fi`
 gdb.tar.gz: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
 	$(MAKE) -f Makefile.in taz TOOL=gdb \