* gcc.c (cpp_options): Delete .d files on error. Don't delete

[pf3gnuchains/gcc-fork.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 93cf3f9..24182f9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -370,6 +370,8 @@ BASE_FLAGS_TO_PASS = \
        "libdir=$(libdir)" \
        "libexecdir=$(libexecdir)" \
        "lispdir=$(lispdir)" \
+       "libstdcxx_incdir=$(libstdcxx_incdir)" \
+       "libsubdir=$(libsubdir)" \
        "localstatedir=$(localstatedir)" \
        "mandir=$(mandir)" \
        "oldincludedir=$(oldincludedir)" \
@@ -382,8 +384,7 @@ BASE_FLAGS_TO_PASS = \
        "gxx_include_dir=$(gxx_include_dir)" \
        "gcc_version=$(gcc_version)" \
        "gcc_version_trigger=$(gcc_version_trigger)" \
-       "target_alias=$(target_alias)" \
-       "libsubdir=$(libsubdir)"
+       "target_alias=$(target_alias)" 
 
 # Flags to pass down to most sub-makes, in which we're building with
 # the host environment.
@@ -485,6 +486,7 @@ ALL_MODULES = \
        all-diff \
        all-dosutils \
        all-etc \
+       all-fastjar \
        all-fileutils \
        all-findutils \
        all-find \
@@ -545,6 +547,7 @@ ALL_MODULES = \
 NATIVE_CHECK_MODULES = \
        check-bison \
        check-byacc \
+       check-fastjar \
        check-flex \
        check-zip
 
@@ -636,6 +639,7 @@ INSTALL_MODULES = \
        install-diff \
        install-dosutils \
        install-etc \
+       install-fastjar \
        install-fileutils \
        install-findutils \
        install-find \
@@ -838,6 +842,7 @@ CLEAN_MODULES = \
        clean-diff \
        clean-dosutils \
        clean-etc \
+       clean-fastjar \
        clean-fileutils \
        clean-findutils \
        clean-find \
@@ -1029,7 +1034,7 @@ local-distclean:
        -rm -f texinfo/doc/Makefile texinfo/po/POTFILES
        -rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
        -rmdir texinfo/makeinfo texinfo/po texinfo/util 2>/dev/null
-       -rmdir gcc libiberty texinfo zlib 2>/dev/null
+       -rmdir fastjar gcc libiberty texinfo zlib 2>/dev/null
 
 local-maintainer-clean:
        @echo "This command is intended for maintainers to use;"
@@ -1282,9 +1287,9 @@ $(CONFIGURE_TARGET_MODULES):
            RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
            WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
            echo Configuring in $(TARGET_SUBDIR)/$${dir}; \
-           cd $(TARGET_SUBDIR)/$${dir}; \
+           cd "$(TARGET_SUBDIR)/$${dir}" || exit 1; \
            case $(srcdir) in \
-           /*) \
+           /* | [A-Za-z]:[\\/]*) \
              topdir=$(srcdir) ;; \
            *) \
              case "$(TARGET_SUBDIR)" in \
@@ -1326,7 +1331,7 @@ $(CONFIGURE_TARGET_MODULES):
              CONFIG_SITE=no-such-file $(SHELL) $$s/configure \
                $(CONFIG_ARGUMENTS) $${srcdiroption} \
                --with-target-subdir="$(TARGET_SUBDIR)"; \
-           fi; \
+           fi || exit 1; \
            if [ -f skip-this-dir ] ; then \
              sh skip-this-dir; \
              rm -f skip-this-dir; \
@@ -1615,7 +1620,7 @@ all-libiberty:
 configure-target-libffi: $(ALL_GCC_C) 
 all-target-libffi: configure-target-libffi
 configure-target-libjava: $(ALL_GCC_CXX) configure-target-zlib configure-target-boehm-gc configure-target-qthreads configure-target-libffi
-all-target-libjava: configure-target-libjava all-zip all-target-zlib all-target-boehm-gc all-target-qthreads all-target-libffi
+all-target-libjava: configure-target-libjava all-fastjar all-target-zlib all-target-boehm-gc all-target-qthreads all-target-libffi
 configure-target-librx: $(ALL_GCC_C)
 all-target-librx: configure-target-librx
 configure-target-libstdc++: $(ALL_GCC_C)
@@ -1671,6 +1676,9 @@ all-zip:
 all-zlib:
 configure-target-zlib: $(ALL_GCC_C)
 all-target-zlib: configure-target-zlib
+all-fastjar: all-zlib
+configure-target-fastjar: configure-target-zlib
+all-target-fastjar: configure-target-fastjar all-target-zlib
 configure-target-libiberty: $(ALL_GCC_C)
 all-target-libiberty: configure-target-libiberty
 all-target: $(ALL_TARGET_MODULES)