Look for as.new before looking in the path for the binary to test.

[binutils.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 8f49f63756726af2e864db19af5d759d9362072b..61551bb3d36adcb19be8e3b09cee20f77e7ff145 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -366,21 +366,28 @@ ALL_MODULES = \
        all-uudecode \
        all-wdiff 
 
-
 # This is a list of the check targets for all of the modules which are
 # compiled using $(FLAGS_TO_PASS).
-CHECK_MODULES = \
+# This is a list of the check targets for all of the modules which are
+# compiled using $(FLAGS_TO_PASS).
+#
+# The list is in two parts.  The first lists those tools which
+# are tested as part of the host's native tool-chain, and not
+# tested in a cross configuration.
+NATIVE_CHECK_MODULES = \
+       check-byacc \
+       check-flex
+
+CROSS_CHECK_MODULES = \
        check-autoconf \
        check-bfd \
        check-binutils \
-       check-byacc \
        check-cvs \
        check-dejagnu \
        check-diff \
        check-etc \
        check-fileutils \
        check-find \
-       check-flex \
        check-gas \
        check-gawk \
        check-gdb \
@@ -415,6 +422,8 @@ CHECK_MODULES = \
        check-uudecode \
        check-wdiff
 
+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 = \
@@ -686,21 +695,44 @@ gcc-no-fixedincludes:
 # This rule is used to build the modules which use FLAGS_TO_PASS.  To
 # build a target all-X means to cd to X and make all.
 # all-glob is handled specially because it doesn't actually build.
-.PHONY: $(ALL_MODULES) all-glob
-$(ALL_MODULES) all-glob:
+#
+# all-gui and all-libproc are handled specially because they are still
+# experimental, and if they fails to build, that shouldn't stop "make
+# all".
+.PHONY: $(ALL_MODULES) all-glob all-gui
+$(ALL_MODULES) all-glob all-gui all-libproc:
        @dir=`echo $@ | sed -e 's/all-//'`; \
-       if [ -f ./$${dir}/Makefile ] ; then \
-         r=`pwd`; export r; \
-         srcroot=`cd $(srcdir); pwd`; export srcroot; \
-         (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) all); \
+       if [ -d ./$${dir} ] ; then \
+         if [ -f ./$${dir}/Makefile ] ; then \
+           r=`pwd`; export r; \
+           srcroot=`cd $(srcdir); pwd`; export srcroot; \
+           (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) all); \
+         else \
+           true ; \
+         fi; \
        else \
          true; \
        fi
 
 # This rule is used to check the modules which use FLAGS_TO_PASS.  To
 # build a target check-X means to cd to X and make all.
-.PHONY: $(CHECK_MODULES) 
-$(CHECK_MODULES):
+
+.PHONY: $(CHECK_MODULES) $(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES)
+$(NATIVE_CHECK_MODULES):
+       @if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
+         dir=`echo $@ | sed -e 's/check-//'`; \
+         if [ -d ./$${dir} ] ; then \
+           if [ -f ./$${dir}/Makefile ] ; then \
+             r=`pwd`; export r; \
+             srcroot=`cd $(srcdir); pwd`; export srcroot; \
+             (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) check); \
+           else \
+             true; \
+           fi ; \
+         fi; \
+       fi
+
+$(CROSS_CHECK_MODULES):
        @dir=`echo $@ | sed -e 's/check-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
@@ -879,6 +911,7 @@ all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-glob all
 all-glob:
 all-gprof: all-libiberty all-bfd
 all-grep: all-libiberty
+all-gui: all-gdb all-libproc
 all-gzip: all-libiberty
 all-hello: all-libiberty
 all-indent: