* config/tc-hppa.c (md_pseudo_table): Add ".begin_try" and ".end_try"
[platform/upstream/binutils.git] / Makefile.in
index 23d2605..c821083 100644 (file)
@@ -14,7 +14,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
 srcdir = .
@@ -86,19 +86,26 @@ CXXFLAGS_FOR_TARGET = $(CXXFLAGS)
 LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
 
 RANLIB = ranlib
+
+DLLTOOL = dlltool
+
 NM = nm
 # Not plain GZIP, since gzip looks there for extra command-line options.
 GZIPPROG = gzip
 
+# These values are substituted by configure.
+DEFAULT_YACC = yacc
+DEFAULT_LEX = lex
+
 # BISON: This line sed'ed to BISON = bison -y for FSF releases, don't remove.
 BISON = `if [ -f $$r/byacc/byacc ] ; \
            then echo $$r/byacc/byacc ; \
-           else echo byacc ; \
+           else echo ${DEFAULT_YACC} ; \
        fi`
 
 LEX = `if [ -f $$r/flex/flex ] ; \
        then echo $$r/flex/flex ; \
-       else echo flex ; fi`
+       else echo ${DEFAULT_LEX} ; fi`
 
 M4 = `if [ -f $$r/m4/m4 ] ; \
        then echo $$r/m4/m4 ; \
@@ -132,11 +139,27 @@ OTHERS =
 
 # This is set by the configure script to the list of directories which
 # should be built using the target tools.
-TARGET_CONFIGDIRS = xiberty libgloss newlib libio librx libstdc++ libg++ winsup
+TARGET_CONFIGDIRS = libiberty libgloss newlib libio librx libstdc++ libg++ winsup
+
+# Target libraries are put under this directory:
+TARGET_SUBDIR = . # Changed by configure to $(target_alias) if cross.
 
 # This is set by the configure script to the arguments passed to configure.
 CONFIG_ARGUMENTS = 
 
+# This is set by configure to REALLY_SET_LIB_PATH if --enable-shared
+# was used.
+SET_LIB_PATH =
+
+# This is the name of the environment variable used for the path to
+# the libraries.  This may be changed by configure.in.
+RPATH_ENVVAR = LD_LIBRARY_PATH
+
+# configure.in sets SET_LIB_PATH to this if --enable-shared was used.
+REALLY_SET_LIB_PATH = \
+  $(RPATH_ENVVAR)=$$r/bfd:$$r/opcodes:$$$(RPATH_ENVVAR); \
+  export $(RPATH_ENVVAR);
+
 ALL = all.normal
 INSTALL_TARGET = install-dirs \
        $(INSTALL_MODULES) \
@@ -148,8 +171,8 @@ INSTALL_TARGET = install-dirs \
 
 CC_FOR_TARGET = ` \
   if [ -f $$r/gcc/Makefile ] ; then \
-    if [ -f $$r/newlib/Makefile ] ; then \
-      echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/newlib/targ-include -idirafter $${srcroot}/newlib/libc/include -nostdinc; \
+    if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
+      echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $${srcroot}/newlib/libc/include -nostdinc; \
     else \
       echo $$r/gcc/xgcc -B$$r/gcc/; \
     fi; \
@@ -177,8 +200,8 @@ CHILL_FOR_TARGET = ` \
 
 CXX_FOR_TARGET = ` \
   if [ -f $$r/gcc/Makefile ] ; then \
-    if [ -f $$r/newlib/Makefile ] ; then \
-      echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/newlib/targ-include -idirafter $${srcroot}/newlib/libc/include -nostdinc; \
+    if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
+      echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $${srcroot}/newlib/libc/include -nostdinc; \
     else \
       echo $$r/gcc/xgcc -B$$r/gcc/; \
     fi; \
@@ -293,6 +316,7 @@ BASE_FLAGS_TO_PASS = \
        "LIBCXXFLAGS=$(LIBCXXFLAGS)" \
        "LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \
        "M4=$(M4)" \
+       "MAKE=$(MAKE)" \
        "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
        "NM_FOR_TARGET=$(NM_FOR_TARGET)" \
        "PICFLAG=$(PICFLAG)" \
@@ -315,8 +339,10 @@ EXTRA_HOST_FLAGS = \
        'AS=$(AS)' \
        'CC=$(CC)' \
        'CXX=$(CXX)' \
+       'DLLTOOL=$(DLLTOOL)' \
        'NM=$(NM)' \
-       'RANLIB=$(RANLIB)'
+       'RANLIB=$(RANLIB)' 
+
 
 FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
 
@@ -364,17 +390,27 @@ EXTRA_GCC_FLAGS = \
        'AS=$(AS)' \
        'CC=$(CC)' \
        'CXX=$(CXX)' \
+       'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
        'HOST_CC=$(CC_FOR_BUILD)' \
        'HOST_PREFIX=$(HOST_PREFIX)' \
        'HOST_PREFIX_1=$(HOST_PREFIX_1)' \
        'NM=$(NM)' \
-       'RANLIB=$$(RANLIB_FOR_TARGET)'
+       'RANLIB=$$(RANLIB_FOR_TARGET)' \
+       `if test x"$(LANGUAGES)" != x; then echo "LANGUAGES=$(LANGUAGES)"; fi` \
+       `if test x"$(STMP_FIXPROTO)" != x; then echo "STMP_FIXPROTO=$(STMP_FIXPROTO)"; fi` \
+       `if test x"$(LIMITS_H_TEST)" != x; then echo "LIMITS_H_TEST=$(LIMITS_H_TEST)"; fi` \
+       `if test x"$(LIBGCC1_TEST)" != x; then echo "LIBGCC1_TEST=$(LIBGCC1_TEST)"; fi` \
+       `if test x"$(LIBGCC2_CFLAGS)" != x; then echo "LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)"; fi` \
+       `if test x"$(LIBGCC2_INCLUDES)" != x; then echo "LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)"; fi` \
+       `if test x"$(ENQUIRE)" != x; then echo "ENQUIRE=$(ENQUIRE)"; fi` \
+       `if test x"$(BOOT_CFLAGS)" != x; then echo "BOOT_CFLAGS=$(BOOT_CFLAGS)"; fi`
 
 GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS)
 
 # This is a list of the targets for all of the modules which are compiled
 # using $(FLAGS_TO_PASS).
 ALL_MODULES = \
+       all-apache \
        all-autoconf \
        all-bfd \
        all-binutils \
@@ -391,9 +427,11 @@ ALL_MODULES = \
        all-gawk \
        all-gprof \
        all-grep \
+       all-grez \
        all-gzip \
        all-hello \
        all-indent \
+       all-inet \
        all-ispell \
        all-ld \
        all-libiberty \
@@ -402,6 +440,7 @@ ALL_MODULES = \
        all-mmalloc \
        all-opcodes \
        all-patch \
+       all-perl \
        all-prms \
        all-rcs \
        all-readline \
@@ -433,6 +472,7 @@ NATIVE_CHECK_MODULES = \
        check-flex
 
 CROSS_CHECK_MODULES = \
+       check-apache \
        check-autoconf \
        check-bfd \
        check-binutils \
@@ -449,6 +489,7 @@ CROSS_CHECK_MODULES = \
        check-gzip \
        check-hello \
        check-indent \
+       check-inet \
        check-ispell \
        check-ld \
        check-libiberty \
@@ -457,6 +498,7 @@ CROSS_CHECK_MODULES = \
        check-mmcheckoc \
        check-opcodes \
        check-patch \
+       check-perl \
        check-prms \
        check-rcs \
        check-readline \
@@ -479,6 +521,7 @@ 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).
 INSTALL_MODULES = \
+       install-apache \
        install-autoconf \
        install-bfd \
        install-binutils \
@@ -495,9 +538,11 @@ INSTALL_MODULES = \
        install-gawk \
        install-gprof \
        install-grep \
+       install-grez \
        install-gzip \
        install-hello \
        install-indent \
+       install-inet \
        install-ispell \
        install-ld \
        install-libiberty \
@@ -506,6 +551,7 @@ INSTALL_MODULES = \
        install-mmalloc \
        install-opcodes \
        install-patch \
+       install-perl \
        install-prms \
        install-rcs \
        install-readline \
@@ -531,6 +577,7 @@ ALL_X11_MODULES = \
        all-gdb \
        all-expect \
        all-gash \
+       all-guile \
        all-tclX \
        all-tk
 
@@ -539,6 +586,7 @@ ALL_X11_MODULES = \
 CHECK_X11_MODULES = \
        check-emacs \
        check-gdb \
+       check-guile \
        check-expect \
        check-gash \
        check-tclX \
@@ -550,6 +598,7 @@ INSTALL_X11_MODULES = \
        install-emacs \
        install-emacs19 \
        install-gdb \
+       install-guile \
        install-expect \
        install-gash \
        install-tclX \
@@ -558,51 +607,123 @@ INSTALL_X11_MODULES = \
 # This is a list of the targets for all of the modules which are compiled
 # using $(TARGET_FLAGS_TO_PASS).
 ALL_TARGET_MODULES = \
-       all-libio \
-       all-libstdc++ \
-       all-librx \
-       all-libg++ \
-       all-newlib \
-       all-winsup \
-       all-libgloss \
-       all-xiberty
+       all-target-libio \
+       all-target-libstdc++ \
+       all-target-librx \
+       all-target-libg++ \
+       all-target-newlib \
+       all-target-winsup \
+       all-target-libgloss \
+       all-target-libiberty \
+       all-target-examples
 
 # This is a list of the configure targets for all of the modules which
 # are compiled using the target tools.
 CONFIGURE_TARGET_MODULES = \
-       configure-libio \
-       configure-libstdc++ \
-       configure-librx \
-       configure-libg++ \
-       configure-newlib \
-       configure-winsup \
-       configure-libgloss \
-       configure-xiberty
+       configure-target-libio \
+       configure-target-libstdc++ \
+       configure-target-librx \
+       configure-target-libg++ \
+       configure-target-newlib \
+       configure-target-winsup \
+       configure-target-libgloss \
+       configure-target-libiberty \
+       configure-target-examples
 
 # This is a list of the check targets for all of the modules which are
 # compiled using $(TARGET_FLAGS_TO_PASS).
 CHECK_TARGET_MODULES = \
-       check-libio \
-       check-libstdc++ \
-       check-libg++ \
-       check-newlib \
-       check-winsup \
-       check-xiberty
+       check-target-libio \
+       check-target-libstdc++ \
+       check-target-libg++ \
+       check-target-newlib \
+       check-target-winsup \
+       check-target-libiberty
 
 # This is a list of the install targets for all of the modules which are
 # compiled using $(TARGET_FLAGS_TO_PASS).
 INSTALL_TARGET_MODULES = \
-       install-libio \
-       install-libstdc++ \
-       install-libg++ \
-       install-newlib \
-       install-winsup \
-       install-libgloss \
-       install-xiberty
-
-# This is a shell case of all modules which are compiled using
-# $(TARGET_FLAGS_TO_PASS), used in the do-X rule.
-TARGET_LIBS = libio | libstdc++ | librx | libg++ | newlib | xiberty | winsup
+       install-target-libio \
+       install-target-libstdc++ \
+       install-target-libg++ \
+       install-target-newlib \
+       install-target-winsup \
+       install-target-libgloss \
+       install-target-libiberty
+
+# This is a list of the targets for which we can do a clean-{target}.
+CLEAN_MODULES = \
+       clean-apache \
+       clean-autoconf \
+       clean-bfd \
+       clean-binutils \
+       clean-byacc \
+       clean-cvs \
+       clean-dejagnu \
+       clean-diff \
+       clean-dosutils \
+       clean-etc \
+       clean-fileutils \
+       clean-find \
+       clean-flex \
+       clean-gas \
+       clean-gawk \
+       clean-gprof \
+       clean-grep \
+       clean-grez \
+       clean-gzip \
+       clean-hello \
+       clean-indent \
+       clean-inet \
+       clean-ispell \
+       clean-ld \
+       clean-libiberty \
+       clean-m4 \
+       clean-make \
+       clean-mmalloc \
+       clean-opcodes \
+       clean-patch \
+       clean-perl \
+       clean-prms \
+       clean-rcs \
+       clean-readline \
+       clean-release \
+       clean-recode \
+       clean-sed \
+       clean-send-pr \
+       clean-shellutils \
+       clean-sim \
+       clean-tar \
+       clean-tcl \
+       clean-texinfo \
+       clean-textutils \
+       clean-tgas \
+       clean-time \
+       clean-uudecode \
+       clean-wdiff
+
+# All of the target modules that can be cleaned
+CLEAN_TARGET_MODULES = \
+       clean-target-libio \
+       clean-target-libstdc++ \
+       clean-target-librx \
+       clean-target-libg++ \
+       clean-target-newlib \
+       clean-target-winsup \
+       clean-target-libgloss \
+       clean-target-libiberty \
+       clean-target-examples
+
+# All of the x11 modules that can be cleaned
+CLEAN_X11_MODULES = \
+       clean-emacs \
+       clean-emacs19 \
+       clean-gdb \
+       clean-expect \
+       clean-gash \
+       clean-guile \
+       clean-tclX \
+       clean-tk
 
 # The first rule in the file had better be this one.  Don't put any above it.
 all: all.normal
@@ -638,30 +759,46 @@ $(DO_X):
        @target=`echo $@ | sed -e 's/^do-//'`; \
        r=`pwd`; export r; \
        srcroot=`cd $(srcdir); pwd`; export srcroot; \
-       for i in $(SUBDIRS) $(TARGET_CONFIGDIRS); do \
+       $(SET_LIB_PATH) \
+       for i in $(SUBDIRS) -dummy-; do \
          if [ -f ./$$i/Makefile ]; then \
            case $$i in \
-           $(TARGET_LIBS) ) \
-             for flag in $(EXTRA_TARGET_FLAGS); do \
-               eval `echo "$$flag" | sed -e "s|^\(.*\)=\(.*\)|\1='\2'|"`; \
-             done; \
-             ;; \
            gcc) \
              for flag in $(EXTRA_GCC_FLAGS); do \
-               eval `echo "$$flag" | sed -e "s|^\(.*\)=\(.*\)|\1='\2'|"`; \
+               eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'|"`; \
              done; \
              ;; \
            *) \
              for flag in $(EXTRA_HOST_FLAGS); do \
-               eval `echo "$$flag" | sed -e "s|^\(.*\)=\(.*\)|\1='\2'|"`; \
+               eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'|"`; \
              done; \
              ;; \
            esac ; \
-           export AR AS CC CXX NM RANLIB; \
+           export AR AS CC CXX NM RANLIB DLLTOOL; \
            if (cd ./$$i; \
                $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                        "CC=$${CC}" "CXX=$${CXX}" "NM=$${NM}" \
                        "RANLIB=$${RANLIB}" \
+                       "DLLTOOL=$${DLLTOOL}" \
+                       $${target}); \
+           then true; else exit 1; fi; \
+         else true; fi; \
+       done
+       @target=`echo $@ | sed -e 's/^do-//'`; \
+       r=`pwd`; export r; \
+       srcroot=`cd $(srcdir); pwd`; export srcroot; \
+       $(SET_LIB_PATH) \
+       for i in $(TARGET_CONFIGDIRS) -dummy-; do \
+         if [ -f $(TARGET_SUBDIR)/$$i/Makefile ]; then \
+           for flag in $(EXTRA_TARGET_FLAGS); do \
+               eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'|"`; \
+           done; \
+           export AR AS CC CXX NM RANLIB DLLTOOL; \
+           if (cd $(TARGET_SUBDIR)/$$i; \
+               $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+                       "CC=$${CC}" "CXX=$${CXX}" "NM=$${NM}" \
+                       "RANLIB=$${RANLIB}" \
+                       "DLLTOOL=$${DLLTOOL}" \
                        $${target}); \
            then true; else exit 1; fi; \
          else true; fi; \
@@ -687,6 +824,9 @@ local-clean:
 
 local-distclean:
        -rm -f Makefile config.status
+       -if [ "$(TARGET_SUBDIR)" != "." ]; then \
+         rm -rf $(TARGET_SUBDIR); \
+       else true; fi
 
 local-maintainer-clean:
        @echo "This command is intended for maintainers to use;"
@@ -699,6 +839,33 @@ maintainer-clean: local-maintainer-clean do-maintainer-clean local-clean
 maintainer-clean: local-distclean
 realclean: maintainer-clean
 
+# This rule is used to clean specific modules.
+.PHONY: $(CLEAN_MODULES) $(CLEAN_X11_MODULES) clean-gcc
+$(CLEAN_MODULES) $(CLEAN_X11_MODULES) clean-gcc:
+       @dir=`echo $@ | sed -e 's/clean-//'`; \
+       if [ -f ./$${dir}/Makefile ] ; then \
+         r=`pwd`; export r; \
+         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         $(SET_LIB_PATH) \
+         (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) clean); \
+       else \
+         true; \
+       fi
+
+.PHONY: $(CLEAN_TARGET_MODULES)
+$(CLEAN_TARGET_MODULES):
+       @dir=`echo $@ | sed -e 's/clean-target-//'`; \
+       if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
+         r=`pwd`; export r; \
+         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         $(SET_LIB_PATH) \
+         (cd $(TARGET_SUBDIR)/$${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) clean); \
+       else \
+         true; \
+       fi
+
+clean-target: $(CLEAN_TARGET_MODULES)
+
 # Check target.
 
 .PHONY: check
@@ -734,12 +901,18 @@ vault-install:
 install.all: install-no-fixedincludes
        @if [ -f ./gcc/Makefile ] ; then \
                r=`pwd` ; export r ; \
