Modified Files:

[deliverable/binutils-gdb.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index f90e09eb98c2d2f31dc61bee89570354b96b9558..61551bb3d36adcb19be8e3b09cee20f77e7ff145 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,14 +50,15 @@ INSTALL_PROGRAM = $(INSTALL)
 INSTALL_DATA = $(INSTALL) -m 644
 INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
 
+INSTALL_DOSREL = install-dosrel-fake
+
 AS = as
 AR = ar
 AR_FLAGS = rc
 CC = cc
 
-# If any variables are added here, they must be added to do-*, below.
-# The HOST_* variables are a special case, which are used for the gcc
-# cross-building scheme.
+# Special variables passed down in EXTRA_GCC_FLAGS.  They are defined
+# here so that they can be overridden by Makefile fragments.
 HOST_CC = $(CC_FOR_BUILD)
 HOST_PREFIX = 
 HOST_PREFIX_1 = loser-
@@ -129,7 +130,7 @@ INSTALL_TARGET = install-dirs \
        $(INSTALL_TARGET_MODULES) \
        $(INSTALL_X11_MODULES) \
        install-gcc \
-       $(INSTALL_LAST)
+       $(INSTALL_DOSREL)
 
 
 CC_FOR_TARGET = ` \
@@ -220,6 +221,7 @@ NM_FOR_TARGET = ` \
     fi; \
   fi`
 
+
 #### host and target specific makefile fragments come in here.
 ###
 
@@ -298,7 +300,9 @@ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
 # Flags to pass down to gcc.  gcc builds a library, libgcc.a, so it
 # unfortunately needs the native compiler and the target ar and
 # ranlib.
-
+# If any variables are added here, they must be added to do-*, below.
+# The HOST_* variables are a special case, which are used for the gcc
+# cross-building scheme.
 EXTRA_GCC_FLAGS = \
        'AR=$$(AR_FOR_TARGET)' \
        'AS=$(AS)' \
@@ -362,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 \
@@ -411,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 = \
@@ -682,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; \
@@ -836,8 +872,8 @@ install-gcc:
 # EXPERIMENTAL STUFF
 # This rule is used to install the modules which use FLAGS_TO_PASS.
 # To build a target install-X means to cd to X and make install.
-.PHONY: $(INSTALL_LAST)
-$(INSTALL_LAST): install-dirs
+.PHONY: install-dosrel
+install-dosrel: install-dirs info
        @dir=`echo $@ | sed -e 's/install-//'`; \
        if [ -f ./$${dir}/Makefile ] ; then \
          r=`pwd`; export r; \
@@ -847,6 +883,8 @@ $(INSTALL_LAST): install-dirs
          true; \
        fi
 
+install-dosrel-fake:
+
 
 # This is a list of inter-dependencies among modules.
 all-autoconf: all-m4
@@ -873,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: