Final changes from devo<->egcs merge. Ugh, a year of configury/Makefile

hacking.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@23012 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 145 insertions, 49 deletions

diff --git a/Makefile.in b/Makefile.in
index a49621d029c..383852c4ee5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,7 @@
 #
 # Makefile for directory with subdirs to build.
-#   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 1998 Free Software Foundation
+#   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 1998
+#   Free Software Foundation
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,16 +21,25 @@
 srcdir = .
 
 prefix = /usr/local
-
 exec_prefix = $(prefix)
-bindir = $(exec_prefix)/bin
-libdir = $(exec_prefix)/lib
+
+bindir=${exec_prefix}/bin
+sbindir=${exec_prefix}/sbin
+libexecdir=${exec_prefix}/libexec
+datadir=${prefix}/share
+sysconfdir=${prefix}/etc
+sharedstatedir=${prefix}/com
+localstatedir=${prefix}/var
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+oldincludedir=/usr/include
+infodir=${prefix}/info
+mandir=${prefix}/man
+
 tooldir = $(exec_prefix)/$(target)
 
 program_transform_name =
 
-datadir = $(prefix)/share
-mandir = $(prefix)/man
 man1dir = $(mandir)/man1
 man2dir = $(mandir)/man2
 man3dir = $(mandir)/man3
@@ -80,6 +90,8 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
 PICFLAG = 
 PICFLAG_FOR_TARGET = 
 
+CHILLFLAGS = $(CFLAGS)
+CHILL_LIB = -lchill
 CXX = c++
 
 # Use -O2 to stress test the compiler.
@@ -154,7 +166,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++ libf2c libchill libobjc winsup
+TARGET_CONFIGDIRS = libiberty libgloss newlib libio librx libstdc++ libg++ winsup opcodes libstub cygmon libf2c libchill libobjc
 
 # Target libraries are put under this directory:
 # Changed by configure to $(target_alias) if cross.
@@ -216,6 +228,16 @@ CC_FOR_TARGET = ` \
 # overridden on the command line.
 GCC_FOR_TARGET = $$r/gcc/xgcc -B$$r/gcc/
 
+CHILL_FOR_TARGET = ` \
+  if [ -f $$r/gcc/xgcc ] ; then \
+    echo $$r/gcc/xgcc -B$$r/gcc/ -L$$r/gcc/ch/runtime/; \
+  else \
+    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
+      echo $(CC); \
+    else \
+      t='$(program_transform_name)'; echo gcc | sed -e 's/x/x/' $$t; \
+    fi; \
+  fi`
 
 CXX_FOR_TARGET = ` \
   if [ -f $$r/gcc/xgcc ] ; then \
@@ -313,6 +335,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.
 ###
 
@@ -327,6 +361,9 @@ BASE_FLAGS_TO_PASS = \
 	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
 	"CFLAGS=$(CFLAGS)" \
 	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+	"CHILLFLAGS=$(CHILLFLAGS)" \
+	"CHILL_FOR_TARGET=$(CHILL_FOR_TARGET)" \
+	"CHILL_LIB=$(CHILL_LIB)" \
 	"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
 	"CXXFLAGS=$(CXXFLAGS)" \
 	"CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
@@ -348,6 +385,7 @@ BASE_FLAGS_TO_PASS = \
 	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
 	"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
 	"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
+	"RPATH_ENVVAR=$(RPATH_ENVVAR)" \
 	"SHELL=$(SHELL)" \
 	"EXPECT=$(EXPECT)" \
 	"RUNTEST=$(RUNTEST)" \