+               $(SET_LIB_PATH) \
                (cd ./gcc; \
                $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
        else \
                true ; \
        fi
 
+# inet-install is used because the I*Net wants DejaGNU installed but
+# not built.
+inet-install:
+       $(MAKE) INSTALL_MODULES=`echo $(INSTALL_MODULES) | sed -e 's/install-dejagnu//'` install
+
 # install-no-fixedincludes is used because Cygnus can not distribute
 # the fixed header files.
 .PHONY: install-no-fixedincludes
@@ -764,6 +937,7 @@ gcc-no-fixedincludes:
          rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
          r=`pwd`; export r; \
          srcroot=`cd $(srcdir); pwd` ; export srcroot; \
+         $(SET_LIB_PATH) \
          (cd ./gcc; \
           $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
          rm -rf gcc/include; \
@@ -782,6 +956,7 @@ $(ALL_MODULES) all-gui all-libproc:
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
          srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         $(SET_LIB_PATH) \
          (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) all); \
        else \
          true; \
@@ -798,6 +973,7 @@ $(NATIVE_CHECK_MODULES):
          if [ -f ./$${dir}/Makefile ] ; then \
            r=`pwd`; export r; \
            srcroot=`cd $(srcdir); pwd`; export srcroot; \
+           $(SET_LIB_PATH) \
            (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) check); \
          else \
            true; \
@@ -809,6 +985,7 @@ $(CROSS_CHECK_MODULES):
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
          srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         $(SET_LIB_PATH) \
          (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) check); \
        else \
          true; \
@@ -822,6 +999,7 @@ $(INSTALL_MODULES): install-dirs
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
          srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         $(SET_LIB_PATH) \
          (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) install); \
        else \
          true; \
@@ -831,28 +1009,72 @@ $(INSTALL_MODULES): install-dirs
 # target tools.
 .PHONY: $(CONFIGURE_TARGET_MODULES)
 $(CONFIGURE_TARGET_MODULES):
-       @dir=`echo $@ | sed -e 's/configure-//'`; \
-       if [ -f ./$${dir}/Makefile ] ; then \
+       @dir=`echo $@ | sed -e 's/configure-target-//'`; \
+       if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
          true; \
        elif echo " $(TARGET_CONFIGDIRS) " | grep " $${dir} " >/dev/null 2>&1; then \
          if [ -d $(srcdir)/$${dir} ]; then \
-           if [ -d ./$${dir} ]; then true; else mkdir $${dir}; fi; \
+           [ -d $(TARGET_SUBDIR)/$${dir} ] || mkdir $(TARGET_SUBDIR)/$${dir};\
            r=`pwd`; export r; \
            srcroot=`cd $(srcdir); pwd`; export srcroot; \
+           $(SET_LIB_PATH) \
            AR="$(AR_FOR_TARGET)"; export AR; \
            AS="$(AS_FOR_TARGET)"; export AS; \
            CC="$(CC_FOR_TARGET)"; export CC; \
            CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
            CXX="$(CXX_FOR_TARGET)"; export CXX; \
            CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+           DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
            LD="$(LD_FOR_TARGET)"; export LD; \
            NM="$(NM_FOR_TARGET)"; export NM; \
            RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-           cd $${dir}; \
