From a2d366fa30e4cf54cd24a06019a4227574203640 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 28 Dec 2004 17:39:43 +0000 Subject: [PATCH] 2004-12-28 Paolo Bonzini PR bootstrap/17383 * Makefile.def (target_modules): Remove stage parameter, it is always true now. * Makefile.tpl (configure-build-[+module+], configure-target-[+module+]): Always build symlink tree for the directory and for include. BUILD_SUBDIR and TARGET_SUBDIR cannot be . anymore. * Makefile.in: Regenerate. --- ChangeLog | 12 + Makefile.def | 4 +- Makefile.in | 857 +++++++++++++++++++++++++++++++++++---------------- Makefile.tpl | 74 +++-- 4 files changed, 642 insertions(+), 305 deletions(-) diff --git a/ChangeLog b/ChangeLog index e73483e36..c7a54ca5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2004-12-28 Paolo Bonzini + + PR bootstrap/17383 + + * Makefile.def (target_modules): Remove stage parameter, + it is always true now. + * Makefile.tpl (configure-build-[+module+], + configure-target-[+module+]): Always build symlink tree + for the directory and for include. BUILD_SUBDIR and + TARGET_SUBDIR cannot be . anymore. + * Makefile.in: Regenerate. + 2004-12-25 David Edelsohn Revert 2004-12-08 Makefile changes. diff --git a/Makefile.def b/Makefile.def index 5a7f31976..01ce257e3 100644 --- a/Makefile.def +++ b/Makefile.def @@ -117,7 +117,7 @@ target_modules = { module= libmudflap; }; target_modules = { module= newlib; }; target_modules = { module= libgfortran; }; target_modules = { module= libobjc; }; -target_modules = { module= libtermcap; no_check=true; stage=true; +target_modules = { module= libtermcap; no_check=true; missing=mostlyclean; missing=clean; missing=distclean; @@ -129,7 +129,7 @@ target_modules = { module= gperf; }; target_modules = { module= examples; no_check=true; no_install=true; }; target_modules = { module= libffi; }; target_modules = { module= libjava; raw_cxx=true; }; -target_modules = { module= zlib; stage=true; }; +target_modules = { module= zlib; }; target_modules = { module= boehm-gc; }; target_modules = { module= qthreads; }; target_modules = { module= rda; }; diff --git a/Makefile.in b/Makefile.in index 45c405930..d979b84e9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2174,31 +2174,30 @@ configure-build-libiberty: echo Configuring in $(BUILD_SUBDIR)/libiberty; \ cd "$(BUILD_SUBDIR)/libiberty" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(BUILD_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ if [ "$(srcdir)" = "." ] ; then \ - if [ "$(BUILD_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/libiberty "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ + if $(SHELL) $$s/symlink-tree $${topdir}/libiberty "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ true; \ + else \ + exit 1; \ fi; \ else \ - exit 1; \ + true; \ fi; \ else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../libiberty; \ fi; \ srcdiroption="--srcdir=."; \ libsrcdir="."; \ @@ -2239,31 +2238,30 @@ configure-build-bison: echo Configuring in $(BUILD_SUBDIR)/bison; \ cd "$(BUILD_SUBDIR)/bison" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(BUILD_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ if [ "$(srcdir)" = "." ] ; then \ - if [ "$(BUILD_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/bison "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ + if $(SHELL) $$s/symlink-tree $${topdir}/bison "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ true; \ + else \ + exit 1; \ fi; \ else \ - exit 1; \ + true; \ fi; \ else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../bison; \ fi; \ srcdiroption="--srcdir=."; \ libsrcdir="."; \ @@ -2304,31 +2302,30 @@ configure-build-byacc: echo Configuring in $(BUILD_SUBDIR)/byacc; \ cd "$(BUILD_SUBDIR)/byacc" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(BUILD_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ if [ "$(srcdir)" = "." ] ; then \ - if [ "$(BUILD_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/byacc "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ + if $(SHELL) $$s/symlink-tree $${topdir}/byacc "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ true; \ + else \ + exit 1; \ fi; \ else \ - exit 1; \ + true; \ fi; \ else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../byacc; \ fi; \ srcdiroption="--srcdir=."; \ libsrcdir="."; \ @@ -2369,31 +2366,30 @@ configure-build-flex: echo Configuring in $(BUILD_SUBDIR)/flex; \ cd "$(BUILD_SUBDIR)/flex" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(BUILD_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ if [ "$(srcdir)" = "." ] ; then \ - if [ "$(BUILD_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/flex "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ + if $(SHELL) $$s/symlink-tree $${topdir}/flex "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ true; \ + else \ + exit 1; \ fi; \ else \ - exit 1; \ + true; \ fi; \ else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../flex; \ fi; \ srcdiroption="--srcdir=."; \ libsrcdir="."; \ @@ -2434,31 +2430,30 @@ configure-build-m4: echo Configuring in $(BUILD_SUBDIR)/m4; \ cd "$(BUILD_SUBDIR)/m4" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(BUILD_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ if [ "$(srcdir)" = "." ] ; then \ - if [ "$(BUILD_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/m4 "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ + if $(SHELL) $$s/symlink-tree $${topdir}/m4 "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ true; \ + else \ + exit 1; \ fi; \ else \ - exit 1; \ + true; \ fi; \ else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../m4; \ fi; \ srcdiroption="--srcdir=."; \ libsrcdir="."; \ @@ -2499,31 +2494,30 @@ configure-build-texinfo: echo Configuring in $(BUILD_SUBDIR)/texinfo; \ cd "$(BUILD_SUBDIR)/texinfo" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(BUILD_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ if [ "$(srcdir)" = "." ] ; then \ - if [ "$(BUILD_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/texinfo "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ + if $(SHELL) $$s/symlink-tree $${topdir}/texinfo "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ true; \ + else \ + exit 1; \ fi; \ else \ - exit 1; \ + true; \ fi; \ else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../texinfo; \ fi; \ srcdiroption="--srcdir=."; \ libsrcdir="."; \ @@ -2564,31 +2558,30 @@ configure-build-fixincludes: echo Configuring in $(BUILD_SUBDIR)/fixincludes; \ cd "$(BUILD_SUBDIR)/fixincludes" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(BUILD_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ if [ "$(srcdir)" = "." ] ; then \ - if [ "$(BUILD_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/fixincludes "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ + if $(SHELL) $$s/symlink-tree $${topdir}/fixincludes "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ true; \ + else \ + exit 1; \ fi; \ else \ - exit 1; \ + true; \ fi; \ else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../fixincludes; \ fi; \ srcdiroption="--srcdir=."; \ libsrcdir="."; \ @@ -24261,16 +24254,37 @@ configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \ cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ + if [ "$(srcdir)" = "." ] ; then \ + if $(SHELL) $$s/symlink-tree $${topdir}/libstdc++-v3 "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ + true; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ + true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../libstdc++-v3; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \ libsrcdir="$$s/libstdc++-v3"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) $${srcdiroption} \ @@ -24603,16 +24617,37 @@ configure-target-libmudflap: $(TARGET_SUBDIR)/libmudflap/multilib.out echo Configuring in $(TARGET_SUBDIR)/libmudflap; \ cd "$(TARGET_SUBDIR)/libmudflap" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ + if [ "$(srcdir)" = "." ] ; then \ + if $(SHELL) $$s/symlink-tree $${topdir}/libmudflap "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ + true; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ + true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../libmudflap; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ srcdiroption="--srcdir=$${topdir}/libmudflap"; \ libsrcdir="$$s/libmudflap"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) $${srcdiroption} \ @@ -24945,16 +24980,37 @@ configure-target-newlib: $(TARGET_SUBDIR)/newlib/multilib.out echo Configuring in $(TARGET_SUBDIR)/newlib; \ cd "$(TARGET_SUBDIR)/newlib" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ + if [ "$(srcdir)" = "." ] ; then \ + if $(SHELL) $$s/symlink-tree $${topdir}/newlib "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ + true; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ + true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../newlib; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ srcdiroption="--srcdir=$${topdir}/newlib"; \ libsrcdir="$$s/newlib"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) $${srcdiroption} \ @@ -25287,16 +25343,37 @@ configure-target-libgfortran: $(TARGET_SUBDIR)/libgfortran/multilib.out echo Configuring in $(TARGET_SUBDIR)/libgfortran; \ cd "$(TARGET_SUBDIR)/libgfortran" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ + if [ "$(srcdir)" = "." ] ; then \ + if $(SHELL) $$s/symlink-tree $${topdir}/libgfortran "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ + true; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ + true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../libgfortran; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ srcdiroption="--srcdir=$${topdir}/libgfortran"; \ libsrcdir="$$s/libgfortran"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) $${srcdiroption} \ @@ -25629,16 +25706,37 @@ configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/multilib.out echo Configuring in $(TARGET_SUBDIR)/libobjc; \ cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ + if [ "$(srcdir)" = "." ] ; then \ + if $(SHELL) $$s/symlink-tree $${topdir}/libobjc "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ + true; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ + true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../libobjc; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ srcdiroption="--srcdir=$${topdir}/libobjc"; \ libsrcdir="$$s/libobjc"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) $${srcdiroption} \ @@ -25971,31 +26069,30 @@ configure-target-libtermcap: $(TARGET_SUBDIR)/libtermcap/multilib.out echo Configuring in $(TARGET_SUBDIR)/libtermcap; \ cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ if [ "$(srcdir)" = "." ] ; then \ - if [ "$(TARGET_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/libtermcap "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ + if $(SHELL) $$s/symlink-tree $${topdir}/libtermcap "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ true; \ + else \ + exit 1; \ fi; \ else \ - exit 1; \ + true; \ fi; \ else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../libtermcap; \ fi; \ srcdiroption="--srcdir=."; \ libsrcdir="."; \ @@ -26270,16 +26367,37 @@ configure-target-winsup: $(TARGET_SUBDIR)/winsup/multilib.out echo Configuring in $(TARGET_SUBDIR)/winsup; \ cd "$(TARGET_SUBDIR)/winsup" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ + if [ "$(srcdir)" = "." ] ; then \ + if $(SHELL) $$s/symlink-tree $${topdir}/winsup "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ + true; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ + true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../winsup; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ srcdiroption="--srcdir=$${topdir}/winsup"; \ libsrcdir="$$s/winsup"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) $${srcdiroption} \ @@ -26612,16 +26730,37 @@ configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/multilib.out echo Configuring in $(TARGET_SUBDIR)/libgloss; \ cd "$(TARGET_SUBDIR)/libgloss" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ + if [ "$(srcdir)" = "." ] ; then \ + if $(SHELL) $$s/symlink-tree $${topdir}/libgloss "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ + true; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ + true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../libgloss; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ srcdiroption="--srcdir=$${topdir}/libgloss"; \ libsrcdir="$$s/libgloss"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) $${srcdiroption} \ @@ -26949,16 +27088,37 @@ configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/multilib.out echo Configuring in $(TARGET_SUBDIR)/libiberty; \ cd "$(TARGET_SUBDIR)/libiberty" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ + if [ "$(srcdir)" = "." ] ; then \ + if $(SHELL) $$s/symlink-tree $${topdir}/libiberty "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ + true; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ + true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../libiberty; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ srcdiroption="--srcdir=$${topdir}/libiberty"; \ libsrcdir="$$s/libiberty"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) $${srcdiroption} \ @@ -27291,16 +27451,37 @@ configure-target-gperf: $(TARGET_SUBDIR)/gperf/multilib.out echo Configuring in $(TARGET_SUBDIR)/gperf; \ cd "$(TARGET_SUBDIR)/gperf" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ + if [ "$(srcdir)" = "." ] ; then \ + if $(SHELL) $$s/symlink-tree $${topdir}/gperf "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ + true; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ + true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../gperf; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ srcdiroption="--srcdir=$${topdir}/gperf"; \ libsrcdir="$$s/gperf"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) $${srcdiroption} \ @@ -27633,16 +27814,37 @@ configure-target-examples: $(TARGET_SUBDIR)/examples/multilib.out echo Configuring in $(TARGET_SUBDIR)/examples; \ cd "$(TARGET_SUBDIR)/examples" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ + if [ "$(srcdir)" = "." ] ; then \ + if $(SHELL) $$s/symlink-tree $${topdir}/examples "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ + true; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ + true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../examples; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ srcdiroption="--srcdir=$${topdir}/examples"; \ libsrcdir="$$s/examples"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) $${srcdiroption} \ @@ -27965,16 +28167,37 @@ configure-target-libffi: $(TARGET_SUBDIR)/libffi/multilib.out echo Configuring in $(TARGET_SUBDIR)/libffi; \ cd "$(TARGET_SUBDIR)/libffi" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ + if [ "$(srcdir)" = "." ] ; then \ + if $(SHELL) $$s/symlink-tree $${topdir}/libffi "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ + true; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ + true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../libffi; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ srcdiroption="--srcdir=$${topdir}/libffi"; \ libsrcdir="$$s/libffi"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) $${srcdiroption} \ @@ -28307,16 +28530,37 @@ configure-target-libjava: $(TARGET_SUBDIR)/libjava/multilib.out echo Configuring in $(TARGET_SUBDIR)/libjava; \ cd "$(TARGET_SUBDIR)/libjava" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ + if [ "$(srcdir)" = "." ] ; then \ + if $(SHELL) $$s/symlink-tree $${topdir}/libjava "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ + true; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ + true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../libjava; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ srcdiroption="--srcdir=$${topdir}/libjava"; \ libsrcdir="$$s/libjava"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) $${srcdiroption} \ @@ -28649,31 +28893,30 @@ configure-target-zlib: $(TARGET_SUBDIR)/zlib/multilib.out echo Configuring in $(TARGET_SUBDIR)/zlib; \ cd "$(TARGET_SUBDIR)/zlib" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ if [ "$(srcdir)" = "." ] ; then \ - if [ "$(TARGET_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/zlib "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ + if $(SHELL) $$s/symlink-tree $${topdir}/zlib "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ true; \ + else \ + exit 1; \ fi; \ else \ - exit 1; \ + true; \ fi; \ else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../zlib; \ fi; \ srcdiroption="--srcdir=."; \ libsrcdir="."; \ @@ -29013,16 +29256,37 @@ configure-target-boehm-gc: $(TARGET_SUBDIR)/boehm-gc/multilib.out echo Configuring in $(TARGET_SUBDIR)/boehm-gc; \ cd "$(TARGET_SUBDIR)/boehm-gc" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ + if [ "$(srcdir)" = "." ] ; then \ + if $(SHELL) $$s/symlink-tree $${topdir}/boehm-gc "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ + true; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ + true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../boehm-gc; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ srcdiroption="--srcdir=$${topdir}/boehm-gc"; \ libsrcdir="$$s/boehm-gc"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) $${srcdiroption} \ @@ -29355,16 +29619,37 @@ configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/multilib.out echo Configuring in $(TARGET_SUBDIR)/qthreads; \ cd "$(TARGET_SUBDIR)/qthreads" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ + if [ "$(srcdir)" = "." ] ; then \ + if $(SHELL) $$s/symlink-tree $${topdir}/qthreads "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ + true; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ + true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../qthreads; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ srcdiroption="--srcdir=$${topdir}/qthreads"; \ libsrcdir="$$s/qthreads"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) $${srcdiroption} \ @@ -29697,16 +29982,37 @@ configure-target-rda: $(TARGET_SUBDIR)/rda/multilib.out echo Configuring in $(TARGET_SUBDIR)/rda; \ cd "$(TARGET_SUBDIR)/rda" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ + if [ "$(srcdir)" = "." ] ; then \ + if $(SHELL) $$s/symlink-tree $${topdir}/rda "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ + true; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ + true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../rda; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ srcdiroption="--srcdir=$${topdir}/rda"; \ libsrcdir="$$s/rda"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) $${srcdiroption} \ @@ -30039,16 +30345,37 @@ configure-target-libada: $(TARGET_SUBDIR)/libada/multilib.out echo Configuring in $(TARGET_SUBDIR)/libada; \ cd "$(TARGET_SUBDIR)/libada" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ + if [ "$(srcdir)" = "." ] ; then \ + if $(SHELL) $$s/symlink-tree $${topdir}/libada "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ + true; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ + true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../libada; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ srcdiroption="--srcdir=$${topdir}/libada"; \ libsrcdir="$$s/libada"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) $${srcdiroption} \ diff --git a/Makefile.tpl b/Makefile.tpl index 44c15fd53..d85d0902f 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -822,31 +822,30 @@ configure-build-[+module+]: echo Configuring in $(BUILD_SUBDIR)/[+module+]; \ cd "$(BUILD_SUBDIR)/[+module+]" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(BUILD_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ esac; \ if [ "$(srcdir)" = "." ] ; then \ - if [ "$(BUILD_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ + if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ true; \ + else \ + exit 1; \ fi; \ else \ - exit 1; \ + true; \ fi; \ else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../[+module+]; \ fi; \ srcdiroption="--srcdir=."; \ libsrcdir="."; \ @@ -1032,38 +1031,37 @@ ENDIF raw_cxx +] echo Configuring in $(TARGET_SUBDIR)/[+module+]; \ cd "$(TARGET_SUBDIR)/[+module+]" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ - esac; \[+ IF stage +] + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac; \ if [ "$(srcdir)" = "." ] ; then \ - if [ "$(TARGET_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ + if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ true; \ + else \ + exit 1; \ fi; \ else \ - exit 1; \ + true; \ fi; \ else \ + exit 1; \ + fi; \ + if [ -d ../include ] ; then \ true; \ + else \ + mkdir ../include; \ + cd ../include; \ + $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \ + cd ../[+module+]; \ fi; \ srcdiroption="--srcdir=."; \ libsrcdir="."; \ - else \[+ ENDIF stage +] + else \ srcdiroption="--srcdir=$${topdir}/[+module+]"; \ - libsrcdir="$$s/[+module+]"; \[+ IF stage +] - fi; \[+ ENDIF stage +] + libsrcdir="$$s/[+module+]"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) $${srcdiroption} \