@@ -355,8 +393,21 @@ BASE_FLAGS_TO_PASS = \
 	"TARGET_SUBDIR=$(TARGET_SUBDIR)" \
 	"WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \
 	"YACC=$(YACC)" \
+	"bindir=$(bindir)" \
+	"datadir=$(datadir)" \
 	"exec_prefix=$(exec_prefix)" \
+	"includedir=$(includedir)" \
+	"infodir=$(infodir)" \
+	"libdir=$(libdir)" \
+	"libexecdir=$(libexecdir)" \
+	"lispdir=$(lispdir)" \
+	"localstatedir=$(localstatedir)" \
+	"mandir=$(mandir)" \
+	"oldincludedir=$(oldincludedir)" \
 	"prefix=$(prefix)" \
+	"sbindir=$(sbindir)" \
+	"sharedstatedir=$(sharedstatedir)" \
+	"sysconfdir=$(sysconfdir)" \
 	"tooldir=$(tooldir)" \
 	"gxx_include_dir=$(gxx_include_dir)" \
 	"gcc_version=$(gcc_version)" \
@@ -432,15 +483,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)
 
@@ -448,6 +499,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 \
@@ -455,7 +507,8 @@ ALL_MODULES = \
 	all-binutils \
 	all-bison \
 	all-byacc \
-	all-cvs \
+	all-bzip2 \
+	all-cvssrc \
 	all-db \
 	all-dejagnu \
 	all-diff \
@@ -467,6 +520,7 @@ ALL_MODULES = \
 	all-flex \
 	all-gas \
 	all-gawk \
+	all-gettext \
 	all-gnuserv \
 	all-gprof \
 	all-grep \
@@ -475,9 +529,11 @@ ALL_MODULES = \
 	all-hello \
 	all-indent \
 	all-inet \
+	all-intl \
 	all-ispell \
 	all-itcl \
 	all-ld \
+	all-libgui \
 	all-libiberty \
 	all-m4 \
 	all-make \
@@ -494,7 +550,7 @@ ALL_MODULES = \
 	all-send-pr \
 	all-shellutils \
 	all-sim \
-	all-sn \
+	all-snavigator \
 	all-tar \
 	all-tcl \
 	all-texinfo \
@@ -502,7 +558,8 @@ ALL_MODULES = \
 	all-tgas \
 	all-time \
 	all-uudecode \
-	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).
@@ -517,12 +574,14 @@ NATIVE_CHECK_MODULES = \
 
 CROSS_CHECK_MODULES = \
 	check-apache \
+	check-ash \
 	check-autoconf \
 	check-automake \
 	check-bash \
 	check-bfd \
 	check-binutils \
-	check-cvs \
+	check-bzip2 \
+	check-cvssrc \
 	check-db \
 	check-dejagnu \
 	check-diff \
@@ -532,6 +591,7 @@ CROSS_CHECK_MODULES = \
 	check-find \
 	check-gas \
 	check-gawk \
+	check-gettext \
 	check-gnuserv \
 	check-gprof \
 	check-grep \
@@ -539,10 +599,13 @@ CROSS_CHECK_MODULES = \
 	check-hello \
 	check-indent \
 	check-inet \
+	check-intl \
 	check-ispell \
 	check-itcl \
 	check-ld \
+	check-libgui \
 	check-libiberty \
+	check-libtool \
 	check-m4 \
 	check-make \
 	check-mmcheckoc \
@@ -556,7 +619,7 @@ CROSS_CHECK_MODULES = \
 	check-sed \
 	check-send-pr \
 	check-shellutils \
-	check-sn \
+	check-snaviagor \
 	check-sim \
 	check-tar \
 	check-tcl \
@@ -565,7 +628,8 @@ CROSS_CHECK_MODULES = \
 	check-tgas \
 	check-time \
 	check-uudecode \
-	check-wdiff
+	check-wdiff \
+	$(EXTRA_TARGET_HOST_CHECK_MODULES)
 
 CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES)
 
@@ -574,17 +638,21 @@ CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES)
 # 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-apache \
+	install-ash \
 	install-autoconf \
 	install-automake \
 	install-bash \
 	install-bfd \
+	install-bzip2 \
 	install-opcodes \
 	install-binutils \
 	install-bison \
 	install-byacc \
-	install-cvs \
+	install-cvssrc \
 	install-db \
 	install-dejagnu \
 	install-diff \
@@ -596,6 +664,7 @@ INSTALL_MODULES = \
 	install-flex \
 	install-gas \
 	install-gawk \