-           $${srcroot}/configure $(CONFIG_ARGUMENTS) --srcdir=$${srcroot}/$${dir}; \
+           echo Configuring in $(TARGET_SUBDIR)/$${dir}; \
+           cd $(TARGET_SUBDIR)/$${dir}; \
+           case $(srcdir) in \
+           /*) \
+             topdir=$(srcdir) ;; \
+           *) \
+             case "$(TARGET_SUBDIR)" in \
+             .) topdir="../$(srcdir)" ;; \
+             *) topdir="../../$(srcdir)" ;; \
+             esac ;; \
+           esac; \
+           if [ "$(srcdir)" = "." ] ; then \
+             if [ "$(TARGET_SUBDIR)" != "." ] ; then \
+               if $(SHELL) $${srcroot}/symlink-tree $${topdir}/$${dir} "no-such-file" ; then \
+                 if [ -f Makefile ]; then \
+                   if $(MAKE) distclean; then \
+                     true; \
+                   else \
+                     exit 1; \
+                   fi; \
+                 else \
+                   true; \
+                 fi; \
+               else \
+                 exit 1; \
+               fi; \
+             else \
+               true; \
+             fi; \
+             srcdiroption="--srcdir=."; \
+             libsrcdir="."; \
+           else \
+             srcdiroption="--srcdir=$${topdir}/$${dir}"; \
+             libsrcdir="$${srcroot}/$${dir}"; \
+           fi; \
+           if [ -f $${libsrcdir}/configure ] ; then \
+             $(SHELL) $${libsrcdir}/configure \
+               $(CONFIG_ARGUMENTS) $${srcdiroption} \
+               --with-target-subdir="$(TARGET_SUBDIR)"; \
+           else \
+             $(SHELL) $${srcroot}/configure \
+               $(CONFIG_ARGUMENTS) $${srcdiroption} \
+               --with-target-subdir="$(TARGET_SUBDIR)"; \
+           fi; \
          else \
            true; \
-         fi \
+         fi; \
        else \
          true; \
        fi
@@ -861,11 +1083,12 @@ $(CONFIGURE_TARGET_MODULES):
 # To build a target all-X means to cd to X and make all.
 .PHONY: $(ALL_TARGET_MODULES)
 $(ALL_TARGET_MODULES):
-       @dir=`echo $@ | sed -e 's/all-//'`; \
-       if [ -f ./$${dir}/Makefile ] ; then \
+       @dir=`echo $@ | sed -e 's/all-target-//'`; \
+       if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
          srcroot=`cd $(srcdir); pwd`; export srcroot; \
-         (cd $${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) all); \
+         $(SET_LIB_PATH) \
+         (cd $(TARGET_SUBDIR)/$${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) all); \
        else \
          true; \
        fi
@@ -874,11 +1097,12 @@ $(ALL_TARGET_MODULES):
 # To build a target install-X means to cd to X and make install.
 .PHONY: $(CHECK_TARGET_MODULES)
 $(CHECK_TARGET_MODULES):
-       @dir=`echo $@ | sed -e 's/check-//'`; \
-       if [ -f ./$${dir}/Makefile ] ; then \
+       @dir=`echo $@ | sed -e 's/check-target-//'`; \
+       if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
          srcroot=`cd $(srcdir); pwd`; export srcroot; \
-         (cd $${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) check); \
+         $(SET_LIB_PATH) \
+         (cd $(TARGET_SUBDIR)/$${dir};$(MAKE) $(TARGET_FLAGS_TO_PASS) check);\
        else \
          true; \
        fi
@@ -888,11 +1112,13 @@ $(CHECK_TARGET_MODULES):
 # and make install.
 .PHONY: $(INSTALL_TARGET_MODULES)
 $(INSTALL_TARGET_MODULES): install-dirs
-       @dir=`echo $@ | sed -e 's/install-//'`; \
-       if [ -f ./$${dir}/Makefile ] ; then \
+       @dir=`echo $@ | sed -e 's/install-target-//'`; \
+       if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
          srcroot=`cd $(srcdir); pwd`; export srcroot; \
-         (cd $${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) install); \
+         $(SET_LIB_PATH) \
+         (cd $(TARGET_SUBDIR)/$${dir}; \
+           $(MAKE) $(TARGET_FLAGS_TO_PASS) install); \
        else \
          true; \
        fi
@@ -905,6 +1131,7 @@ $(ALL_X11_MODULES):
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
          srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         $(SET_LIB_PATH) \
          (cd $${dir}; \
           $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all); \
        else \
@@ -919,6 +1146,7 @@ $(CHECK_X11_MODULES):
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
          srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         $(SET_LIB_PATH) \
          (cd $${dir}; \
           $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check); \
        else \
@@ -933,6 +1161,7 @@ $(INSTALL_X11_MODULES):
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
          srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         $(SET_LIB_PATH) \
          (cd $${dir}; \
           $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install); \
        else \
@@ -945,16 +1174,29 @@ all-gcc:
        @if [ -f ./gcc/Makefile ] ; then \
          r=`pwd`; export r; \
          srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         $(SET_LIB_PATH) \
          (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
        else \
          true; \
        fi
 
+.PHONY: all-bootstrap
+all-bootstrap:
+       @if [ -f ./gcc/Makefile ] ; then \
+         r=`pwd`; export r; \
+         srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         $(SET_LIB_PATH) \
+         (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) bootstrap); \
+       else \
+         true; \
+       fi
+
 .PHONY: check-gcc
 check-gcc:
        @if [ -f ./gcc/Makefile ] ; then \
          r=`pwd`; export r; \
          srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         $(SET_LIB_PATH) \
          (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) check); \
        else \
          true; \
@@ -965,6 +1207,7 @@ install-gcc:
        @if [ -f ./gcc/Makefile ] ; then \
          r=`pwd`; export r; \
          srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         $(SET_LIB_PATH) \
          (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
        else \
          true; \
@@ -980,6 +1223,7 @@ install-dosrel: install-dirs info
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
          srcroot=`cd $(srcdir); pwd`; export srcroot; \
+         $(SET_LIB_PATH) \
          (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) install); \
        else \
          true; \
@@ -989,6 +1233,7 @@ install-dosrel-fake:
 
 
 # This is a list of inter-dependencies among modules.
+all-apache:
 all-autoconf: all-m4
 all-bfd:
 all-binutils: all-libiberty all-opcodes all-bfd all-flex all-byacc
@@ -999,6 +1244,8 @@ all-diff: all-libiberty
 all-emacs:
 all-emacs19: all-byacc
 all-etc:
+configure-target-examples: $(ALL_GCC)
+all-target-examples: configure-target-examples
 all-expect: all-tcl all-tk
 all-fileutils: all-libiberty
 all-find:
@@ -1006,34 +1253,41 @@ all-flex: all-libiberty all-byacc
 all-gas: all-libiberty all-opcodes all-bfd
 all-gash: all-tcl
 all-gawk:
+ALL_GCC = all-gcc
 all-gcc: all-libiberty all-byacc all-binutils all-gas all-ld
-all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-byacc all-sim $(gdbnlmrequirements)
-all-gprof: all-libiberty all-bfd
+all-bootstrap: all-libiberty all-byacc all-binutils all-gas all-ld
+GDB_TK = all-tk all-tcl
+all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
+all-gprof: all-libiberty all-bfd all-opcodes
 all-grep: all-libiberty
-all-gui: all-gdb all-libproc all-librx
+all-grez: all-libiberty all-bfd all-opcodes
+all-gui: all-gdb all-libproc all-target-librx
+all-guile:
 all-gzip: all-libiberty
 all-hello: all-libiberty
 all-indent:
+all-inet: all-tcl all-send-pr all-perl
 all-ispell: all-emacs19
-all-ld: all-libiberty all-bfd all-byacc all-flex
-configure-libg++: all-gcc
-all-libg++: configure-libg++ all-gas all-ld all-gcc all-xiberty all-newlib all-libio all-librx all-libstdc++
-configure-libgloss: all-gcc
-all-libgloss: configure-libgloss
-configure-libio: all-gcc
-all-libio: configure-libio all-gas all-ld all-gcc all-xiberty all-newlib
+all-ld: all-libiberty all-bfd all-opcodes all-byacc all-flex
+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)
+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
 all-libiberty:
-configure-librx: all-gcc all-newlib
-all-librx: configure-librx
-configure-libstdc++: all-gcc
-all-libstdc++: configure-libstdc++ all-gas all-ld all-gcc all-xiberty all-newlib all-libio
+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
 all-m4: all-libiberty
 all-make: all-libiberty
 all-mmalloc:
-configure-newlib: all-gcc
-all-newlib: configure-newlib all-binutils all-gas all-gcc
-all-opcodes: all-bfd
-all-patch:
+configure-target-newlib: $(ALL_GCC)
+all-target-newlib: configure-target-newlib all-binutils all-gas all-gcc
+all-opcodes: all-bfd all-libiberty
+all-patch: all-libiberty
+all-perl:
 all-prms: all-libiberty
 all-rcs:
 all-readline:
@@ -1041,21 +1295,23 @@ all-recode: all-libiberty
 all-sed: all-libiberty
 all-send-pr: all-prms
 all-shellutils:
-all-sim: all-libiberty all-bfd
+all-sim: all-libiberty all-bfd all-opcodes
 all-tar: all-libiberty
 all-tcl:
 all-tclX: all-tcl all-tk
 all-tk: all-tcl
 all-texinfo: all-libiberty
 all-textutils:
-all-tgas: all-libiberty all-bfd
+all-tgas: all-libiberty all-bfd all-opcodes
 all-time:
 all-wdiff:
-all-winsup: all-newlib 
-configure-winsup: configure-newlib
+all-target-winsup: all-target-newlib all-target-libiberty configure-target-winsup 
+configure-target-winsup: configure-target-newlib
 all-uudecode: all-libiberty
-configure-xiberty: all-gcc
-all-xiberty: configure-xiberty all-gcc all-ld all-newlib
+configure-target-libiberty: $(ALL_GCC)
+all-target-libiberty: configure-target-libiberty all-gcc all-ld all-target-newlib
+all-target: $(ALL_TARGET_MODULES)
+install-target: $(INSTALL_TARGET_MODULES)
 
 ### other supporting targets
 
@@ -1117,14 +1373,14 @@ Makefile: Makefile.in configure.in $(host_makefile_frag) $(target_makefile_frag)
 DEVO_SUPPORT= README Makefile.in configure configure.in \
        config.guess config.sub config move-if-change \
        mpw-README mpw-build.in mpw-config.in mpw-configure \
-       COPYING COPYING.LIB install.sh
+       COPYING COPYING.LIB install.sh config-ml.in symlink-tree
 
 # Files in devo/etc used in any net release.
 # ChangeLog omitted because it may refer to files which are not in this
 # distribution (perhaps it would be better to include it anyway).
 ETC_SUPPORT= Makefile.in cfg-paper.texi configure.in configure.man \
-       configure.texi standards.texi make-stds.texi
-ETC_SUPPORT_PFX=configure.info standards.info cfg-paper.info
+       configure.texi standards.texi make-stds.texi \
+       configure.info* standards.info* cfg-paper.info*
 
 # When you use `make setup-dirs' or `make taz' you should always redefine
 # this macro.
@@ -1155,15 +1411,19 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \
        @if [ -f .Sanitize ] ; then echo "RUN Sanitize FIRST!" ; false ; fi ;
        $(end-sanitize-Sanitize)
        ./configure sun4
+       [ -z "$(CONFIGURE_TARGET_MODULES)" ] \
+         || $(MAKE) $(CONFIGURE_TARGET_MODULES) ALL_GCC="" \
+           CC_FOR_TARGET="$(CC)" CXX_FOR_TARGET="$(CXX)"
        # Make links, and run "make diststuff" or "make info" when needed.
        rm -rf proto-toplev ; mkdir proto-toplev
        set -e ; dirs="$(TOOL) $(DEVO_SUPPORT) $(SUPPORT_FILES)" ; \
        for d in $$dirs ; do \
          if [ -d $$d ]; then \
-           if grep '^diststuff:' $$d/Makefile >/dev/null ; then \
-               (cd $$d ; $(MAKE) diststuff ) || exit 1  ; \
+           if [ ! -f $$d/Makefile ] ; then true ; \
+           elif grep '^diststuff:' $$d/Makefile >/dev/null ; then \
+               (cd $$d ; $(MAKE) diststuff ) || exit 1 ; \
            elif grep '^info:' $$d/Makefile >/dev/null ; then \
-               (cd $$d ; $(MAKE) info ) || exit 1  ; \
+               (cd $$d ; $(MAKE) info ) || exit 1 ; \
            fi ; \
            if [ -d $$d/proto-$$d.dir ]; then \
              ln -s ../$$d/proto-$$d.dir proto-toplev/$$d ; \
@@ -1179,9 +1439,6 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \
        (cd proto-toplev/etc; \
         for i in $(ETC_SUPPORT); do \
                ln -s ../../etc/$$i . ; \
-        done ; \
-        for i in $(ETC_SUPPORT_PFX); do \
-               ln -s ../../etc/$$i* . ; \
         done)
        #
        # Take out texinfo from configurable dirs
@@ -1224,7 +1481,7 @@ gas+binutils.tar.gz: $(DIST_SUPPORT) $(GASB_SUPPORT_DIRS) gas
                SUPPORT_FILES="$(GASB_SUPPORT_DIRS) makeall.bat configure.bat"
 
 .PHONY: libg++.tar.gz
-LIBGXX_SUPPORT_DIRS=include libstdc++ libio librx libiberty xiberty
+LIBGXX_SUPPORT_DIRS=include libstdc++ libio librx libiberty
 libg++.tar.gz: $(DIST_SUPPORT) libg++
        $(MAKE) -f Makefile.in taz TOOL=libg++ \
                SUPPORT_FILES="$(LIBGXX_SUPPORT_DIRS)"
@@ -1249,15 +1506,12 @@ NEWLIB_SUPPORT_DIRS=libgloss
 # taz will build the .info files but since SUBDIRS won't contain newlib,
 # distclean won't be run (leaving Makefile, config.status, and the tmp files
 # used in building the .info files, eg: *.def, *.ref).
-# Compensate here by configuring newlib for a simple (no multilib support)
-# cross target (sparc64), building the info files, and doing make distclean
-# ourselves.
+# The problem isn't solvable however without a lot of extra work because
+# target libraries are built in subdir $(target_alias) which gets nuked during
+# the make distclean.  For now punt on the issue of shipping newlib info files
+# with newlib net releases and wait for a day when some native target (sun4?)
+# supports newlib (if only minimally).
 newlib.tar.gz: $(DIST_SUPPORT) $(NEWLIB_SUPPORT_DIRS) newlib
-       rootme=`pwd` ; \
-         cd newlib && ../configure --srcdir $$rootme/newlib \
-               --host sun4 --target sparc64-elf
-       cd newlib ; make info
-       cd newlib ; make distclean
        $(MAKE) -f Makefile.in taz TOOL=newlib \
                SUPPORT_FILES="$(NEWLIB_SUPPORT_DIRS)" \
                DEVO_SUPPORT="$(DEVO_SUPPORT) COPYING.NEWLIB" newlib