+	install-gettext \
 	install-gnuserv \
 	install-gprof \
 	install-grep \
@@ -604,10 +673,14 @@ INSTALL_MODULES = \
 	install-hello \
 	install-indent \
 	install-inet \
+	install-intl \
 	install-ispell \
+	install-tcl \
 	install-itcl \
 	install-ld \
+	install-libgui \
 	install-libiberty \
+	install-libtool \
 	install-m4 \
 	install-make \
 	install-mmalloc \
@@ -621,14 +694,15 @@ INSTALL_MODULES = \
 	install-send-pr \
 	install-shellutils \
 	install-sim \
-	install-sn \
+	install-snavigator \
 	install-tar \
-	install-tcl \
+	install-texinfo \
 	install-textutils \
 	install-tgas \
 	install-time \
 	install-uudecode \
-	install-wdiff
+	install-wdiff \
+	$(EXTRA_TARGET_HOST_INSTALL_MODULES)
 
 # This is a list of the targets for all of the modules which are compiled
 # using $(X11_FLAGS_TO_PASS).
@@ -683,7 +757,9 @@ ALL_TARGET_MODULES = \
 	all-target-libgloss \
 	all-target-libiberty \
 	all-target-gperf \
-	all-target-examples
+	all-target-examples \
+	all-target-libstub \
+	all-target-cygmon
 
 # This is a list of the configure targets for all of the modules which
 # are compiled using the target tools.
@@ -700,7 +776,9 @@ CONFIGURE_TARGET_MODULES = \
 	configure-target-libgloss \
 	configure-target-libiberty \
 	configure-target-gperf \
-	configure-target-examples
+	configure-target-examples \
+	configure-target-libstub \
+	configure-target-cygmon
 
 # This is a list of the check targets for all of the modules which are
 # compiled using $(TARGET_FLAGS_TO_PASS).
@@ -734,6 +812,7 @@ INSTALL_TARGET_MODULES = \
 # 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 \
@@ -741,7 +820,8 @@ CLEAN_MODULES = \
 	clean-binutils \
 	clean-bison \
 	clean-byacc \
-	clean-cvs \
+	clean-bzip2 \
+	clean-cvssrc \
 	clean-db \
 	clean-dejagnu \
 	clean-diff \
@@ -753,6 +833,7 @@ CLEAN_MODULES = \
 	clean-flex \
 	clean-gas \
 	clean-gawk \
+	clean-gettext \
 	clean-gnuserv \
 	clean-gprof \
 	clean-grep \
@@ -761,10 +842,13 @@ CLEAN_MODULES = \
 	clean-hello \
 	clean-indent \
 	clean-inet \
+	clean-intl \
 	clean-ispell \
 	clean-itcl \
 	clean-ld \
+	clean-libgui \
 	clean-libiberty \
+	clean-libtool \
 	clean-m4 \
 	clean-make \
 	clean-mmalloc \
@@ -780,7 +864,7 @@ CLEAN_MODULES = \
 	clean-send-pr \
 	clean-shellutils \
 	clean-sim \
-	clean-sn \
+	clean-snavigator \
 	clean-tar \
 	clean-tcl \
 	clean-texinfo \
@@ -804,7 +888,9 @@ CLEAN_TARGET_MODULES = \
 	clean-target-libgloss \
 	clean-target-libiberty \
 	clean-target-gperf \
-	clean-target-examples
+	clean-target-examples \
+	clean-target-libstub \
+	clean-target-cygmon
 
 # All of the x11 modules that can be cleaned
 CLEAN_X11_MODULES = \
@@ -1427,14 +1513,18 @@ 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-automake: all-m4 all-texinfo
 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
 all-byacc:
-all-cvs:
+all-bzip2:
+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-libstub
 all-db:
 all-dejagnu: all-tcl all-expect all-tk
 all-diff: all-libiberty
@@ -1448,17 +1538,19 @@ all-fileutils: all-libiberty
 all-findutils:
 all-find:
 all-flex: all-libiberty all-bison all-byacc
-all-gas: all-libiberty all-opcodes all-bfd
+all-gas: all-libiberty all-opcodes all-bfd all-intl
 all-gash: all-tcl
 all-gawk:
 ALL_GCC = all-gcc
 all-gcc: all-bison all-byacc all-binutils all-gas all-ld
-GDB_TK = all-tk all-tcl all-itcl all-tix
+all-bootstrap: all-libiberty all-bison all-byacc all-binutils all-gas all-ld
+GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui
 all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
+all-gettext:
 all-gnuserv:
 configure-target-gperf: $(ALL_GCC)
-all-target-gperf: configure-target-gperf all-target-libiberty all-target-libg++
-all-gprof: all-libiberty all-bfd all-opcodes
+all-target-gperf: configure-target-gperf all-target-libiberty all-target-libstdc++
+all-gprof: all-libiberty all-bfd all-opcodes all-intl
 all-grep: all-libiberty
 all-grez: all-libiberty all-bfd all-opcodes
 all-gui: all-gdb all-libproc all-target-librx
@@ -1467,9 +1559,10 @@ all-gzip: all-libiberty
 all-hello: all-libiberty
 all-indent:
 all-inet: all-tcl all-send-pr all-perl
+all-intl:
 all-ispell: all-emacs19
 all-itcl: all-tcl all-tk
-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)
@@ -1477,11 +1570,15 @@ all-target-libgloss: configure-target-libgloss configure-target-newlib
 configure-target-libio: $(ALL_GCC)
 all-target-libio: configure-target-libio all-gas all-ld all-gcc all-target-libiberty all-target-newlib
 check-target-libio: all-target-libstdc++
+all-libgui: all-tcl all-tk all-itcl
 all-libiberty:
 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-target-libf2c: configure-target-libf2c all-gas all-ld all-gcc all-target-libiberty all-target-newlib
 all-target-libchill: configure-target-libchill all-gas all-ld all-gcc all-target-libiberty all-target-newlib
 all-target-libobjc: configure-target-libobjc all-gas all-ld all-gcc all-target-libiberty all-target-newlib
@@ -1500,8 +1597,8 @@ all-recode: all-libiberty
 all-sed: all-libiberty
 all-send-pr: all-prms
 all-shellutils:
-all-sim: all-libiberty all-bfd all-opcodes
-all-sn: all-tcl all-tk all-itcl all-db all-grep
+all-sim: all-libiberty all-bfd all-opcodes all-readline
+all-snavigator: all-tcl all-tk all-itcl all-db all-grep all-flexlm all-libgui
 all-tar: all-libiberty
 all-tcl:
 all-tclX: all-tcl all-tk
@@ -1512,7 +1609,7 @@ all-tgas: all-libiberty all-bfd all-opcodes
 all-time:
 all-tix: all-tcl all-tk
 all-wdiff:
-all-target-winsup: all-target-newlib all-target-libiberty all-target-librx all-target-libio configure-target-winsup 
+all-target-winsup: all-target-newlib all-target-libiberty all-target-libio configure-target-winsup 
 configure-target-winsup: configure-target-newlib
 all-uudecode: all-libiberty
 configure-target-libiberty: $(ALL_GCC)
@@ -1581,7 +1678,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
@@ -1631,7 +1728,7 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \
 	  mkdir proto-toplev/texinfo/util && \
 	  ln -s ../../../texinfo/util/tex3patch	proto-toplev/texinfo/util ; \
 	else true; fi
-	chmod og=u `find . -print`
+	chmod -R og=u . || chmod og=u `find . -print`
 	if grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \
 	  ver=`sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'`; \
 	else \
@@ -1650,14 +1747,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"
@@ -1680,7 +1777,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 \
@@ -1707,5 +1804,4 @@ newlib.tar.gz: $(DIST_SUPPORT) $(NEWLIB_SUPPORT_DIRS) newlib
 .NOEXPORT:
 MAKEOVERRIDES=
 
-
 # end of Makefile.in