diff options
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 22902 |
1 files changed, 8609 insertions, 14293 deletions
diff --git a/Makefile.in b/Makefile.in index eae74a72e..26df74199 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3,7 +3,7 @@ # # Makefile for directory with subdirs to build. # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation +# 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,7 +17,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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # ------------------------------- @@ -72,23 +72,45 @@ LN_S = @LN_S@ # Miscellaneous non-standard autoconf-set variables # ------------------------------------------------- +# The file containing GCC's version number. +gcc_version_trigger = @gcc_version_trigger@ +gcc_version = @gcc_version@ + # The gcc driver likes to know the arguments it was configured with. TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@ +gxx_include_dir = @gxx_include_dir@ +libstdcxx_incdir = @libstdcxx_incdir@ + tooldir = @tooldir@ build_tooldir = @build_tooldir@ +# Directory in which the compiler finds executables, libraries, etc. +libsubdir = $(libdir)/gcc/$(target_alias)/$(gcc_version) GDB_NLM_DEPS = # This is the name of the environment variable used for the path to # the libraries. RPATH_ENVVAR = @RPATH_ENVVAR@ +# This is set by configure to REALLY_SET_LIB_PATH if --enable-shared +# was used. +SET_LIB_PATH = @SET_LIB_PATH@ + +# configure.in sets SET_LIB_PATH to this if --enable-shared was used. +# Some platforms don't like blank entries, so we remove duplicate, +# leading and trailing colons. +REALLY_SET_LIB_PATH = \ + @SET_GCC_LIB_PATH@ \ + $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); + +# This is the list of directories to be built for the build system. +BUILD_CONFIGDIRS = libiberty # Build programs are put under this directory. BUILD_SUBDIR = @build_subdir@ # This is set by the configure script to the arguments to use when configuring # directories built for the build system. -BUILD_CONFIGARGS = @build_configargs@ --with-build-subdir="$(BUILD_SUBDIR)" +BUILD_CONFIGARGS = @build_configargs@ # This is the list of variables to export in the environment when # configuring any subdirectory. It must also be exported whenever @@ -127,12 +149,8 @@ SUBDIRS = @configdirs@ # This is set by the configure script to the arguments to use when configuring # directories built for the host system. HOST_CONFIGARGS = @host_configargs@ -# Host programs are put under this directory, which is . except if building -# with srcdir=.. -HOST_SUBDIR = @host_subdir@ # This is the list of variables to export in the environment when -# configuring subdirectories for the host system. We need to pass -# some to the GCC configure because of its hybrid host/target nature. +# configuring subdirectories for the host system. HOST_EXPORTS = \ $(BASE_EXPORTS) \ CC="$(CC)"; export CC; \ @@ -151,59 +169,47 @@ HOST_EXPORTS = \ WINDRES="$(WINDRES)"; export WINDRES; \ OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \ OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \ - AR_FOR_TARGET="$(AR_FOR_TARGET)"; export AR_FOR_TARGET; \ - AS_FOR_TARGET="$(AS_FOR_TARGET)"; export AS_FOR_TARGET; \ - GCC_FOR_TARGET="$(GCC_FOR_TARGET)"; export GCC_FOR_TARGET; \ - LD_FOR_TARGET="$(LD_FOR_TARGET)"; export LD_FOR_TARGET; \ - NM_FOR_TARGET="$(NM_FOR_TARGET)"; export NM_FOR_TARGET; \ - OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP_FOR_TARGET; \ - RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \ TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \ GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \ GMPINC="$(HOST_GMPINC)"; export GMPINC; \ -@if gcc-bootstrap - $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ -@endif gcc-bootstrap - $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); + SET_GCC_LIB_PATH_CMD="@SET_GCC_LIB_PATH@"; export SET_GCC_LIB_PATH_CMD; \ + @SET_GCC_LIB_PATH@ # Similar, for later GCC stages. -POSTSTAGE1_HOST_EXPORTS = \ +STAGE_HOST_EXPORTS = \ $(HOST_EXPORTS) \ - CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \ - -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \ - CC_FOR_BUILD="$(STAGE_CC_WRAPPER) \ - $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \ - -B$$r/$(HOST_SUBDIR)/prev-gcc/ \ - -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; + CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \ + CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; +# This is set by the configure script to the list of directories which +# should be built using the target tools. +TARGET_CONFIGDIRS = @target_configdirs@ # Target libraries are put under this directory: TARGET_SUBDIR = @target_subdir@ # This is set by the configure script to the arguments to use when configuring # directories built for the target. -TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)" +TARGET_CONFIGARGS = @target_configargs@ # This is the list of variables to export in the environment when # configuring subdirectories for the host system. BASE_TARGET_EXPORTS = \ $(BASE_EXPORTS) \ AR="$(AR_FOR_TARGET)"; export AR; \ - AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ + AS="$(AS_FOR_TARGET)"; export AS; \ CC="$(CC_FOR_TARGET)"; export CC; \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ - CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ + CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \ GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \ DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ - LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \ + LD="$(LD_FOR_TARGET)"; export LD; \ LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ - LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \ - NM="$(COMPILER_NM_FOR_TARGET)"; export NM; \ - OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \ + NM="$(NM_FOR_TARGET)"; export NM; \ RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \ - STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \ WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ - $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); + SET_GCC_LIB_PATH_CMD="@SET_GCC_LIB_PATH@"; export SET_GCC_LIB_PATH_CMD; \ + @SET_GCC_LIB_PATH@ RAW_CXX_TARGET_EXPORTS = \ $(BASE_TARGET_EXPORTS) \ @@ -247,16 +253,48 @@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@ # Flags to pass to stage2 and later makes. They are defined # here so that they can be overridden by Makefile fragments. BOOT_CFLAGS= -g -O2 -BOOT_LDFLAGS= -BISON = @BISON@ -YACC = @YACC@ -FLEX = @FLEX@ -LEX = @LEX@ -M4 = @M4@ -MAKEINFO = @MAKEINFO@ -EXPECT = @EXPECT@ -RUNTEST = @RUNTEST@ +CONFIGURED_BISON = @CONFIGURED_BISON@ +BISON = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \ + echo $$r/$(BUILD_SUBDIR)/bison/tests/bison ; \ + else \ + echo ${CONFIGURED_BISON} ; \ + fi` + +CONFIGURED_YACC = @CONFIGURED_YACC@ +YACC = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \ + echo $$r/$(BUILD_SUBDIR)/bison/tests/bison -y ; \ + elif [ -f $$r/$(BUILD_SUBDIR)/byacc/byacc ] ; then \ + echo $$r/$(BUILD_SUBDIR)/byacc/byacc ; \ + else \ + echo ${CONFIGURED_YACC} ; \ + fi` + +CONFIGURED_FLEX = @CONFIGURED_FLEX@ +FLEX = `if [ -f $$r/$(BUILD_SUBDIR)/flex/flex ] ; \ + then echo $$r/$(BUILD_SUBDIR)/flex/flex ; \ + else echo ${CONFIGURED_FLEX} ; fi` + +CONFIGURED_LEX = @CONFIGURED_LEX@ +LEX = `if [ -f $$r/$(BUILD_SUBDIR)/flex/flex ] ; \ + then echo $$r/$(BUILD_SUBDIR)/flex/flex ; \ + else echo ${CONFIGURED_LEX} ; fi` + +CONFIGURED_M4 = @CONFIGURED_M4@ +M4 = `if [ -f $$r/$(BUILD_SUBDIR)/m4/m4 ] ; \ + then echo $$r/$(BUILD_SUBDIR)/m4/m4 ; \ + else echo ${CONFIGURED_M4} ; fi` + +# For an installed makeinfo, we require it to be from texinfo 4.2 or +# higher, else we use the "missing" dummy. We also pass the subdirectory +# makeinfo even if only the Makefile is there, because Texinfo builds its +# manual when made, and it requires its own version. +CONFIGURED_MAKEINFO = @CONFIGURED_MAKEINFO@ +MAKEINFO = `if [ -f $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/Makefile ] ; \ + then echo $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo ; \ + else if (${CONFIGURED_MAKEINFO} --version \ + | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \ + then echo ${CONFIGURED_MAKEINFO}; else echo $$s/missing makeinfo; fi; fi` # This just becomes part of the MAKEINFO definition passed down to # sub-makes. It lets flags be given on the command line while still @@ -264,74 +302,185 @@ RUNTEST = @RUNTEST@ # (Default to avoid splitting info files by setting the threshold high.) MAKEINFOFLAGS = --split-size=5000000 +EXPECT = `if [ -f $$r/expect/expect ] ; \ + then echo $$r/expect/expect ; \ + else echo expect ; fi` + +RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \ + then echo $$s/dejagnu/runtest ; \ + else echo runtest ; fi` + # --------------------------------------------- # Programs producing files for the HOST machine # --------------------------------------------- +# This is the list of directories that may be needed in RPATH_ENVVAR +# so that programs built for the host machine work. +HOST_LIB_PATH = $$r/bfd:$$r/opcodes + AS = @AS@ + AR = @AR@ AR_FLAGS = rc + CC = @CC@ +CFLAGS = @CFLAGS@ +LIBCFLAGS = $(CFLAGS) + CXX = @CXX@ +CXXFLAGS = @CXXFLAGS@ +LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates + DLLTOOL = @DLLTOOL@ -LD = @LD@ -LIPO = @LIPO@ + NM = @NM@ -OBJDUMP = @OBJDUMP@ + +LD = @LD@ +LDFLAGS = + RANLIB = @RANLIB@ -STRIP = @STRIP@ + WINDRES = @WINDRES@ -CFLAGS = @CFLAGS@ -LDFLAGS = -LIBCFLAGS = $(CFLAGS) -CXXFLAGS = @CXXFLAGS@ -LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates PICFLAG = # ----------------------------------------------- # Programs producing files for the TARGET machine # ----------------------------------------------- +# This is the list of directories that may be needed in RPATH_ENVVAR +# so that prorgams built for the target machine work. +TARGET_LIB_PATH = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:$$r/$(TARGET_SUBDIR)/libmudflap/.libs + FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ AR_FOR_TARGET=@AR_FOR_TARGET@ -AS_FOR_TARGET=@AS_FOR_TARGET@ -CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ $(FLAGS_FOR_TARGET) +CONFIGURED_AR_FOR_TARGET=@CONFIGURED_AR_FOR_TARGET@ +USUAL_AR_FOR_TARGET = ` \ + if [ -f $$r/binutils/ar ] ; then \ + echo $$r/binutils/ar ; \ + else \ + if [ '$(host)' = '$(target)' ] ; then \ + echo $(AR); \ + else \ + echo $(CONFIGURED_AR_FOR_TARGET) ; \ + fi; \ + fi` +AS_FOR_TARGET=@AS_FOR_TARGET@ +CONFIGURED_AS_FOR_TARGET=@CONFIGURED_AS_FOR_TARGET@ +USUAL_AS_FOR_TARGET = ` \ + if [ -f $$r/gas/as-new ] ; then \ + echo $$r/gas/as-new ; \ + elif [ -f $$r/gcc/xgcc ]; then \ + $(CC_FOR_TARGET) -print-prog-name=as ; \ + else \ + if [ '$(host)' = '$(target)' ] ; then \ + echo $(AS); \ + else \ + echo $(CONFIGURED_AS_FOR_TARGET) ; \ + fi; \ + fi` + +CC_FOR_TARGET = @CC_FOR_TARGET@ +# During gcc bootstrap, if we use some random cc for stage1 then +# CFLAGS will be just -g. We want to ensure that TARGET libraries +# (which we know are built with gcc) are built with optimizations so +# prepend -O2 when setting CFLAGS_FOR_TARGET. +CFLAGS_FOR_TARGET = -O2 $(CFLAGS) # If GCC_FOR_TARGET is not overriden on the command line, then this # variable is passed down to the gcc Makefile, where it is used to # build libgcc2.a. We define it here so that it can itself be # overridden on the command line. -GCC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCC_FOR_TARGET@ $(FLAGS_FOR_TARGET) -CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET) -RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET) -GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ $(FLAGS_FOR_TARGET) -GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ $(FLAGS_FOR_TARGET) +GCC_FOR_TARGET=@GCC_FOR_TARGET@ +USUAL_GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) $$r/gcc/xgcc -B$$r/gcc/ $(FLAGS_FOR_TARGET) +LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) + +CXX_FOR_TARGET = @CXX_FOR_TARGET@ +RAW_CXX_FOR_TARGET = @RAW_CXX_FOR_TARGET@ +CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@ +RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@ +CXXFLAGS_FOR_TARGET = $(CXXFLAGS) +LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates + DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@ +CONFIGURED_DLLTOOL_FOR_TARGET=@CONFIGURED_DLLTOOL_FOR_TARGET@ +USUAL_DLLTOOL_FOR_TARGET = ` \ + if [ -f $$r/binutils/dlltool ] ; then \ + echo $$r/binutils/dlltool ; \ + else \ + if [ '$(host)' = '$(target)' ] ; then \ + echo $(DLLTOOL); \ + else \ + echo $(CONFIGURED_DLLTOOL_FOR_TARGET) ; \ + fi; \ + fi` + +GCJ_FOR_TARGET = @GCJ_FOR_TARGET@ +GFORTRAN_FOR_TARGET = @GFORTRAN_FOR_TARGET@ + LD_FOR_TARGET=@LD_FOR_TARGET@ +CONFIGURED_LD_FOR_TARGET=@CONFIGURED_LD_FOR_TARGET@ +USUAL_LD_FOR_TARGET = ` \ + if [ -f $$r/ld/ld-new ] ; then \ + echo $$r/ld/ld-new ; \ + elif [ -f $$r/gcc/xgcc ]; then \ + $(CC_FOR_TARGET) -print-prog-name=ld ; \ + else \ + if [ '$(host)' = '$(target)' ] ; then \ + echo $(LD); \ + else \ + echo $(CONFIGURED_LD_FOR_TARGET) ; \ + fi; \ + fi` + +LDFLAGS_FOR_TARGET = -LIPO_FOR_TARGET=@LIPO_FOR_TARGET@ NM_FOR_TARGET=@NM_FOR_TARGET@ -OBJDUMP_FOR_TARGET=@OBJDUMP_FOR_TARGET@ +CONFIGURED_NM_FOR_TARGET=@CONFIGURED_NM_FOR_TARGET@ +USUAL_NM_FOR_TARGET = ` \ + if [ -f $$r/binutils/nm-new ] ; then \ + echo $$r/binutils/nm-new ; \ + elif [ -f $$r/gcc/xgcc ]; then \ + $(CC_FOR_TARGET) -print-prog-name=nm ; \ + else \ + if [ '$(host)' = '$(target)' ] ; then \ + echo $(NM); \ + else \ + echo $(CONFIGURED_NM_FOR_TARGET) ; \ + fi; \ + fi` + RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@ -STRIP_FOR_TARGET=@STRIP_FOR_TARGET@ -WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@ +CONFIGURED_RANLIB_FOR_TARGET=@CONFIGURED_RANLIB_FOR_TARGET@ +USUAL_RANLIB_FOR_TARGET = ` \ + if [ -f $$r/binutils/ranlib ] ; then \ + echo $$r/binutils/ranlib ; \ + else \ + if [ '$(host)' = '$(target)' ] ; then \ + if [ x'$(RANLIB)' != x ]; then \ + echo $(RANLIB); \ + else \ + echo ranlib; \ + fi; \ + else \ + echo $(CONFIGURED_RANLIB_FOR_TARGET) ; \ + fi; \ + fi` -COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_TARGET@ -COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@ -COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@ +WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@ +CONFIGURED_WINDRES_FOR_TARGET=@CONFIGURED_WINDRES_FOR_TARGET@ +USUAL_WINDRES_FOR_TARGET = ` \ + if [ -f $$r/binutils/windres ] ; then \ + echo $$r/binutils/windres ; \ + else \ + if [ '$(host)' = '$(target)' ] ; then \ + echo $(WINDRES); \ + else \ + echo $(CONFIGURED_WINDRES_FOR_TARGET) ; \ + fi; \ + fi` -# During gcc bootstrap, if we use some random cc for stage1 then -# CFLAGS will be just -g. We want to ensure that TARGET libraries -# (which we know are built with gcc) are built with optimizations so -# prepend -O2 when setting CFLAGS_FOR_TARGET. -CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) -SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@ -CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) -LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) -LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates -LDFLAGS_FOR_TARGET = PICFLAG_FOR_TARGET = # ------------------------------------ @@ -340,7 +489,7 @@ PICFLAG_FOR_TARGET = # The first rule in the file had better be this one. Don't put any above it. # This lives here to allow makefile fragments to contain dependencies. -all: +@default_target@: #### host and target specific makefile fragments come in here. @target_makefile_frag@ @@ -349,53 +498,6 @@ all: @host_makefile_frag@ ### -# This is the list of directories that may be needed in RPATH_ENVVAR -# so that prorgams built for the target machine work. -TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libmudflap)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgcc-math)$(TARGET_LIB_PATH_libgomp)$(HOST_LIB_PATH_gcc) - -@if target-libstdc++-v3 -TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/.libs: -@endif target-libstdc++-v3 - -@if target-libmudflap -TARGET_LIB_PATH_libmudflap = $$r/$(TARGET_SUBDIR)/libmudflap/.libs: -@endif target-libmudflap - -@if target-libssp -TARGET_LIB_PATH_libssp = $$r/$(TARGET_SUBDIR)/libssp/.libs: -@endif target-libssp - -@if target-libgcc-math -TARGET_LIB_PATH_libgcc-math = $$r/$(TARGET_SUBDIR)/libgcc-math/.libs: -@endif target-libgcc-math - -@if target-libgomp -TARGET_LIB_PATH_libgomp = $$r/$(TARGET_SUBDIR)/libgomp/.libs: -@endif target-libgomp - - - -# This is the list of directories that may be needed in RPATH_ENVVAR -# so that programs built for the host machine work. -HOST_LIB_PATH = $(HOST_LIB_PATH_bfd)$(HOST_LIB_PATH_opcodes) - -# Define HOST_LIB_PATH_gcc here, for the sake of TARGET_LIB_PATH, ouch -@if gcc -HOST_LIB_PATH_gcc = $$r/$(HOST_SUBDIR)/gcc:$$r/$(HOST_SUBDIR)/prev-gcc: -@endif gcc - - -@if bfd -HOST_LIB_PATH_bfd = \ - $$r/$(HOST_SUBDIR)/bfd/.:$$r/$(HOST_SUBDIR)/prev-bfd/.: -@endif bfd - -@if opcodes -HOST_LIB_PATH_opcodes = \ - $$r/$(HOST_SUBDIR)/opcodes/.:$$r/$(HOST_SUBDIR)/prev-opcodes/.: -@endif opcodes - - # Flags to pass down to all sub-makes. BASE_FLAGS_TO_PASS = \ "DESTDIR=$(DESTDIR)" \ @@ -409,6 +511,8 @@ BASE_FLAGS_TO_PASS = \ "libdir=$(libdir)" \ "libexecdir=$(libexecdir)" \ "lispdir=$(lispdir)" \ + "libstdcxx_incdir=$(libstdcxx_incdir)" \ + "libsubdir=$(libsubdir)" \ "localstatedir=$(localstatedir)" \ "mandir=$(mandir)" \ "oldincludedir=$(oldincludedir)" \ @@ -418,10 +522,12 @@ BASE_FLAGS_TO_PASS = \ "sysconfdir=$(sysconfdir)" \ "tooldir=$(tooldir)" \ "build_tooldir=$(build_tooldir)" \ + "gxx_include_dir=$(gxx_include_dir)" \ + "gcc_version=$(gcc_version)" \ + "gcc_version_trigger=$(gcc_version_trigger)" \ "target_alias=$(target_alias)" \ "BISON=$(BISON)" \ "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ - "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \ "EXPECT=$(EXPECT)" \ "FLEX=$(FLEX)" \ @@ -436,45 +542,40 @@ BASE_FLAGS_TO_PASS = \ "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ "SHELL=$(SHELL)" \ "YACC=$(YACC)" \ - "`echo 'ADAFLAGS=$(ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "AR_FLAGS=$(AR_FLAGS)" \ - "`echo 'BOOT_ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ - "BOOT_CFLAGS=$(BOOT_CFLAGS)" \ - "BOOT_LDFLAGS=$(BOOT_LDFLAGS)" \ "CFLAGS=$(CFLAGS)" \ "CXXFLAGS=$(CXXFLAGS)" \ "LDFLAGS=$(LDFLAGS)" \ "LIBCFLAGS=$(LIBCFLAGS)" \ "LIBCXXFLAGS=$(LIBCXXFLAGS)" \ - "STAGE1_CFLAGS=$(STAGE1_CFLAGS)" \ - "STAGE1_LANGUAGES=$(STAGE1_LANGUAGES)" \ "AR_FOR_TARGET=$(AR_FOR_TARGET)" \ "AS_FOR_TARGET=$(AS_FOR_TARGET)" \ "CC_FOR_TARGET=$(CC_FOR_TARGET)" \ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ - "CPPFLAGS_FOR_TARGET=$(CPPFLAGS_FOR_TARGET)" \ "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \ "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \ "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \ "GCJ_FOR_TARGET=$(GCJ_FOR_TARGET)" \ "GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \ "LD_FOR_TARGET=$(LD_FOR_TARGET)" \ - "LIPO_FOR_TARGET=$(LIPO_FOR_TARGET)" \ - "LDFLAGS_FOR_TARGET=$(LDFLAGS_FOR_TARGET)" \ "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ "LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \ "NM_FOR_TARGET=$(NM_FOR_TARGET)" \ - "OBJDUMP_FOR_TARGET=$(OBJDUMP_FOR_TARGET)" \ "RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \ - "STRIP_FOR_TARGET=$(STRIP_FOR_TARGET)" \ "WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \ - "`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ - "LEAN=$(LEAN)" \ "CONFIG_SHELL=$(SHELL)" \ "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" -# We leave this in just in case, but it is not needed anymore. -RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) +# For any flags above that may contain shell code that varies from one +# target library to another. When doing recursive invocations of the +# top-level Makefile, we don't want the outer make to evaluate them, +# so we pass these variables down unchanged. They must not contain +# single nor double quotes. +RECURSE_FLAGS = \ + CXX_FOR_TARGET='$(CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \ + RAW_CXX_FOR_TARGET='$(RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \ + +RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) # Flags to pass down to most sub-makes, in which we're building with # the host environment. @@ -485,11 +586,8 @@ EXTRA_HOST_FLAGS = \ 'CXX=$(CXX)' \ 'DLLTOOL=$(DLLTOOL)' \ 'LD=$(LD)' \ - 'LIPO=$(LIPO)' \ 'NM=$(NM)' \ - 'OBJDUMP=$(OBJDUMP)' \ 'RANLIB=$(RANLIB)' \ - 'STRIP=$(STRIP)' \ 'WINDRES=$(WINDRES)' FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) @@ -507,23 +605,20 @@ X11_FLAGS_TO_PASS = \ 'X11_EXTRA_LIBS=$(X11_EXTRA_LIBS)' # Flags to pass down to makes which are built with the target environment. -# The double $ decreases the length of the command line; those variables -# are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them. The -# COMPILER_ prefixed variables are not passed down so we expand them here. +# The double $ decreases the length of the command line; the variables +# are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them. EXTRA_TARGET_FLAGS = \ 'AR=$$(AR_FOR_TARGET)' \ - 'AS=$(COMPILER_AS_FOR_TARGET)' \ + 'AS=$$(AS_FOR_TARGET)' \ 'CC=$$(CC_FOR_TARGET)' \ 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \ 'CXX=$$(CXX_FOR_TARGET)' \ 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \ 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ - 'LD=$(COMPILER_LD_FOR_TARGET)' \ - 'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \ + 'LD=$$(LD_FOR_TARGET)' \ 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \ 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \ - 'NM=$(COMPILER_NM_FOR_TARGET)' \ - 'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \ + 'NM=$$(NM_FOR_TARGET)' \ 'RANLIB=$$(RANLIB_FOR_TARGET)' \ 'WINDRES=$$(WINDRES_FOR_TARGET)' @@ -536,12 +631,19 @@ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) # The BUILD_* variables are a special case, which are used for the gcc # cross-building scheme. EXTRA_GCC_FLAGS = \ + 'BUILD_PREFIX=$(BUILD_PREFIX)' \ + 'BUILD_PREFIX_1=$(BUILD_PREFIX_1)' \ "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \ + "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ + "`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ - "`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" + "`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ + "`echo 'STAGE1_CFLAGS=$(STAGE1_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ + "`echo 'BOOT_CFLAGS=$(BOOT_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ + "`echo 'BOOT_ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) @@ -565,7 +667,6 @@ configure-host: \ maybe-configure-fileutils \ maybe-configure-findutils \ maybe-configure-find \ - maybe-configure-fixincludes \ maybe-configure-flex \ maybe-configure-gas \ maybe-configure-gcc \ @@ -581,7 +682,6 @@ configure-host: \ maybe-configure-itcl \ maybe-configure-ld \ maybe-configure-libcpp \ - maybe-configure-libdecnumber \ maybe-configure-libgui \ maybe-configure-libiberty \ maybe-configure-libtool \ @@ -613,14 +713,11 @@ configure-host: \ maybe-configure-guile \ maybe-configure-tk \ maybe-configure-libtermcap \ - maybe-configure-utils \ - maybe-configure-gnattools + maybe-configure-utils .PHONY: configure-target configure-target: \ maybe-configure-target-libstdc++-v3 \ maybe-configure-target-libmudflap \ - maybe-configure-target-libssp \ - maybe-configure-target-libgcc-math \ maybe-configure-target-newlib \ maybe-configure-target-libgfortran \ maybe-configure-target-libobjc \ @@ -636,153 +733,108 @@ configure-target: \ maybe-configure-target-boehm-gc \ maybe-configure-target-qthreads \ maybe-configure-target-rda \ - maybe-configure-target-libada \ - maybe-configure-target-libgomp + maybe-configure-target-libada # The target built for a native non-bootstrap build. .PHONY: all -all: -@if gcc-bootstrap - [ -f stage_final ] || echo stage3 > stage_final - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) `cat stage_final`-bubble -@endif gcc-bootstrap - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - if [ -f stage_last ]; then \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \ - else \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \ - fi +all: unstage all-host all-target stage .PHONY: all-build - -all-build: maybe-all-build-libiberty -all-build: maybe-all-build-bison -all-build: maybe-all-build-byacc -all-build: maybe-all-build-flex -all-build: maybe-all-build-m4 -all-build: maybe-all-build-texinfo -all-build: maybe-all-build-fixincludes - +all-build: \ + maybe-all-build-libiberty \ + maybe-all-build-bison \ + maybe-all-build-byacc \ + maybe-all-build-flex \ + maybe-all-build-m4 \ + maybe-all-build-texinfo \ + maybe-all-build-fixincludes .PHONY: all-host - -all-host: maybe-all-ash -all-host: maybe-all-autoconf -all-host: maybe-all-automake -all-host: maybe-all-bash -@if bfd-no-bootstrap -all-host: maybe-all-bfd -@endif bfd-no-bootstrap -@if opcodes-no-bootstrap -all-host: maybe-all-opcodes -@endif opcodes-no-bootstrap -@if binutils-no-bootstrap -all-host: maybe-all-binutils -@endif binutils-no-bootstrap -all-host: maybe-all-bison -all-host: maybe-all-byacc -all-host: maybe-all-bzip2 -all-host: maybe-all-dejagnu -all-host: maybe-all-diff -all-host: maybe-all-dosutils -all-host: maybe-all-etc -all-host: maybe-all-fastjar -all-host: maybe-all-fileutils -all-host: maybe-all-findutils -all-host: maybe-all-find -all-host: maybe-all-fixincludes -all-host: maybe-all-flex -@if gas-no-bootstrap -all-host: maybe-all-gas -@endif gas-no-bootstrap -@if gcc-no-bootstrap -all-host: maybe-all-gcc -@endif gcc-no-bootstrap -all-host: maybe-all-gawk -all-host: maybe-all-gettext -all-host: maybe-all-gnuserv -all-host: maybe-all-gprof -all-host: maybe-all-gzip -all-host: maybe-all-hello -all-host: maybe-all-indent -@if intl-no-bootstrap -all-host: maybe-all-intl -@endif intl-no-bootstrap -all-host: maybe-all-tcl -all-host: maybe-all-itcl -@if ld-no-bootstrap -all-host: maybe-all-ld -@endif ld-no-bootstrap -@if libcpp-no-bootstrap -all-host: maybe-all-libcpp -@endif libcpp-no-bootstrap -@if libdecnumber-no-bootstrap -all-host: maybe-all-libdecnumber -@endif libdecnumber-no-bootstrap -all-host: maybe-all-libgui -@if libiberty-no-bootstrap -all-host: maybe-all-libiberty -@endif libiberty-no-bootstrap -all-host: maybe-all-libtool -all-host: maybe-all-m4 -all-host: maybe-all-make -all-host: maybe-all-mmalloc -all-host: maybe-all-patch -all-host: maybe-all-perl -all-host: maybe-all-prms -all-host: maybe-all-rcs -all-host: maybe-all-readline -all-host: maybe-all-release -all-host: maybe-all-recode -all-host: maybe-all-sed -all-host: maybe-all-send-pr -all-host: maybe-all-shellutils -all-host: maybe-all-sid -all-host: maybe-all-sim -all-host: maybe-all-tar -all-host: maybe-all-texinfo -all-host: maybe-all-textutils -all-host: maybe-all-time -all-host: maybe-all-uudecode -all-host: maybe-all-wdiff -all-host: maybe-all-zip -@if zlib-no-bootstrap -all-host: maybe-all-zlib -@endif zlib-no-bootstrap -all-host: maybe-all-gdb -all-host: maybe-all-expect -all-host: maybe-all-guile -all-host: maybe-all-tk -all-host: maybe-all-libtermcap -all-host: maybe-all-utils -all-host: maybe-all-gnattools - +all-host: \ + maybe-all-ash \ + maybe-all-autoconf \ + maybe-all-automake \ + maybe-all-bash \ + maybe-all-bfd \ + maybe-all-opcodes \ + maybe-all-binutils \ + maybe-all-bison \ + maybe-all-byacc \ + maybe-all-bzip2 \ + maybe-all-dejagnu \ + maybe-all-diff \ + maybe-all-dosutils \ + maybe-all-etc \ + maybe-all-fastjar \ + maybe-all-fileutils \ + maybe-all-findutils \ + maybe-all-find \ + maybe-all-flex \ + maybe-all-gas \ + maybe-all-gcc \ + maybe-all-gawk \ + maybe-all-gettext \ + maybe-all-gnuserv \ + maybe-all-gprof \ + maybe-all-gzip \ + maybe-all-hello \ + maybe-all-indent \ + maybe-all-intl \ + maybe-all-tcl \ + maybe-all-itcl \ + maybe-all-ld \ + maybe-all-libcpp \ + maybe-all-libgui \ + maybe-all-libiberty \ + maybe-all-libtool \ + maybe-all-m4 \ + maybe-all-make \ + maybe-all-mmalloc \ + maybe-all-patch \ + maybe-all-perl \ + maybe-all-prms \ + maybe-all-rcs \ + maybe-all-readline \ + maybe-all-release \ + maybe-all-recode \ + maybe-all-sed \ + maybe-all-send-pr \ + maybe-all-shellutils \ + maybe-all-sid \ + maybe-all-sim \ + maybe-all-tar \ + maybe-all-texinfo \ + maybe-all-textutils \ + maybe-all-time \ + maybe-all-uudecode \ + maybe-all-wdiff \ + maybe-all-zip \ + maybe-all-zlib \ + maybe-all-gdb \ + maybe-all-expect \ + maybe-all-guile \ + maybe-all-tk \ + maybe-all-libtermcap \ + maybe-all-utils .PHONY: all-target - -all-target: maybe-all-target-libstdc++-v3 -all-target: maybe-all-target-libmudflap -all-target: maybe-all-target-libssp -all-target: maybe-all-target-libgcc-math -all-target: maybe-all-target-newlib -all-target: maybe-all-target-libgfortran -all-target: maybe-all-target-libobjc -all-target: maybe-all-target-libtermcap -all-target: maybe-all-target-winsup -all-target: maybe-all-target-libgloss -all-target: maybe-all-target-libiberty -all-target: maybe-all-target-gperf -all-target: maybe-all-target-examples -all-target: maybe-all-target-libffi -all-target: maybe-all-target-libjava -all-target: maybe-all-target-zlib -all-target: maybe-all-target-boehm-gc -all-target: maybe-all-target-qthreads -all-target: maybe-all-target-rda -all-target: maybe-all-target-libada -all-target: maybe-all-target-libgomp +all-target: \ + maybe-all-target-libstdc++-v3 \ + maybe-all-target-libmudflap \ + maybe-all-target-newlib \ + maybe-all-target-libgfortran \ + maybe-all-target-libobjc \ + maybe-all-target-libtermcap \ + maybe-all-target-winsup \ + maybe-all-target-libgloss \ + maybe-all-target-libiberty \ + maybe-all-target-gperf \ + maybe-all-target-examples \ + maybe-all-target-libffi \ + maybe-all-target-libjava \ + maybe-all-target-zlib \ + maybe-all-target-boehm-gc \ + maybe-all-target-qthreads \ + maybe-all-target-rda \ + maybe-all-target-libada # Do a target for all the subdirectories. A ``make do-X'' will do a # ``make X'' in all subdirectories (because, in general, there is a @@ -790,1055 +842,842 @@ all-target: maybe-all-target-libgomp # but it may do additional work as well). .PHONY: do-info -do-info: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) info-host \ - info-target - +do-info: unstage info-host info-target stage .PHONY: info-host - -info-host: maybe-info-ash -info-host: maybe-info-autoconf -info-host: maybe-info-automake -info-host: maybe-info-bash -info-host: maybe-info-bfd -info-host: maybe-info-opcodes -info-host: maybe-info-binutils -info-host: maybe-info-bison -info-host: maybe-info-byacc -info-host: maybe-info-bzip2 -info-host: maybe-info-dejagnu -info-host: maybe-info-diff -info-host: maybe-info-dosutils -info-host: maybe-info-etc -info-host: maybe-info-fastjar -info-host: maybe-info-fileutils -info-host: maybe-info-findutils -info-host: maybe-info-find -info-host: maybe-info-fixincludes -info-host: maybe-info-flex -info-host: maybe-info-gas -info-host: maybe-info-gcc -info-host: maybe-info-gawk -info-host: maybe-info-gettext -info-host: maybe-info-gnuserv -info-host: maybe-info-gprof -info-host: maybe-info-gzip -info-host: maybe-info-hello -info-host: maybe-info-indent -info-host: maybe-info-intl -info-host: maybe-info-tcl -info-host: maybe-info-itcl -info-host: maybe-info-ld -info-host: maybe-info-libcpp -info-host: maybe-info-libdecnumber -info-host: maybe-info-libgui -info-host: maybe-info-libiberty -info-host: maybe-info-libtool -info-host: maybe-info-m4 -info-host: maybe-info-make -info-host: maybe-info-mmalloc -info-host: maybe-info-patch -info-host: maybe-info-perl -info-host: maybe-info-prms -info-host: maybe-info-rcs -info-host: maybe-info-readline -info-host: maybe-info-release -info-host: maybe-info-recode -info-host: maybe-info-sed -info-host: maybe-info-send-pr -info-host: maybe-info-shellutils -info-host: maybe-info-sid -info-host: maybe-info-sim -info-host: maybe-info-tar -info-host: maybe-info-texinfo -info-host: maybe-info-textutils -info-host: maybe-info-time -info-host: maybe-info-uudecode -info-host: maybe-info-wdiff -info-host: maybe-info-zip -info-host: maybe-info-zlib -info-host: maybe-info-gdb -info-host: maybe-info-expect -info-host: maybe-info-guile -info-host: maybe-info-tk -info-host: maybe-info-libtermcap -info-host: maybe-info-utils -info-host: maybe-info-gnattools +info-host: \ + maybe-info-ash \ + maybe-info-autoconf \ + maybe-info-automake \ + maybe-info-bash \ + maybe-info-bfd \ + maybe-info-opcodes \ + maybe-info-binutils \ + maybe-info-bison \ + maybe-info-byacc \ + maybe-info-bzip2 \ + maybe-info-dejagnu \ + maybe-info-diff \ + maybe-info-dosutils \ + maybe-info-etc \ + maybe-info-fastjar \ + maybe-info-fileutils \ + maybe-info-findutils \ + maybe-info-find \ + maybe-info-flex \ + maybe-info-gas \ + maybe-info-gcc \ + maybe-info-gawk \ + maybe-info-gettext \ + maybe-info-gnuserv \ + maybe-info-gprof \ + maybe-info-gzip \ + maybe-info-hello \ + maybe-info-indent \ + maybe-info-intl \ + maybe-info-tcl \ + maybe-info-itcl \ + maybe-info-ld \ + maybe-info-libcpp \ + maybe-info-libgui \ + maybe-info-libiberty \ + maybe-info-libtool \ + maybe-info-m4 \ + maybe-info-make \ + maybe-info-mmalloc \ + maybe-info-patch \ + maybe-info-perl \ + maybe-info-prms \ + maybe-info-rcs \ + maybe-info-readline \ + maybe-info-release \ + maybe-info-recode \ + maybe-info-sed \ + maybe-info-send-pr \ + maybe-info-shellutils \ + maybe-info-sid \ + maybe-info-sim \ + maybe-info-tar \ + maybe-info-texinfo \ + maybe-info-textutils \ + maybe-info-time \ + maybe-info-uudecode \ + maybe-info-wdiff \ + maybe-info-zip \ + maybe-info-zlib \ + maybe-info-gdb \ + maybe-info-expect \ + maybe-info-guile \ + maybe-info-tk \ + maybe-info-libtermcap \ + maybe-info-utils .PHONY: info-target - -info-target: maybe-info-target-libstdc++-v3 -info-target: maybe-info-target-libmudflap -info-target: maybe-info-target-libssp -info-target: maybe-info-target-libgcc-math -info-target: maybe-info-target-newlib -info-target: maybe-info-target-libgfortran -info-target: maybe-info-target-libobjc -info-target: maybe-info-target-libtermcap -info-target: maybe-info-target-winsup -info-target: maybe-info-target-libgloss -info-target: maybe-info-target-libiberty -info-target: maybe-info-target-gperf -info-target: maybe-info-target-examples -info-target: maybe-info-target-libffi -info-target: maybe-info-target-libjava -info-target: maybe-info-target-zlib -info-target: maybe-info-target-boehm-gc -info-target: maybe-info-target-qthreads -info-target: maybe-info-target-rda -info-target: maybe-info-target-libada -info-target: maybe-info-target-libgomp +info-target: \ + maybe-info-target-libstdc++-v3 \ + maybe-info-target-libmudflap \ + maybe-info-target-newlib \ + maybe-info-target-libgfortran \ + maybe-info-target-libobjc \ + maybe-info-target-libtermcap \ + maybe-info-target-winsup \ + maybe-info-target-libgloss \ + maybe-info-target-libiberty \ + maybe-info-target-gperf \ + maybe-info-target-examples \ + maybe-info-target-libffi \ + maybe-info-target-libjava \ + maybe-info-target-zlib \ + maybe-info-target-boehm-gc \ + maybe-info-target-qthreads \ + maybe-info-target-rda \ + maybe-info-target-libada .PHONY: do-dvi -do-dvi: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) dvi-host \ - dvi-target - +do-dvi: unstage dvi-host dvi-target stage .PHONY: dvi-host - -dvi-host: maybe-dvi-ash -dvi-host: maybe-dvi-autoconf -dvi-host: maybe-dvi-automake -dvi-host: maybe-dvi-bash -dvi-host: maybe-dvi-bfd -dvi-host: maybe-dvi-opcodes -dvi-host: maybe-dvi-binutils -dvi-host: maybe-dvi-bison -dvi-host: maybe-dvi-byacc -dvi-host: maybe-dvi-bzip2 -dvi-host: maybe-dvi-dejagnu -dvi-host: maybe-dvi-diff -dvi-host: maybe-dvi-dosutils -dvi-host: maybe-dvi-etc -dvi-host: maybe-dvi-fastjar -dvi-host: maybe-dvi-fileutils -dvi-host: maybe-dvi-findutils -dvi-host: maybe-dvi-find -dvi-host: maybe-dvi-fixincludes -dvi-host: maybe-dvi-flex -dvi-host: maybe-dvi-gas -dvi-host: maybe-dvi-gcc -dvi-host: maybe-dvi-gawk -dvi-host: maybe-dvi-gettext -dvi-host: maybe-dvi-gnuserv -dvi-host: maybe-dvi-gprof -dvi-host: maybe-dvi-gzip -dvi-host: maybe-dvi-hello -dvi-host: maybe-dvi-indent -dvi-host: maybe-dvi-intl -dvi-host: maybe-dvi-tcl -dvi-host: maybe-dvi-itcl -dvi-host: maybe-dvi-ld -dvi-host: maybe-dvi-libcpp -dvi-host: maybe-dvi-libdecnumber -dvi-host: maybe-dvi-libgui -dvi-host: maybe-dvi-libiberty -dvi-host: maybe-dvi-libtool -dvi-host: maybe-dvi-m4 -dvi-host: maybe-dvi-make -dvi-host: maybe-dvi-mmalloc -dvi-host: maybe-dvi-patch -dvi-host: maybe-dvi-perl -dvi-host: maybe-dvi-prms -dvi-host: maybe-dvi-rcs -dvi-host: maybe-dvi-readline -dvi-host: maybe-dvi-release -dvi-host: maybe-dvi-recode -dvi-host: maybe-dvi-sed -dvi-host: maybe-dvi-send-pr -dvi-host: maybe-dvi-shellutils -dvi-host: maybe-dvi-sid -dvi-host: maybe-dvi-sim -dvi-host: maybe-dvi-tar -dvi-host: maybe-dvi-texinfo -dvi-host: maybe-dvi-textutils -dvi-host: maybe-dvi-time -dvi-host: maybe-dvi-uudecode -dvi-host: maybe-dvi-wdiff -dvi-host: maybe-dvi-zip -dvi-host: maybe-dvi-zlib -dvi-host: maybe-dvi-gdb -dvi-host: maybe-dvi-expect -dvi-host: maybe-dvi-guile -dvi-host: maybe-dvi-tk -dvi-host: maybe-dvi-libtermcap -dvi-host: maybe-dvi-utils -dvi-host: maybe-dvi-gnattools +dvi-host: \ + maybe-dvi-ash \ + maybe-dvi-autoconf \ + maybe-dvi-automake \ + maybe-dvi-bash \ + maybe-dvi-bfd \ + maybe-dvi-opcodes \ + maybe-dvi-binutils \ + maybe-dvi-bison \ + maybe-dvi-byacc \ + maybe-dvi-bzip2 \ + maybe-dvi-dejagnu \ + maybe-dvi-diff \ + maybe-dvi-dosutils \ + maybe-dvi-etc \ + maybe-dvi-fastjar \ + maybe-dvi-fileutils \ + maybe-dvi-findutils \ + maybe-dvi-find \ + maybe-dvi-flex \ + maybe-dvi-gas \ + maybe-dvi-gcc \ + maybe-dvi-gawk \ + maybe-dvi-gettext \ + maybe-dvi-gnuserv \ + maybe-dvi-gprof \ + maybe-dvi-gzip \ + maybe-dvi-hello \ + maybe-dvi-indent \ + maybe-dvi-intl \ + maybe-dvi-tcl \ + maybe-dvi-itcl \ + maybe-dvi-ld \ + maybe-dvi-libcpp \ + maybe-dvi-libgui \ + maybe-dvi-libiberty \ + maybe-dvi-libtool \ + maybe-dvi-m4 \ + maybe-dvi-make \ + maybe-dvi-mmalloc \ + maybe-dvi-patch \ + maybe-dvi-perl \ + maybe-dvi-prms \ + maybe-dvi-rcs \ + maybe-dvi-readline \ + maybe-dvi-release \ + maybe-dvi-recode \ + maybe-dvi-sed \ + maybe-dvi-send-pr \ + maybe-dvi-shellutils \ + maybe-dvi-sid \ + maybe-dvi-sim \ + maybe-dvi-tar \ + maybe-dvi-texinfo \ + maybe-dvi-textutils \ + maybe-dvi-time \ + maybe-dvi-uudecode \ + maybe-dvi-wdiff \ + maybe-dvi-zip \ + maybe-dvi-zlib \ + maybe-dvi-gdb \ + maybe-dvi-expect \ + maybe-dvi-guile \ + maybe-dvi-tk \ + maybe-dvi-libtermcap \ + maybe-dvi-utils .PHONY: dvi-target - -dvi-target: maybe-dvi-target-libstdc++-v3 -dvi-target: maybe-dvi-target-libmudflap -dvi-target: maybe-dvi-target-libssp -dvi-target: maybe-dvi-target-libgcc-math -dvi-target: maybe-dvi-target-newlib -dvi-target: maybe-dvi-target-libgfortran -dvi-target: maybe-dvi-target-libobjc -dvi-target: maybe-dvi-target-libtermcap -dvi-target: maybe-dvi-target-winsup -dvi-target: maybe-dvi-target-libgloss -dvi-target: maybe-dvi-target-libiberty -dvi-target: maybe-dvi-target-gperf -dvi-target: maybe-dvi-target-examples -dvi-target: maybe-dvi-target-libffi -dvi-target: maybe-dvi-target-libjava -dvi-target: maybe-dvi-target-zlib -dvi-target: maybe-dvi-target-boehm-gc -dvi-target: maybe-dvi-target-qthreads -dvi-target: maybe-dvi-target-rda -dvi-target: maybe-dvi-target-libada -dvi-target: maybe-dvi-target-libgomp - -.PHONY: do-html -do-html: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) html-host \ - html-target - - -.PHONY: html-host - -html-host: maybe-html-ash -html-host: maybe-html-autoconf -html-host: maybe-html-automake -html-host: maybe-html-bash -html-host: maybe-html-bfd -html-host: maybe-html-opcodes -html-host: maybe-html-binutils -html-host: maybe-html-bison -html-host: maybe-html-byacc -html-host: maybe-html-bzip2 -html-host: maybe-html-dejagnu -html-host: maybe-html-diff -html-host: maybe-html-dosutils -html-host: maybe-html-etc -html-host: maybe-html-fastjar -html-host: maybe-html-fileutils -html-host: maybe-html-findutils -html-host: maybe-html-find -html-host: maybe-html-fixincludes -html-host: maybe-html-flex -html-host: maybe-html-gas -html-host: maybe-html-gcc -html-host: maybe-html-gawk -html-host: maybe-html-gettext -html-host: maybe-html-gnuserv -html-host: maybe-html-gprof -html-host: maybe-html-gzip -html-host: maybe-html-hello -html-host: maybe-html-indent -html-host: maybe-html-intl -html-host: maybe-html-tcl -html-host: maybe-html-itcl -html-host: maybe-html-ld -html-host: maybe-html-libcpp -html-host: maybe-html-libdecnumber -html-host: maybe-html-libgui -html-host: maybe-html-libiberty -html-host: maybe-html-libtool -html-host: maybe-html-m4 -html-host: maybe-html-make -html-host: maybe-html-mmalloc -html-host: maybe-html-patch -html-host: maybe-html-perl -html-host: maybe-html-prms -html-host: maybe-html-rcs -html-host: maybe-html-readline -html-host: maybe-html-release -html-host: maybe-html-recode -html-host: maybe-html-sed -html-host: maybe-html-send-pr -html-host: maybe-html-shellutils -html-host: maybe-html-sid -html-host: maybe-html-sim -html-host: maybe-html-tar -html-host: maybe-html-texinfo -html-host: maybe-html-textutils -html-host: maybe-html-time -html-host: maybe-html-uudecode -html-host: maybe-html-wdiff -html-host: maybe-html-zip -html-host: maybe-html-zlib -html-host: maybe-html-gdb -html-host: maybe-html-expect -html-host: maybe-html-guile -html-host: maybe-html-tk -html-host: maybe-html-libtermcap -html-host: maybe-html-utils -html-host: maybe-html-gnattools - -.PHONY: html-target - -html-target: maybe-html-target-libstdc++-v3 -html-target: maybe-html-target-libmudflap -html-target: maybe-html-target-libssp -html-target: maybe-html-target-libgcc-math -html-target: maybe-html-target-newlib -html-target: maybe-html-target-libgfortran -html-target: maybe-html-target-libobjc -html-target: maybe-html-target-libtermcap -html-target: maybe-html-target-winsup -html-target: maybe-html-target-libgloss -html-target: maybe-html-target-libiberty -html-target: maybe-html-target-gperf -html-target: maybe-html-target-examples -html-target: maybe-html-target-libffi -html-target: maybe-html-target-libjava -html-target: maybe-html-target-zlib -html-target: maybe-html-target-boehm-gc -html-target: maybe-html-target-qthreads -html-target: maybe-html-target-rda -html-target: maybe-html-target-libada -html-target: maybe-html-target-libgomp +dvi-target: \ + maybe-dvi-target-libstdc++-v3 \ + maybe-dvi-target-libmudflap \ + maybe-dvi-target-newlib \ + maybe-dvi-target-libgfortran \ + maybe-dvi-target-libobjc \ + maybe-dvi-target-libtermcap \ + maybe-dvi-target-winsup \ + maybe-dvi-target-libgloss \ + maybe-dvi-target-libiberty \ + maybe-dvi-target-gperf \ + maybe-dvi-target-examples \ + maybe-dvi-target-libffi \ + maybe-dvi-target-libjava \ + maybe-dvi-target-zlib \ + maybe-dvi-target-boehm-gc \ + maybe-dvi-target-qthreads \ + maybe-dvi-target-rda \ + maybe-dvi-target-libada .PHONY: do-TAGS -do-TAGS: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) TAGS-host \ - TAGS-target - +do-TAGS: unstage TAGS-host TAGS-target stage .PHONY: TAGS-host - -TAGS-host: maybe-TAGS-ash -TAGS-host: maybe-TAGS-autoconf -TAGS-host: maybe-TAGS-automake -TAGS-host: maybe-TAGS-bash -TAGS-host: maybe-TAGS-bfd -TAGS-host: maybe-TAGS-opcodes -TAGS-host: maybe-TAGS-binutils -TAGS-host: maybe-TAGS-bison -TAGS-host: maybe-TAGS-byacc -TAGS-host: maybe-TAGS-bzip2 -TAGS-host: maybe-TAGS-dejagnu -TAGS-host: maybe-TAGS-diff -TAGS-host: maybe-TAGS-dosutils -TAGS-host: maybe-TAGS-etc -TAGS-host: maybe-TAGS-fastjar -TAGS-host: maybe-TAGS-fileutils -TAGS-host: maybe-TAGS-findutils -TAGS-host: maybe-TAGS-find -TAGS-host: maybe-TAGS-fixincludes -TAGS-host: maybe-TAGS-flex -TAGS-host: maybe-TAGS-gas -TAGS-host: maybe-TAGS-gcc -TAGS-host: maybe-TAGS-gawk -TAGS-host: maybe-TAGS-gettext -TAGS-host: maybe-TAGS-gnuserv -TAGS-host: maybe-TAGS-gprof -TAGS-host: maybe-TAGS-gzip -TAGS-host: maybe-TAGS-hello -TAGS-host: maybe-TAGS-indent -TAGS-host: maybe-TAGS-intl -TAGS-host: maybe-TAGS-tcl -TAGS-host: maybe-TAGS-itcl -TAGS-host: maybe-TAGS-ld -TAGS-host: maybe-TAGS-libcpp -TAGS-host: maybe-TAGS-libdecnumber -TAGS-host: maybe-TAGS-libgui -TAGS-host: maybe-TAGS-libiberty -TAGS-host: maybe-TAGS-libtool -TAGS-host: maybe-TAGS-m4 -TAGS-host: maybe-TAGS-make -TAGS-host: maybe-TAGS-mmalloc -TAGS-host: maybe-TAGS-patch -TAGS-host: maybe-TAGS-perl -TAGS-host: maybe-TAGS-prms -TAGS-host: maybe-TAGS-rcs -TAGS-host: maybe-TAGS-readline -TAGS-host: maybe-TAGS-release -TAGS-host: maybe-TAGS-recode -TAGS-host: maybe-TAGS-sed -TAGS-host: maybe-TAGS-send-pr -TAGS-host: maybe-TAGS-shellutils -TAGS-host: maybe-TAGS-sid -TAGS-host: maybe-TAGS-sim -TAGS-host: maybe-TAGS-tar -TAGS-host: maybe-TAGS-texinfo -TAGS-host: maybe-TAGS-textutils -TAGS-host: maybe-TAGS-time -TAGS-host: maybe-TAGS-uudecode -TAGS-host: maybe-TAGS-wdiff -TAGS-host: maybe-TAGS-zip -TAGS-host: maybe-TAGS-zlib -TAGS-host: maybe-TAGS-gdb -TAGS-host: maybe-TAGS-expect -TAGS-host: maybe-TAGS-guile -TAGS-host: maybe-TAGS-tk -TAGS-host: maybe-TAGS-libtermcap -TAGS-host: maybe-TAGS-utils -TAGS-host: maybe-TAGS-gnattools +TAGS-host: \ + maybe-TAGS-ash \ + maybe-TAGS-autoconf \ + maybe-TAGS-automake \ + maybe-TAGS-bash \ + maybe-TAGS-bfd \ + maybe-TAGS-opcodes \ + maybe-TAGS-binutils \ + maybe-TAGS-bison \ + maybe-TAGS-byacc \ + maybe-TAGS-bzip2 \ + maybe-TAGS-dejagnu \ + maybe-TAGS-diff \ + maybe-TAGS-dosutils \ + maybe-TAGS-etc \ + maybe-TAGS-fastjar \ + maybe-TAGS-fileutils \ + maybe-TAGS-findutils \ + maybe-TAGS-find \ + maybe-TAGS-flex \ + maybe-TAGS-gas \ + maybe-TAGS-gcc \ + maybe-TAGS-gawk \ + maybe-TAGS-gettext \ + maybe-TAGS-gnuserv \ + maybe-TAGS-gprof \ + maybe-TAGS-gzip \ + maybe-TAGS-hello \ + maybe-TAGS-indent \ + maybe-TAGS-intl \ + maybe-TAGS-tcl \ + maybe-TAGS-itcl \ + maybe-TAGS-ld \ + maybe-TAGS-libcpp \ + maybe-TAGS-libgui \ + maybe-TAGS-libiberty \ + maybe-TAGS-libtool \ + maybe-TAGS-m4 \ + maybe-TAGS-make \ + maybe-TAGS-mmalloc \ + maybe-TAGS-patch \ + maybe-TAGS-perl \ + maybe-TAGS-prms \ + maybe-TAGS-rcs \ + maybe-TAGS-readline \ + maybe-TAGS-release \ + maybe-TAGS-recode \ + maybe-TAGS-sed \ + maybe-TAGS-send-pr \ + maybe-TAGS-shellutils \ + maybe-TAGS-sid \ + maybe-TAGS-sim \ + maybe-TAGS-tar \ + maybe-TAGS-texinfo \ + maybe-TAGS-textutils \ + maybe-TAGS-time \ + maybe-TAGS-uudecode \ + maybe-TAGS-wdiff \ + maybe-TAGS-zip \ + maybe-TAGS-zlib \ + maybe-TAGS-gdb \ + maybe-TAGS-expect \ + maybe-TAGS-guile \ + maybe-TAGS-tk \ + maybe-TAGS-libtermcap \ + maybe-TAGS-utils .PHONY: TAGS-target - -TAGS-target: maybe-TAGS-target-libstdc++-v3 -TAGS-target: maybe-TAGS-target-libmudflap -TAGS-target: maybe-TAGS-target-libssp -TAGS-target: maybe-TAGS-target-libgcc-math -TAGS-target: maybe-TAGS-target-newlib -TAGS-target: maybe-TAGS-target-libgfortran -TAGS-target: maybe-TAGS-target-libobjc -TAGS-target: maybe-TAGS-target-libtermcap -TAGS-target: maybe-TAGS-target-winsup -TAGS-target: maybe-TAGS-target-libgloss -TAGS-target: maybe-TAGS-target-libiberty -TAGS-target: maybe-TAGS-target-gperf -TAGS-target: maybe-TAGS-target-examples -TAGS-target: maybe-TAGS-target-libffi -TAGS-target: maybe-TAGS-target-libjava -TAGS-target: maybe-TAGS-target-zlib -TAGS-target: maybe-TAGS-target-boehm-gc -TAGS-target: maybe-TAGS-target-qthreads -TAGS-target: maybe-TAGS-target-rda -TAGS-target: maybe-TAGS-target-libada -TAGS-target: maybe-TAGS-target-libgomp +TAGS-target: \ + maybe-TAGS-target-libstdc++-v3 \ + maybe-TAGS-target-libmudflap \ + maybe-TAGS-target-newlib \ + maybe-TAGS-target-libgfortran \ + maybe-TAGS-target-libobjc \ + maybe-TAGS-target-libtermcap \ + maybe-TAGS-target-winsup \ + maybe-TAGS-target-libgloss \ + maybe-TAGS-target-libiberty \ + maybe-TAGS-target-gperf \ + maybe-TAGS-target-examples \ + maybe-TAGS-target-libffi \ + maybe-TAGS-target-libjava \ + maybe-TAGS-target-zlib \ + maybe-TAGS-target-boehm-gc \ + maybe-TAGS-target-qthreads \ + maybe-TAGS-target-rda \ + maybe-TAGS-target-libada .PHONY: do-install-info -do-install-info: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) install-info-host \ - install-info-target - +do-install-info: unstage install-info-host install-info-target stage .PHONY: install-info-host - -install-info-host: maybe-install-info-ash -install-info-host: maybe-install-info-autoconf -install-info-host: maybe-install-info-automake -install-info-host: maybe-install-info-bash -install-info-host: maybe-install-info-bfd -install-info-host: maybe-install-info-opcodes -install-info-host: maybe-install-info-binutils -install-info-host: maybe-install-info-bison -install-info-host: maybe-install-info-byacc -install-info-host: maybe-install-info-bzip2 -install-info-host: maybe-install-info-dejagnu -install-info-host: maybe-install-info-diff -install-info-host: maybe-install-info-dosutils -install-info-host: maybe-install-info-etc -install-info-host: maybe-install-info-fastjar -install-info-host: maybe-install-info-fileutils -install-info-host: maybe-install-info-findutils -install-info-host: maybe-install-info-find -install-info-host: maybe-install-info-fixincludes -install-info-host: maybe-install-info-flex -install-info-host: maybe-install-info-gas -install-info-host: maybe-install-info-gcc -install-info-host: maybe-install-info-gawk -install-info-host: maybe-install-info-gettext -install-info-host: maybe-install-info-gnuserv -install-info-host: maybe-install-info-gprof -install-info-host: maybe-install-info-gzip -install-info-host: maybe-install-info-hello -install-info-host: maybe-install-info-indent -install-info-host: maybe-install-info-intl -install-info-host: maybe-install-info-tcl -install-info-host: maybe-install-info-itcl -install-info-host: maybe-install-info-ld -install-info-host: maybe-install-info-libcpp -install-info-host: maybe-install-info-libdecnumber -install-info-host: maybe-install-info-libgui -install-info-host: maybe-install-info-libiberty -install-info-host: maybe-install-info-libtool -install-info-host: maybe-install-info-m4 -install-info-host: maybe-install-info-make -install-info-host: maybe-install-info-mmalloc -install-info-host: maybe-install-info-patch -install-info-host: maybe-install-info-perl -install-info-host: maybe-install-info-prms -install-info-host: maybe-install-info-rcs -install-info-host: maybe-install-info-readline -install-info-host: maybe-install-info-release -install-info-host: maybe-install-info-recode -install-info-host: maybe-install-info-sed -install-info-host: maybe-install-info-send-pr -install-info-host: maybe-install-info-shellutils -install-info-host: maybe-install-info-sid -install-info-host: maybe-install-info-sim -install-info-host: maybe-install-info-tar -install-info-host: maybe-install-info-texinfo -install-info-host: maybe-install-info-textutils -install-info-host: maybe-install-info-time -install-info-host: maybe-install-info-uudecode -install-info-host: maybe-install-info-wdiff -install-info-host: maybe-install-info-zip -install-info-host: maybe-install-info-zlib -install-info-host: maybe-install-info-gdb -install-info-host: maybe-install-info-expect -install-info-host: maybe-install-info-guile -install-info-host: maybe-install-info-tk -install-info-host: maybe-install-info-libtermcap -install-info-host: maybe-install-info-utils -install-info-host: maybe-install-info-gnattools +install-info-host: \ + maybe-install-info-ash \ + maybe-install-info-autoconf \ + maybe-install-info-automake \ + maybe-install-info-bash \ + maybe-install-info-bfd \ + maybe-install-info-opcodes \ + maybe-install-info-binutils \ + maybe-install-info-bison \ + maybe-install-info-byacc \ + maybe-install-info-bzip2 \ + maybe-install-info-dejagnu \ + maybe-install-info-diff \ + maybe-install-info-dosutils \ + maybe-install-info-etc \ + maybe-install-info-fastjar \ + maybe-install-info-fileutils \ + maybe-install-info-findutils \ + maybe-install-info-find \ + maybe-install-info-flex \ + maybe-install-info-gas \ + maybe-install-info-gcc \ + maybe-install-info-gawk \ + maybe-install-info-gettext \ + maybe-install-info-gnuserv \ + maybe-install-info-gprof \ + maybe-install-info-gzip \ + maybe-install-info-hello \ + maybe-install-info-indent \ + maybe-install-info-intl \ + maybe-install-info-tcl \ + maybe-install-info-itcl \ + maybe-install-info-ld \ + maybe-install-info-libcpp \ + maybe-install-info-libgui \ + maybe-install-info-libiberty \ + maybe-install-info-libtool \ + maybe-install-info-m4 \ + maybe-install-info-make \ + maybe-install-info-mmalloc \ + maybe-install-info-patch \ + maybe-install-info-perl \ + maybe-install-info-prms \ + maybe-install-info-rcs \ + maybe-install-info-readline \ + maybe-install-info-release \ + maybe-install-info-recode \ + maybe-install-info-sed \ + maybe-install-info-send-pr \ + maybe-install-info-shellutils \ + maybe-install-info-sid \ + maybe-install-info-sim \ + maybe-install-info-tar \ + maybe-install-info-texinfo \ + maybe-install-info-textutils \ + maybe-install-info-time \ + maybe-install-info-uudecode \ + maybe-install-info-wdiff \ + maybe-install-info-zip \ + maybe-install-info-zlib \ + maybe-install-info-gdb \ + maybe-install-info-expect \ + maybe-install-info-guile \ + maybe-install-info-tk \ + maybe-install-info-libtermcap \ + maybe-install-info-utils .PHONY: install-info-target - -install-info-target: maybe-install-info-target-libstdc++-v3 -install-info-target: maybe-install-info-target-libmudflap -install-info-target: maybe-install-info-target-libssp -install-info-target: maybe-install-info-target-libgcc-math -install-info-target: maybe-install-info-target-newlib -install-info-target: maybe-install-info-target-libgfortran -install-info-target: maybe-install-info-target-libobjc -install-info-target: maybe-install-info-target-libtermcap -install-info-target: maybe-install-info-target-winsup -install-info-target: maybe-install-info-target-libgloss -install-info-target: maybe-install-info-target-libiberty -install-info-target: maybe-install-info-target-gperf -install-info-target: maybe-install-info-target-examples -install-info-target: maybe-install-info-target-libffi -install-info-target: maybe-install-info-target-libjava -install-info-target: maybe-install-info-target-zlib -install-info-target: maybe-install-info-target-boehm-gc -install-info-target: maybe-install-info-target-qthreads -install-info-target: maybe-install-info-target-rda -install-info-target: maybe-install-info-target-libada -install-info-target: maybe-install-info-target-libgomp +install-info-target: \ + maybe-install-info-target-libstdc++-v3 \ + maybe-install-info-target-libmudflap \ + maybe-install-info-target-newlib \ + maybe-install-info-target-libgfortran \ + maybe-install-info-target-libobjc \ + maybe-install-info-target-libtermcap \ + maybe-install-info-target-winsup \ + maybe-install-info-target-libgloss \ + maybe-install-info-target-libiberty \ + maybe-install-info-target-gperf \ + maybe-install-info-target-examples \ + maybe-install-info-target-libffi \ + maybe-install-info-target-libjava \ + maybe-install-info-target-zlib \ + maybe-install-info-target-boehm-gc \ + maybe-install-info-target-qthreads \ + maybe-install-info-target-rda \ + maybe-install-info-target-libada .PHONY: do-installcheck -do-installcheck: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) installcheck-host \ - installcheck-target - +do-installcheck: unstage installcheck-host installcheck-target stage .PHONY: installcheck-host - -installcheck-host: maybe-installcheck-ash -installcheck-host: maybe-installcheck-autoconf -installcheck-host: maybe-installcheck-automake -installcheck-host: maybe-installcheck-bash -installcheck-host: maybe-installcheck-bfd -installcheck-host: maybe-installcheck-opcodes -installcheck-host: maybe-installcheck-binutils -installcheck-host: maybe-installcheck-bison -installcheck-host: maybe-installcheck-byacc -installcheck-host: maybe-installcheck-bzip2 -installcheck-host: maybe-installcheck-dejagnu -installcheck-host: maybe-installcheck-diff -installcheck-host: maybe-installcheck-dosutils -installcheck-host: maybe-installcheck-etc -installcheck-host: maybe-installcheck-fastjar -installcheck-host: maybe-installcheck-fileutils -installcheck-host: maybe-installcheck-findutils -installcheck-host: maybe-installcheck-find -installcheck-host: maybe-installcheck-fixincludes -installcheck-host: maybe-installcheck-flex -installcheck-host: maybe-installcheck-gas -installcheck-host: maybe-installcheck-gcc -installcheck-host: maybe-installcheck-gawk -installcheck-host: maybe-installcheck-gettext -installcheck-host: maybe-installcheck-gnuserv -installcheck-host: maybe-installcheck-gprof -installcheck-host: maybe-installcheck-gzip -installcheck-host: maybe-installcheck-hello -installcheck-host: maybe-installcheck-indent -installcheck-host: maybe-installcheck-intl -installcheck-host: maybe-installcheck-tcl -installcheck-host: maybe-installcheck-itcl -installcheck-host: maybe-installcheck-ld -installcheck-host: maybe-installcheck-libcpp -installcheck-host: maybe-installcheck-libdecnumber -installcheck-host: maybe-installcheck-libgui -installcheck-host: maybe-installcheck-libiberty -installcheck-host: maybe-installcheck-libtool -installcheck-host: maybe-installcheck-m4 -installcheck-host: maybe-installcheck-make -installcheck-host: maybe-installcheck-mmalloc -installcheck-host: maybe-installcheck-patch -installcheck-host: maybe-installcheck-perl -installcheck-host: maybe-installcheck-prms -installcheck-host: maybe-installcheck-rcs -installcheck-host: maybe-installcheck-readline -installcheck-host: maybe-installcheck-release -installcheck-host: maybe-installcheck-recode -installcheck-host: maybe-installcheck-sed -installcheck-host: maybe-installcheck-send-pr -installcheck-host: maybe-installcheck-shellutils -installcheck-host: maybe-installcheck-sid -installcheck-host: maybe-installcheck-sim -installcheck-host: maybe-installcheck-tar -installcheck-host: maybe-installcheck-texinfo -installcheck-host: maybe-installcheck-textutils -installcheck-host: maybe-installcheck-time -installcheck-host: maybe-installcheck-uudecode -installcheck-host: maybe-installcheck-wdiff -installcheck-host: maybe-installcheck-zip -installcheck-host: maybe-installcheck-zlib -installcheck-host: maybe-installcheck-gdb -installcheck-host: maybe-installcheck-expect -installcheck-host: maybe-installcheck-guile -installcheck-host: maybe-installcheck-tk -installcheck-host: maybe-installcheck-libtermcap -installcheck-host: maybe-installcheck-utils -installcheck-host: maybe-installcheck-gnattools +installcheck-host: \ + maybe-installcheck-ash \ + maybe-installcheck-autoconf \ + maybe-installcheck-automake \ + maybe-installcheck-bash \ + maybe-installcheck-bfd \ + maybe-installcheck-opcodes \ + maybe-installcheck-binutils \ + maybe-installcheck-bison \ + maybe-installcheck-byacc \ + maybe-installcheck-bzip2 \ + maybe-installcheck-dejagnu \ + maybe-installcheck-diff \ + maybe-installcheck-dosutils \ + maybe-installcheck-etc \ + maybe-installcheck-fastjar \ + maybe-installcheck-fileutils \ + maybe-installcheck-findutils \ + maybe-installcheck-find \ + maybe-installcheck-flex \ + maybe-installcheck-gas \ + maybe-installcheck-gcc \ + maybe-installcheck-gawk \ + maybe-installcheck-gettext \ + maybe-installcheck-gnuserv \ + maybe-installcheck-gprof \ + maybe-installcheck-gzip \ + maybe-installcheck-hello \ + maybe-installcheck-indent \ + maybe-installcheck-intl \ + maybe-installcheck-tcl \ + maybe-installcheck-itcl \ + maybe-installcheck-ld \ + maybe-installcheck-libcpp \ + maybe-installcheck-libgui \ + maybe-installcheck-libiberty \ + maybe-installcheck-libtool \ + maybe-installcheck-m4 \ + maybe-installcheck-make \ + maybe-installcheck-mmalloc \ + maybe-installcheck-patch \ + maybe-installcheck-perl \ + maybe-installcheck-prms \ + maybe-installcheck-rcs \ + maybe-installcheck-readline \ + maybe-installcheck-release \ + maybe-installcheck-recode \ + maybe-installcheck-sed \ + maybe-installcheck-send-pr \ + maybe-installcheck-shellutils \ + maybe-installcheck-sid \ + maybe-installcheck-sim \ + maybe-installcheck-tar \ + maybe-installcheck-texinfo \ + maybe-installcheck-textutils \ + maybe-installcheck-time \ + maybe-installcheck-uudecode \ + maybe-installcheck-wdiff \ + maybe-installcheck-zip \ + maybe-installcheck-zlib \ + maybe-installcheck-gdb \ + maybe-installcheck-expect \ + maybe-installcheck-guile \ + maybe-installcheck-tk \ + maybe-installcheck-libtermcap \ + maybe-installcheck-utils .PHONY: installcheck-target - -installcheck-target: maybe-installcheck-target-libstdc++-v3 -installcheck-target: maybe-installcheck-target-libmudflap -installcheck-target: maybe-installcheck-target-libssp -installcheck-target: maybe-installcheck-target-libgcc-math -installcheck-target: maybe-installcheck-target-newlib -installcheck-target: maybe-installcheck-target-libgfortran -installcheck-target: maybe-installcheck-target-libobjc -installcheck-target: maybe-installcheck-target-libtermcap -installcheck-target: maybe-installcheck-target-winsup -installcheck-target: maybe-installcheck-target-libgloss -installcheck-target: maybe-installcheck-target-libiberty -installcheck-target: maybe-installcheck-target-gperf -installcheck-target: maybe-installcheck-target-examples -installcheck-target: maybe-installcheck-target-libffi -installcheck-target: maybe-installcheck-target-libjava -installcheck-target: maybe-installcheck-target-zlib -installcheck-target: maybe-installcheck-target-boehm-gc -installcheck-target: maybe-installcheck-target-qthreads -installcheck-target: maybe-installcheck-target-rda -installcheck-target: maybe-installcheck-target-libada -installcheck-target: maybe-installcheck-target-libgomp +installcheck-target: \ + maybe-installcheck-target-libstdc++-v3 \ + maybe-installcheck-target-libmudflap \ + maybe-installcheck-target-newlib \ + maybe-installcheck-target-libgfortran \ + maybe-installcheck-target-libobjc \ + maybe-installcheck-target-libtermcap \ + maybe-installcheck-target-winsup \ + maybe-installcheck-target-libgloss \ + maybe-installcheck-target-libiberty \ + maybe-installcheck-target-gperf \ + maybe-installcheck-target-examples \ + maybe-installcheck-target-libffi \ + maybe-installcheck-target-libjava \ + maybe-installcheck-target-zlib \ + maybe-installcheck-target-boehm-gc \ + maybe-installcheck-target-qthreads \ + maybe-installcheck-target-rda \ + maybe-installcheck-target-libada .PHONY: do-mostlyclean -do-mostlyclean: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) mostlyclean-host \ - mostlyclean-target - +do-mostlyclean: unstage mostlyclean-host mostlyclean-target stage .PHONY: mostlyclean-host - -mostlyclean-host: maybe-mostlyclean-ash -mostlyclean-host: maybe-mostlyclean-autoconf -mostlyclean-host: maybe-mostlyclean-automake -mostlyclean-host: maybe-mostlyclean-bash -mostlyclean-host: maybe-mostlyclean-bfd -mostlyclean-host: maybe-mostlyclean-opcodes -mostlyclean-host: maybe-mostlyclean-binutils -mostlyclean-host: maybe-mostlyclean-bison -mostlyclean-host: maybe-mostlyclean-byacc -mostlyclean-host: maybe-mostlyclean-bzip2 -mostlyclean-host: maybe-mostlyclean-dejagnu -mostlyclean-host: maybe-mostlyclean-diff -mostlyclean-host: maybe-mostlyclean-dosutils -mostlyclean-host: maybe-mostlyclean-etc -mostlyclean-host: maybe-mostlyclean-fastjar -mostlyclean-host: maybe-mostlyclean-fileutils -mostlyclean-host: maybe-mostlyclean-findutils -mostlyclean-host: maybe-mostlyclean-find -mostlyclean-host: maybe-mostlyclean-fixincludes -mostlyclean-host: maybe-mostlyclean-flex -mostlyclean-host: maybe-mostlyclean-gas -mostlyclean-host: maybe-mostlyclean-gcc -mostlyclean-host: maybe-mostlyclean-gawk -mostlyclean-host: maybe-mostlyclean-gettext -mostlyclean-host: maybe-mostlyclean-gnuserv -mostlyclean-host: maybe-mostlyclean-gprof -mostlyclean-host: maybe-mostlyclean-gzip -mostlyclean-host: maybe-mostlyclean-hello -mostlyclean-host: maybe-mostlyclean-indent -mostlyclean-host: maybe-mostlyclean-intl -mostlyclean-host: maybe-mostlyclean-tcl -mostlyclean-host: maybe-mostlyclean-itcl -mostlyclean-host: maybe-mostlyclean-ld -mostlyclean-host: maybe-mostlyclean-libcpp -mostlyclean-host: maybe-mostlyclean-libdecnumber -mostlyclean-host: maybe-mostlyclean-libgui -mostlyclean-host: maybe-mostlyclean-libiberty -mostlyclean-host: maybe-mostlyclean-libtool -mostlyclean-host: maybe-mostlyclean-m4 -mostlyclean-host: maybe-mostlyclean-make -mostlyclean-host: maybe-mostlyclean-mmalloc -mostlyclean-host: maybe-mostlyclean-patch -mostlyclean-host: maybe-mostlyclean-perl -mostlyclean-host: maybe-mostlyclean-prms -mostlyclean-host: maybe-mostlyclean-rcs -mostlyclean-host: maybe-mostlyclean-readline -mostlyclean-host: maybe-mostlyclean-release -mostlyclean-host: maybe-mostlyclean-recode -mostlyclean-host: maybe-mostlyclean-sed -mostlyclean-host: maybe-mostlyclean-send-pr -mostlyclean-host: maybe-mostlyclean-shellutils -mostlyclean-host: maybe-mostlyclean-sid -mostlyclean-host: maybe-mostlyclean-sim -mostlyclean-host: maybe-mostlyclean-tar -mostlyclean-host: maybe-mostlyclean-texinfo -mostlyclean-host: maybe-mostlyclean-textutils -mostlyclean-host: maybe-mostlyclean-time -mostlyclean-host: maybe-mostlyclean-uudecode -mostlyclean-host: maybe-mostlyclean-wdiff -mostlyclean-host: maybe-mostlyclean-zip -mostlyclean-host: maybe-mostlyclean-zlib -mostlyclean-host: maybe-mostlyclean-gdb -mostlyclean-host: maybe-mostlyclean-expect -mostlyclean-host: maybe-mostlyclean-guile -mostlyclean-host: maybe-mostlyclean-tk -mostlyclean-host: maybe-mostlyclean-libtermcap -mostlyclean-host: maybe-mostlyclean-utils -mostlyclean-host: maybe-mostlyclean-gnattools +mostlyclean-host: \ + maybe-mostlyclean-ash \ + maybe-mostlyclean-autoconf \ + maybe-mostlyclean-automake \ + maybe-mostlyclean-bash \ + maybe-mostlyclean-bfd \ + maybe-mostlyclean-opcodes \ + maybe-mostlyclean-binutils \ + maybe-mostlyclean-bison \ + maybe-mostlyclean-byacc \ + maybe-mostlyclean-bzip2 \ + maybe-mostlyclean-dejagnu \ + maybe-mostlyclean-diff \ + maybe-mostlyclean-dosutils \ + maybe-mostlyclean-etc \ + maybe-mostlyclean-fastjar \ + maybe-mostlyclean-fileutils \ + maybe-mostlyclean-findutils \ + maybe-mostlyclean-find \ + maybe-mostlyclean-flex \ + maybe-mostlyclean-gas \ + maybe-mostlyclean-gcc \ + maybe-mostlyclean-gawk \ + maybe-mostlyclean-gettext \ + maybe-mostlyclean-gnuserv \ + maybe-mostlyclean-gprof \ + maybe-mostlyclean-gzip \ + maybe-mostlyclean-hello \ + maybe-mostlyclean-indent \ + maybe-mostlyclean-intl \ + maybe-mostlyclean-tcl \ + maybe-mostlyclean-itcl \ + maybe-mostlyclean-ld \ + maybe-mostlyclean-libcpp \ + maybe-mostlyclean-libgui \ + maybe-mostlyclean-libiberty \ + maybe-mostlyclean-libtool \ + maybe-mostlyclean-m4 \ + maybe-mostlyclean-make \ + maybe-mostlyclean-mmalloc \ + maybe-mostlyclean-patch \ + maybe-mostlyclean-perl \ + maybe-mostlyclean-prms \ + maybe-mostlyclean-rcs \ + maybe-mostlyclean-readline \ + maybe-mostlyclean-release \ + maybe-mostlyclean-recode \ + maybe-mostlyclean-sed \ + maybe-mostlyclean-send-pr \ + maybe-mostlyclean-shellutils \ + maybe-mostlyclean-sid \ + maybe-mostlyclean-sim \ + maybe-mostlyclean-tar \ + maybe-mostlyclean-texinfo \ + maybe-mostlyclean-textutils \ + maybe-mostlyclean-time \ + maybe-mostlyclean-uudecode \ + maybe-mostlyclean-wdiff \ + maybe-mostlyclean-zip \ + maybe-mostlyclean-zlib \ + maybe-mostlyclean-gdb \ + maybe-mostlyclean-expect \ + maybe-mostlyclean-guile \ + maybe-mostlyclean-tk \ + maybe-mostlyclean-libtermcap \ + maybe-mostlyclean-utils .PHONY: mostlyclean-target - -mostlyclean-target: maybe-mostlyclean-target-libstdc++-v3 -mostlyclean-target: maybe-mostlyclean-target-libmudflap -mostlyclean-target: maybe-mostlyclean-target-libssp -mostlyclean-target: maybe-mostlyclean-target-libgcc-math -mostlyclean-target: maybe-mostlyclean-target-newlib -mostlyclean-target: maybe-mostlyclean-target-libgfortran -mostlyclean-target: maybe-mostlyclean-target-libobjc -mostlyclean-target: maybe-mostlyclean-target-libtermcap -mostlyclean-target: maybe-mostlyclean-target-winsup -mostlyclean-target: maybe-mostlyclean-target-libgloss -mostlyclean-target: maybe-mostlyclean-target-libiberty -mostlyclean-target: maybe-mostlyclean-target-gperf -mostlyclean-target: maybe-mostlyclean-target-examples -mostlyclean-target: maybe-mostlyclean-target-libffi -mostlyclean-target: maybe-mostlyclean-target-libjava -mostlyclean-target: maybe-mostlyclean-target-zlib -mostlyclean-target: maybe-mostlyclean-target-boehm-gc -mostlyclean-target: maybe-mostlyclean-target-qthreads -mostlyclean-target: maybe-mostlyclean-target-rda -mostlyclean-target: maybe-mostlyclean-target-libada -mostlyclean-target: maybe-mostlyclean-target-libgomp +mostlyclean-target: \ + maybe-mostlyclean-target-libstdc++-v3 \ + maybe-mostlyclean-target-libmudflap \ + maybe-mostlyclean-target-newlib \ + maybe-mostlyclean-target-libgfortran \ + maybe-mostlyclean-target-libobjc \ + maybe-mostlyclean-target-libtermcap \ + maybe-mostlyclean-target-winsup \ + maybe-mostlyclean-target-libgloss \ + maybe-mostlyclean-target-libiberty \ + maybe-mostlyclean-target-gperf \ + maybe-mostlyclean-target-examples \ + maybe-mostlyclean-target-libffi \ + maybe-mostlyclean-target-libjava \ + maybe-mostlyclean-target-zlib \ + maybe-mostlyclean-target-boehm-gc \ + maybe-mostlyclean-target-qthreads \ + maybe-mostlyclean-target-rda \ + maybe-mostlyclean-target-libada .PHONY: do-clean -do-clean: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) clean-host \ - clean-target - +do-clean: unstage clean-host clean-target stage .PHONY: clean-host - -clean-host: maybe-clean-ash -clean-host: maybe-clean-autoconf -clean-host: maybe-clean-automake -clean-host: maybe-clean-bash -clean-host: maybe-clean-bfd -clean-host: maybe-clean-opcodes -clean-host: maybe-clean-binutils -clean-host: maybe-clean-bison -clean-host: maybe-clean-byacc -clean-host: maybe-clean-bzip2 -clean-host: maybe-clean-dejagnu -clean-host: maybe-clean-diff -clean-host: maybe-clean-dosutils -clean-host: maybe-clean-etc -clean-host: maybe-clean-fastjar -clean-host: maybe-clean-fileutils -clean-host: maybe-clean-findutils -clean-host: maybe-clean-find -clean-host: maybe-clean-fixincludes -clean-host: maybe-clean-flex -clean-host: maybe-clean-gas -clean-host: maybe-clean-gcc -clean-host: maybe-clean-gawk -clean-host: maybe-clean-gettext -clean-host: maybe-clean-gnuserv -clean-host: maybe-clean-gprof -clean-host: maybe-clean-gzip -clean-host: maybe-clean-hello -clean-host: maybe-clean-indent -clean-host: maybe-clean-intl -clean-host: maybe-clean-tcl -clean-host: maybe-clean-itcl -clean-host: maybe-clean-ld -clean-host: maybe-clean-libcpp -clean-host: maybe-clean-libdecnumber -clean-host: maybe-clean-libgui -clean-host: maybe-clean-libiberty -clean-host: maybe-clean-libtool -clean-host: maybe-clean-m4 -clean-host: maybe-clean-make -clean-host: maybe-clean-mmalloc -clean-host: maybe-clean-patch -clean-host: maybe-clean-perl -clean-host: maybe-clean-prms -clean-host: maybe-clean-rcs -clean-host: maybe-clean-readline -clean-host: maybe-clean-release -clean-host: maybe-clean-recode -clean-host: maybe-clean-sed -clean-host: maybe-clean-send-pr -clean-host: maybe-clean-shellutils -clean-host: maybe-clean-sid -clean-host: maybe-clean-sim -clean-host: maybe-clean-tar -clean-host: maybe-clean-texinfo -clean-host: maybe-clean-textutils -clean-host: maybe-clean-time -clean-host: maybe-clean-uudecode -clean-host: maybe-clean-wdiff -clean-host: maybe-clean-zip -clean-host: maybe-clean-zlib -clean-host: maybe-clean-gdb -clean-host: maybe-clean-expect -clean-host: maybe-clean-guile -clean-host: maybe-clean-tk -clean-host: maybe-clean-libtermcap -clean-host: maybe-clean-utils -clean-host: maybe-clean-gnattools +clean-host: \ + maybe-clean-ash \ + maybe-clean-autoconf \ + maybe-clean-automake \ + maybe-clean-bash \ + maybe-clean-bfd \ + maybe-clean-opcodes \ + maybe-clean-binutils \ + maybe-clean-bison \ + maybe-clean-byacc \ + maybe-clean-bzip2 \ + maybe-clean-dejagnu \ + maybe-clean-diff \ + maybe-clean-dosutils \ + maybe-clean-etc \ + maybe-clean-fastjar \ + maybe-clean-fileutils \ + maybe-clean-findutils \ + maybe-clean-find \ + maybe-clean-flex \ + maybe-clean-gas \ + maybe-clean-gcc \ + maybe-clean-gawk \ + maybe-clean-gettext \ + maybe-clean-gnuserv \ + maybe-clean-gprof \ + maybe-clean-gzip \ + maybe-clean-hello \ + maybe-clean-indent \ + maybe-clean-intl \ + maybe-clean-tcl \ + maybe-clean-itcl \ + maybe-clean-ld \ + maybe-clean-libcpp \ + maybe-clean-libgui \ + maybe-clean-libiberty \ + maybe-clean-libtool \ + maybe-clean-m4 \ + maybe-clean-make \ + maybe-clean-mmalloc \ + maybe-clean-patch \ + maybe-clean-perl \ + maybe-clean-prms \ + maybe-clean-rcs \ + maybe-clean-readline \ + maybe-clean-release \ + maybe-clean-recode \ + maybe-clean-sed \ + maybe-clean-send-pr \ + maybe-clean-shellutils \ + maybe-clean-sid \ + maybe-clean-sim \ + maybe-clean-tar \ + maybe-clean-texinfo \ + maybe-clean-textutils \ + maybe-clean-time \ + maybe-clean-uudecode \ + maybe-clean-wdiff \ + maybe-clean-zip \ + maybe-clean-zlib \ + maybe-clean-gdb \ + maybe-clean-expect \ + maybe-clean-guile \ + maybe-clean-tk \ + maybe-clean-libtermcap \ + maybe-clean-utils .PHONY: clean-target - -clean-target: maybe-clean-target-libstdc++-v3 -clean-target: maybe-clean-target-libmudflap -clean-target: maybe-clean-target-libssp -clean-target: maybe-clean-target-libgcc-math -clean-target: maybe-clean-target-newlib -clean-target: maybe-clean-target-libgfortran -clean-target: maybe-clean-target-libobjc -clean-target: maybe-clean-target-libtermcap -clean-target: maybe-clean-target-winsup -clean-target: maybe-clean-target-libgloss -clean-target: maybe-clean-target-libiberty -clean-target: maybe-clean-target-gperf -clean-target: maybe-clean-target-examples -clean-target: maybe-clean-target-libffi -clean-target: maybe-clean-target-libjava -clean-target: maybe-clean-target-zlib -clean-target: maybe-clean-target-boehm-gc -clean-target: maybe-clean-target-qthreads -clean-target: maybe-clean-target-rda -clean-target: maybe-clean-target-libada -clean-target: maybe-clean-target-libgomp +clean-target: \ + maybe-clean-target-libstdc++-v3 \ + maybe-clean-target-libmudflap \ + maybe-clean-target-newlib \ + maybe-clean-target-libgfortran \ + maybe-clean-target-libobjc \ + maybe-clean-target-libtermcap \ + maybe-clean-target-winsup \ + maybe-clean-target-libgloss \ + maybe-clean-target-libiberty \ + maybe-clean-target-gperf \ + maybe-clean-target-examples \ + maybe-clean-target-libffi \ + maybe-clean-target-libjava \ + maybe-clean-target-zlib \ + maybe-clean-target-boehm-gc \ + maybe-clean-target-qthreads \ + maybe-clean-target-rda \ + maybe-clean-target-libada .PHONY: do-distclean -do-distclean: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) distclean-host \ - distclean-target - +do-distclean: unstage distclean-host distclean-target stage .PHONY: distclean-host - -distclean-host: maybe-distclean-ash -distclean-host: maybe-distclean-autoconf -distclean-host: maybe-distclean-automake -distclean-host: maybe-distclean-bash -distclean-host: maybe-distclean-bfd -distclean-host: maybe-distclean-opcodes -distclean-host: maybe-distclean-binutils -distclean-host: maybe-distclean-bison -distclean-host: maybe-distclean-byacc -distclean-host: maybe-distclean-bzip2 -distclean-host: maybe-distclean-dejagnu -distclean-host: maybe-distclean-diff -distclean-host: maybe-distclean-dosutils -distclean-host: maybe-distclean-etc -distclean-host: maybe-distclean-fastjar -distclean-host: maybe-distclean-fileutils -distclean-host: maybe-distclean-findutils -distclean-host: maybe-distclean-find -distclean-host: maybe-distclean-fixincludes -distclean-host: maybe-distclean-flex -distclean-host: maybe-distclean-gas -distclean-host: maybe-distclean-gcc -distclean-host: maybe-distclean-gawk -distclean-host: maybe-distclean-gettext -distclean-host: maybe-distclean-gnuserv -distclean-host: maybe-distclean-gprof -distclean-host: maybe-distclean-gzip -distclean-host: maybe-distclean-hello -distclean-host: maybe-distclean-indent -distclean-host: maybe-distclean-intl -distclean-host: maybe-distclean-tcl -distclean-host: maybe-distclean-itcl -distclean-host: maybe-distclean-ld -distclean-host: maybe-distclean-libcpp -distclean-host: maybe-distclean-libdecnumber -distclean-host: maybe-distclean-libgui -distclean-host: maybe-distclean-libiberty -distclean-host: maybe-distclean-libtool -distclean-host: maybe-distclean-m4 -distclean-host: maybe-distclean-make -distclean-host: maybe-distclean-mmalloc -distclean-host: maybe-distclean-patch -distclean-host: maybe-distclean-perl -distclean-host: maybe-distclean-prms -distclean-host: maybe-distclean-rcs -distclean-host: maybe-distclean-readline -distclean-host: maybe-distclean-release -distclean-host: maybe-distclean-recode -distclean-host: maybe-distclean-sed -distclean-host: maybe-distclean-send-pr -distclean-host: maybe-distclean-shellutils -distclean-host: maybe-distclean-sid -distclean-host: maybe-distclean-sim -distclean-host: maybe-distclean-tar -distclean-host: maybe-distclean-texinfo -distclean-host: maybe-distclean-textutils -distclean-host: maybe-distclean-time -distclean-host: maybe-distclean-uudecode -distclean-host: maybe-distclean-wdiff -distclean-host: maybe-distclean-zip -distclean-host: maybe-distclean-zlib -distclean-host: maybe-distclean-gdb -distclean-host: maybe-distclean-expect -distclean-host: maybe-distclean-guile -distclean-host: maybe-distclean-tk -distclean-host: maybe-distclean-libtermcap -distclean-host: maybe-distclean-utils -distclean-host: maybe-distclean-gnattools +distclean-host: \ + maybe-distclean-ash \ + maybe-distclean-autoconf \ + maybe-distclean-automake \ + maybe-distclean-bash \ + maybe-distclean-bfd \ + maybe-distclean-opcodes \ + maybe-distclean-binutils \ + maybe-distclean-bison \ + maybe-distclean-byacc \ + maybe-distclean-bzip2 \ + maybe-distclean-dejagnu \ + maybe-distclean-diff \ + maybe-distclean-dosutils \ + maybe-distclean-etc \ + maybe-distclean-fastjar \ + maybe-distclean-fileutils \ + maybe-distclean-findutils \ + maybe-distclean-find \ + maybe-distclean-flex \ + maybe-distclean-gas \ + maybe-distclean-gcc \ + maybe-distclean-gawk \ + maybe-distclean-gettext \ + maybe-distclean-gnuserv \ + maybe-distclean-gprof \ + maybe-distclean-gzip \ + maybe-distclean-hello \ + maybe-distclean-indent \ + maybe-distclean-intl \ + maybe-distclean-tcl \ + maybe-distclean-itcl \ + maybe-distclean-ld \ + maybe-distclean-libcpp \ + maybe-distclean-libgui \ + maybe-distclean-libiberty \ + maybe-distclean-libtool \ + maybe-distclean-m4 \ + maybe-distclean-make \ + maybe-distclean-mmalloc \ + maybe-distclean-patch \ + maybe-distclean-perl \ + maybe-distclean-prms \ + maybe-distclean-rcs \ + maybe-distclean-readline \ + maybe-distclean-release \ + maybe-distclean-recode \ + maybe-distclean-sed \ + maybe-distclean-send-pr \ + maybe-distclean-shellutils \ + maybe-distclean-sid \ + maybe-distclean-sim \ + maybe-distclean-tar \ + maybe-distclean-texinfo \ + maybe-distclean-textutils \ + maybe-distclean-time \ + maybe-distclean-uudecode \ + maybe-distclean-wdiff \ + maybe-distclean-zip \ + maybe-distclean-zlib \ + maybe-distclean-gdb \ + maybe-distclean-expect \ + maybe-distclean-guile \ + maybe-distclean-tk \ + maybe-distclean-libtermcap \ + maybe-distclean-utils .PHONY: distclean-target - -distclean-target: maybe-distclean-target-libstdc++-v3 -distclean-target: maybe-distclean-target-libmudflap -distclean-target: maybe-distclean-target-libssp -distclean-target: maybe-distclean-target-libgcc-math -distclean-target: maybe-distclean-target-newlib -distclean-target: maybe-distclean-target-libgfortran -distclean-target: maybe-distclean-target-libobjc -distclean-target: maybe-distclean-target-libtermcap -distclean-target: maybe-distclean-target-winsup -distclean-target: maybe-distclean-target-libgloss -distclean-target: maybe-distclean-target-libiberty -distclean-target: maybe-distclean-target-gperf -distclean-target: maybe-distclean-target-examples -distclean-target: maybe-distclean-target-libffi -distclean-target: maybe-distclean-target-libjava -distclean-target: maybe-distclean-target-zlib -distclean-target: maybe-distclean-target-boehm-gc -distclean-target: maybe-distclean-target-qthreads -distclean-target: maybe-distclean-target-rda -distclean-target: maybe-distclean-target-libada -distclean-target: maybe-distclean-target-libgomp +distclean-target: \ + maybe-distclean-target-libstdc++-v3 \ + maybe-distclean-target-libmudflap \ + maybe-distclean-target-newlib \ + maybe-distclean-target-libgfortran \ + maybe-distclean-target-libobjc \ + maybe-distclean-target-libtermcap \ + maybe-distclean-target-winsup \ + maybe-distclean-target-libgloss \ + maybe-distclean-target-libiberty \ + maybe-distclean-target-gperf \ + maybe-distclean-target-examples \ + maybe-distclean-target-libffi \ + maybe-distclean-target-libjava \ + maybe-distclean-target-zlib \ + maybe-distclean-target-boehm-gc \ + maybe-distclean-target-qthreads \ + maybe-distclean-target-rda \ + maybe-distclean-target-libada .PHONY: do-maintainer-clean -do-maintainer-clean: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) maintainer-clean-host \ - maintainer-clean-target - +do-maintainer-clean: unstage maintainer-clean-host maintainer-clean-target stage .PHONY: maintainer-clean-host - -maintainer-clean-host: maybe-maintainer-clean-ash -maintainer-clean-host: maybe-maintainer-clean-autoconf -maintainer-clean-host: maybe-maintainer-clean-automake -maintainer-clean-host: maybe-maintainer-clean-bash -maintainer-clean-host: maybe-maintainer-clean-bfd -maintainer-clean-host: maybe-maintainer-clean-opcodes -maintainer-clean-host: maybe-maintainer-clean-binutils -maintainer-clean-host: maybe-maintainer-clean-bison -maintainer-clean-host: maybe-maintainer-clean-byacc -maintainer-clean-host: maybe-maintainer-clean-bzip2 -maintainer-clean-host: maybe-maintainer-clean-dejagnu -maintainer-clean-host: maybe-maintainer-clean-diff -maintainer-clean-host: maybe-maintainer-clean-dosutils -maintainer-clean-host: maybe-maintainer-clean-etc -maintainer-clean-host: maybe-maintainer-clean-fastjar -maintainer-clean-host: maybe-maintainer-clean-fileutils -maintainer-clean-host: maybe-maintainer-clean-findutils -maintainer-clean-host: maybe-maintainer-clean-find -maintainer-clean-host: maybe-maintainer-clean-fixincludes -maintainer-clean-host: maybe-maintainer-clean-flex -maintainer-clean-host: maybe-maintainer-clean-gas -maintainer-clean-host: maybe-maintainer-clean-gcc -maintainer-clean-host: maybe-maintainer-clean-gawk -maintainer-clean-host: maybe-maintainer-clean-gettext -maintainer-clean-host: maybe-maintainer-clean-gnuserv -maintainer-clean-host: maybe-maintainer-clean-gprof -maintainer-clean-host: maybe-maintainer-clean-gzip -maintainer-clean-host: maybe-maintainer-clean-hello -maintainer-clean-host: maybe-maintainer-clean-indent -maintainer-clean-host: maybe-maintainer-clean-intl -maintainer-clean-host: maybe-maintainer-clean-tcl -maintainer-clean-host: maybe-maintainer-clean-itcl -maintainer-clean-host: maybe-maintainer-clean-ld -maintainer-clean-host: maybe-maintainer-clean-libcpp -maintainer-clean-host: maybe-maintainer-clean-libdecnumber -maintainer-clean-host: maybe-maintainer-clean-libgui -maintainer-clean-host: maybe-maintainer-clean-libiberty -maintainer-clean-host: maybe-maintainer-clean-libtool -maintainer-clean-host: maybe-maintainer-clean-m4 -maintainer-clean-host: maybe-maintainer-clean-make -maintainer-clean-host: maybe-maintainer-clean-mmalloc -maintainer-clean-host: maybe-maintainer-clean-patch -maintainer-clean-host: maybe-maintainer-clean-perl -maintainer-clean-host: maybe-maintainer-clean-prms -maintainer-clean-host: maybe-maintainer-clean-rcs -maintainer-clean-host: maybe-maintainer-clean-readline -maintainer-clean-host: maybe-maintainer-clean-release -maintainer-clean-host: maybe-maintainer-clean-recode -maintainer-clean-host: maybe-maintainer-clean-sed -maintainer-clean-host: maybe-maintainer-clean-send-pr -maintainer-clean-host: maybe-maintainer-clean-shellutils -maintainer-clean-host: maybe-maintainer-clean-sid -maintainer-clean-host: maybe-maintainer-clean-sim -maintainer-clean-host: maybe-maintainer-clean-tar -maintainer-clean-host: maybe-maintainer-clean-texinfo -maintainer-clean-host: maybe-maintainer-clean-textutils -maintainer-clean-host: maybe-maintainer-clean-time -maintainer-clean-host: maybe-maintainer-clean-uudecode -maintainer-clean-host: maybe-maintainer-clean-wdiff -maintainer-clean-host: maybe-maintainer-clean-zip -maintainer-clean-host: maybe-maintainer-clean-zlib -maintainer-clean-host: maybe-maintainer-clean-gdb -maintainer-clean-host: maybe-maintainer-clean-expect -maintainer-clean-host: maybe-maintainer-clean-guile -maintainer-clean-host: maybe-maintainer-clean-tk -maintainer-clean-host: maybe-maintainer-clean-libtermcap -maintainer-clean-host: maybe-maintainer-clean-utils -maintainer-clean-host: maybe-maintainer-clean-gnattools +maintainer-clean-host: \ + maybe-maintainer-clean-ash \ + maybe-maintainer-clean-autoconf \ + maybe-maintainer-clean-automake \ + maybe-maintainer-clean-bash \ + maybe-maintainer-clean-bfd \ + maybe-maintainer-clean-opcodes \ + maybe-maintainer-clean-binutils \ + maybe-maintainer-clean-bison \ + maybe-maintainer-clean-byacc \ + maybe-maintainer-clean-bzip2 \ + maybe-maintainer-clean-dejagnu \ + maybe-maintainer-clean-diff \ + maybe-maintainer-clean-dosutils \ + maybe-maintainer-clean-etc \ + maybe-maintainer-clean-fastjar \ + maybe-maintainer-clean-fileutils \ + maybe-maintainer-clean-findutils \ + maybe-maintainer-clean-find \ + maybe-maintainer-clean-flex \ + maybe-maintainer-clean-gas \ + maybe-maintainer-clean-gcc \ + maybe-maintainer-clean-gawk \ + maybe-maintainer-clean-gettext \ + maybe-maintainer-clean-gnuserv \ + maybe-maintainer-clean-gprof \ + maybe-maintainer-clean-gzip \ + maybe-maintainer-clean-hello \ + maybe-maintainer-clean-indent \ + maybe-maintainer-clean-intl \ + maybe-maintainer-clean-tcl \ + maybe-maintainer-clean-itcl \ + maybe-maintainer-clean-ld \ + maybe-maintainer-clean-libcpp \ + maybe-maintainer-clean-libgui \ + maybe-maintainer-clean-libiberty \ + maybe-maintainer-clean-libtool \ + maybe-maintainer-clean-m4 \ + maybe-maintainer-clean-make \ + maybe-maintainer-clean-mmalloc \ + maybe-maintainer-clean-patch \ + maybe-maintainer-clean-perl \ + maybe-maintainer-clean-prms \ + maybe-maintainer-clean-rcs \ + maybe-maintainer-clean-readline \ + maybe-maintainer-clean-release \ + maybe-maintainer-clean-recode \ + maybe-maintainer-clean-sed \ + maybe-maintainer-clean-send-pr \ + maybe-maintainer-clean-shellutils \ + maybe-maintainer-clean-sid \ + maybe-maintainer-clean-sim \ + maybe-maintainer-clean-tar \ + maybe-maintainer-clean-texinfo \ + maybe-maintainer-clean-textutils \ + maybe-maintainer-clean-time \ + maybe-maintainer-clean-uudecode \ + maybe-maintainer-clean-wdiff \ + maybe-maintainer-clean-zip \ + maybe-maintainer-clean-zlib \ + maybe-maintainer-clean-gdb \ + maybe-maintainer-clean-expect \ + maybe-maintainer-clean-guile \ + maybe-maintainer-clean-tk \ + maybe-maintainer-clean-libtermcap \ + maybe-maintainer-clean-utils .PHONY: maintainer-clean-target - -maintainer-clean-target: maybe-maintainer-clean-target-libstdc++-v3 -maintainer-clean-target: maybe-maintainer-clean-target-libmudflap -maintainer-clean-target: maybe-maintainer-clean-target-libssp -maintainer-clean-target: maybe-maintainer-clean-target-libgcc-math -maintainer-clean-target: maybe-maintainer-clean-target-newlib -maintainer-clean-target: maybe-maintainer-clean-target-libgfortran -maintainer-clean-target: maybe-maintainer-clean-target-libobjc -maintainer-clean-target: maybe-maintainer-clean-target-libtermcap -maintainer-clean-target: maybe-maintainer-clean-target-winsup -maintainer-clean-target: maybe-maintainer-clean-target-libgloss -maintainer-clean-target: maybe-maintainer-clean-target-libiberty -maintainer-clean-target: maybe-maintainer-clean-target-gperf -maintainer-clean-target: maybe-maintainer-clean-target-examples -maintainer-clean-target: maybe-maintainer-clean-target-libffi -maintainer-clean-target: maybe-maintainer-clean-target-libjava -maintainer-clean-target: maybe-maintainer-clean-target-zlib -maintainer-clean-target: maybe-maintainer-clean-target-boehm-gc -maintainer-clean-target: maybe-maintainer-clean-target-qthreads -maintainer-clean-target: maybe-maintainer-clean-target-rda -maintainer-clean-target: maybe-maintainer-clean-target-libada -maintainer-clean-target: maybe-maintainer-clean-target-libgomp +maintainer-clean-target: \ + maybe-maintainer-clean-target-libstdc++-v3 \ + maybe-maintainer-clean-target-libmudflap \ + maybe-maintainer-clean-target-newlib \ + maybe-maintainer-clean-target-libgfortran \ + maybe-maintainer-clean-target-libobjc \ + maybe-maintainer-clean-target-libtermcap \ + maybe-maintainer-clean-target-winsup \ + maybe-maintainer-clean-target-libgloss \ + maybe-maintainer-clean-target-libiberty \ + maybe-maintainer-clean-target-gperf \ + maybe-maintainer-clean-target-examples \ + maybe-maintainer-clean-target-libffi \ + maybe-maintainer-clean-target-libjava \ + maybe-maintainer-clean-target-zlib \ + maybe-maintainer-clean-target-boehm-gc \ + maybe-maintainer-clean-target-qthreads \ + maybe-maintainer-clean-target-rda \ + maybe-maintainer-clean-target-libada # Here are the targets which correspond to the do-X targets. -.PHONY: info installcheck dvi html install-info +.PHONY: info installcheck dvi install-info .PHONY: clean distclean mostlyclean maintainer-clean realclean .PHONY: local-clean local-distclean local-maintainer-clean info: do-info installcheck: do-installcheck dvi: do-dvi -html: do-html # Make sure makeinfo is built before we do a `make info', if we're # in fact building texinfo. @@ -1855,14 +1694,11 @@ local-clean: local-distclean: -rm -f Makefile config.status config.cache mh-frag mt-frag - -rm -f maybedep.tmp serdep.tmp + -rm -f multilib.out multilib.tmp maybedep.tmp serdep.tmp -if [ "$(TARGET_SUBDIR)" != "." ]; then \ rm -rf $(TARGET_SUBDIR); \ else true; fi -rm -rf $(BUILD_SUBDIR) - -if [ "$(HOST_SUBDIR)" != "." ]; then \ - rm -rf $(HOST_SUBDIR); \ - else true; fi -rm -f texinfo/po/Makefile texinfo/po/Makefile.in texinfo/info/Makefile -rm -f texinfo/doc/Makefile texinfo/po/POTFILES -rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null @@ -1880,10 +1716,13 @@ maintainer-clean: local-maintainer-clean do-maintainer-clean local-clean maintainer-clean: local-distclean realclean: maintainer-clean -# Extra dependency for clean-target, owing to the mixed nature of gcc. +# Extra dependency for clean-target, owing to the mixed nature of gcc clean-target: clean-target-libgcc clean-target-libgcc: - test ! -d gcc || (cd gcc && $(MAKE) $@) + test ! -d gcc/libgcc || \ + (cd gcc/libgcc && find . -type d -print) | \ + while read d; do rm -f gcc/$$d/libgcc.a || : ; done + -rm -rf gcc/libgcc # Check target. @@ -1891,8 +1730,7 @@ clean-target-libgcc: check: do-check # Only include modules actually being configured and built. -.PHONY: check-host -check-host: \ +do-check: unstage \ maybe-check-ash \ maybe-check-autoconf \ maybe-check-automake \ @@ -1911,7 +1749,6 @@ check-host: \ maybe-check-fileutils \ maybe-check-findutils \ maybe-check-find \ - maybe-check-fixincludes \ maybe-check-flex \ maybe-check-gas \ maybe-check-gcc \ @@ -1927,7 +1764,6 @@ check-host: \ maybe-check-itcl \ maybe-check-ld \ maybe-check-libcpp \ - maybe-check-libdecnumber \ maybe-check-libgui \ maybe-check-libiberty \ maybe-check-libtool \ @@ -1960,14 +1796,8 @@ check-host: \ maybe-check-tk \ maybe-check-libtermcap \ maybe-check-utils \ - maybe-check-gnattools - -.PHONY: check-target -check-target: \ maybe-check-target-libstdc++-v3 \ maybe-check-target-libmudflap \ - maybe-check-target-libssp \ - maybe-check-target-libgcc-math \ maybe-check-target-newlib \ maybe-check-target-libgfortran \ maybe-check-target-libobjc \ @@ -1983,14 +1813,7 @@ check-target: \ maybe-check-target-boehm-gc \ maybe-check-target-qthreads \ maybe-check-target-rda \ - maybe-check-target-libada \ - maybe-check-target-libgomp - -do-check: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) check-host check-target + maybe-check-target-libada stage # Automated reporting of test results. @@ -2016,11 +1839,7 @@ mail-report-with-warnings.log: warning.log # Installation targets. .PHONY: install uninstall -install: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target +install: installdirs install-host install-target .PHONY: install-host-nogcc install-host-nogcc: \ @@ -2042,7 +1861,6 @@ install-host-nogcc: \ maybe-install-fileutils \ maybe-install-findutils \ maybe-install-find \ - maybe-install-fixincludes \ maybe-install-flex \ maybe-install-gas \ maybe-install-gawk \ @@ -2057,7 +1875,6 @@ install-host-nogcc: \ maybe-install-itcl \ maybe-install-ld \ maybe-install-libcpp \ - maybe-install-libdecnumber \ maybe-install-libgui \ maybe-install-libiberty \ maybe-install-libtool \ @@ -2089,8 +1906,7 @@ install-host-nogcc: \ maybe-install-guile \ maybe-install-tk \ maybe-install-libtermcap \ - maybe-install-utils \ - maybe-install-gnattools + maybe-install-utils .PHONY: install-host install-host: \ @@ -2112,7 +1928,6 @@ install-host: \ maybe-install-fileutils \ maybe-install-findutils \ maybe-install-find \ - maybe-install-fixincludes \ maybe-install-flex \ maybe-install-gas \ maybe-install-gcc \ @@ -2128,7 +1943,6 @@ install-host: \ maybe-install-itcl \ maybe-install-ld \ maybe-install-libcpp \ - maybe-install-libdecnumber \ maybe-install-libgui \ maybe-install-libiberty \ maybe-install-libtool \ @@ -2160,15 +1974,12 @@ install-host: \ maybe-install-guile \ maybe-install-tk \ maybe-install-libtermcap \ - maybe-install-utils \ - maybe-install-gnattools + maybe-install-utils .PHONY: install-target install-target: \ maybe-install-target-libstdc++-v3 \ maybe-install-target-libmudflap \ - maybe-install-target-libssp \ - maybe-install-target-libgcc-math \ maybe-install-target-newlib \ maybe-install-target-libgfortran \ maybe-install-target-libobjc \ @@ -2184,8 +1995,7 @@ install-target: \ maybe-install-target-boehm-gc \ maybe-install-target-qthreads \ maybe-install-target-rda \ - maybe-install-target-libada \ - maybe-install-target-libgomp + maybe-install-target-libada uninstall: @echo "the uninstall target is not supported in this tree" @@ -2194,7 +2004,7 @@ uninstall: install.all: install-no-fixedincludes @if [ -f ./gcc/Makefile ] ; then \ r=`${PWD_COMMAND}` ; export r ; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ (cd ./gcc && \ $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \ @@ -2238,418 +2048,521 @@ etags tags: TAGS # built are. TAGS: do-TAGS -# ------------------------------------ -# Macros for configure and all targets -# ------------------------------------ - - - - - # -------------------------------------- # Modules which run on the build machine # -------------------------------------- - .PHONY: configure-build-libiberty maybe-configure-build-libiberty maybe-configure-build-libiberty: @if build-libiberty maybe-configure-build-libiberty: configure-build-libiberty -configure-build-libiberty: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \ +configure-build-libiberty: + @test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libiberty ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/libiberty; \ cd "$(BUILD_SUBDIR)/libiberty" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(BUILD_SUBDIR)/libiberty/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(BUILD_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libiberty"; \ - libsrcdir="$$s/libiberty"; \ + 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 \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + 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 \ - $(BUILD_CONFIGARGS) $${srcdiroption} \ + $(BUILD_CONFIGARGS) $${srcdiroption} \ + --with-build-subdir="$(BUILD_SUBDIR)" \ || exit 1 @endif build-libiberty - - - - .PHONY: all-build-libiberty maybe-all-build-libiberty maybe-all-build-libiberty: @if build-libiberty TARGET-build-libiberty=all maybe-all-build-libiberty: all-build-libiberty all-build-libiberty: configure-build-libiberty - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/libiberty && \ - $(MAKE) $(TARGET-build-libiberty)) + $(MAKE) $(TARGET-build-libiberty)) @endif build-libiberty - - - - .PHONY: configure-build-bison maybe-configure-build-bison maybe-configure-build-bison: @if build-bison maybe-configure-build-bison: configure-build-bison -configure-build-bison: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(BUILD_SUBDIR)/bison/Makefile || exit 0; \ +configure-build-bison: + @test ! -f $(BUILD_SUBDIR)/bison/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/bison; \ cd "$(BUILD_SUBDIR)/bison" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(BUILD_SUBDIR)/bison/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(BUILD_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/bison"; \ - libsrcdir="$$s/bison"; \ + 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 \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ + srcdiroption="--srcdir=$${topdir}/bison"; \ + libsrcdir="$$s/bison"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(BUILD_CONFIGARGS) $${srcdiroption} \ + $(BUILD_CONFIGARGS) $${srcdiroption} \ + --with-build-subdir="$(BUILD_SUBDIR)" \ || exit 1 @endif build-bison - - - - .PHONY: all-build-bison maybe-all-build-bison maybe-all-build-bison: @if build-bison TARGET-build-bison=all maybe-all-build-bison: all-build-bison all-build-bison: configure-build-bison - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/bison && \ - $(MAKE) $(TARGET-build-bison)) + $(MAKE) $(TARGET-build-bison)) @endif build-bison - - - - .PHONY: configure-build-byacc maybe-configure-build-byacc maybe-configure-build-byacc: @if build-byacc maybe-configure-build-byacc: configure-build-byacc -configure-build-byacc: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(BUILD_SUBDIR)/byacc/Makefile || exit 0; \ +configure-build-byacc: + @test ! -f $(BUILD_SUBDIR)/byacc/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/byacc ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/byacc; \ cd "$(BUILD_SUBDIR)/byacc" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(BUILD_SUBDIR)/byacc/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(BUILD_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/byacc"; \ - libsrcdir="$$s/byacc"; \ + 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 \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ + srcdiroption="--srcdir=$${topdir}/byacc"; \ + libsrcdir="$$s/byacc"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(BUILD_CONFIGARGS) $${srcdiroption} \ + $(BUILD_CONFIGARGS) $${srcdiroption} \ + --with-build-subdir="$(BUILD_SUBDIR)" \ || exit 1 @endif build-byacc - - - - .PHONY: all-build-byacc maybe-all-build-byacc maybe-all-build-byacc: @if build-byacc TARGET-build-byacc=all maybe-all-build-byacc: all-build-byacc all-build-byacc: configure-build-byacc - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/byacc && \ - $(MAKE) $(TARGET-build-byacc)) + $(MAKE) $(TARGET-build-byacc)) @endif build-byacc - - - - .PHONY: configure-build-flex maybe-configure-build-flex maybe-configure-build-flex: @if build-flex maybe-configure-build-flex: configure-build-flex -configure-build-flex: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(BUILD_SUBDIR)/flex/Makefile || exit 0; \ +configure-build-flex: + @test ! -f $(BUILD_SUBDIR)/flex/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/flex; \ cd "$(BUILD_SUBDIR)/flex" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(BUILD_SUBDIR)/flex/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(BUILD_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/flex"; \ - libsrcdir="$$s/flex"; \ + 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 \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ + srcdiroption="--srcdir=$${topdir}/flex"; \ + libsrcdir="$$s/flex"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(BUILD_CONFIGARGS) $${srcdiroption} \ + $(BUILD_CONFIGARGS) $${srcdiroption} \ + --with-build-subdir="$(BUILD_SUBDIR)" \ || exit 1 @endif build-flex - - - - .PHONY: all-build-flex maybe-all-build-flex maybe-all-build-flex: @if build-flex TARGET-build-flex=all maybe-all-build-flex: all-build-flex all-build-flex: configure-build-flex - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/flex && \ - $(MAKE) $(TARGET-build-flex)) + $(MAKE) $(TARGET-build-flex)) @endif build-flex - - - - .PHONY: configure-build-m4 maybe-configure-build-m4 maybe-configure-build-m4: @if build-m4 maybe-configure-build-m4: configure-build-m4 -configure-build-m4: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(BUILD_SUBDIR)/m4/Makefile || exit 0; \ +configure-build-m4: + @test ! -f $(BUILD_SUBDIR)/m4/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4 ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/m4; \ cd "$(BUILD_SUBDIR)/m4" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(BUILD_SUBDIR)/m4/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(BUILD_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/m4"; \ - libsrcdir="$$s/m4"; \ + 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 \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ + srcdiroption="--srcdir=$${topdir}/m4"; \ + libsrcdir="$$s/m4"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(BUILD_CONFIGARGS) $${srcdiroption} \ + $(BUILD_CONFIGARGS) $${srcdiroption} \ + --with-build-subdir="$(BUILD_SUBDIR)" \ || exit 1 @endif build-m4 - - - - .PHONY: all-build-m4 maybe-all-build-m4 maybe-all-build-m4: @if build-m4 TARGET-build-m4=all maybe-all-build-m4: all-build-m4 all-build-m4: configure-build-m4 - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/m4 && \ - $(MAKE) $(TARGET-build-m4)) + $(MAKE) $(TARGET-build-m4)) @endif build-m4 - - - - .PHONY: configure-build-texinfo maybe-configure-build-texinfo maybe-configure-build-texinfo: @if build-texinfo maybe-configure-build-texinfo: configure-build-texinfo -configure-build-texinfo: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \ +configure-build-texinfo: + @test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/texinfo; \ cd "$(BUILD_SUBDIR)/texinfo" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(BUILD_SUBDIR)/texinfo/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(BUILD_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/texinfo"; \ - libsrcdir="$$s/texinfo"; \ + 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 \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ + srcdiroption="--srcdir=$${topdir}/texinfo"; \ + libsrcdir="$$s/texinfo"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(BUILD_CONFIGARGS) $${srcdiroption} \ + $(BUILD_CONFIGARGS) $${srcdiroption} \ + --with-build-subdir="$(BUILD_SUBDIR)" \ || exit 1 @endif build-texinfo - - - - .PHONY: all-build-texinfo maybe-all-build-texinfo maybe-all-build-texinfo: @if build-texinfo TARGET-build-texinfo=all maybe-all-build-texinfo: all-build-texinfo all-build-texinfo: configure-build-texinfo - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/texinfo && \ - $(MAKE) $(TARGET-build-texinfo)) + $(MAKE) $(TARGET-build-texinfo)) @endif build-texinfo - - - - .PHONY: configure-build-fixincludes maybe-configure-build-fixincludes maybe-configure-build-fixincludes: @if build-fixincludes maybe-configure-build-fixincludes: configure-build-fixincludes -configure-build-fixincludes: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \ +configure-build-fixincludes: + @test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/fixincludes; \ cd "$(BUILD_SUBDIR)/fixincludes" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(BUILD_SUBDIR)/fixincludes/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(BUILD_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/fixincludes"; \ - libsrcdir="$$s/fixincludes"; \ + 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 \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ + srcdiroption="--srcdir=$${topdir}/fixincludes"; \ + libsrcdir="$$s/fixincludes"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(BUILD_CONFIGARGS) $${srcdiroption} \ + $(BUILD_CONFIGARGS) $${srcdiroption} \ + --with-build-subdir="$(BUILD_SUBDIR)" \ || exit 1 @endif build-fixincludes - - - - .PHONY: all-build-fixincludes maybe-all-build-fixincludes maybe-all-build-fixincludes: @if build-fixincludes TARGET-build-fixincludes=all maybe-all-build-fixincludes: all-build-fixincludes all-build-fixincludes: configure-build-fixincludes - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/fixincludes && \ - $(MAKE) $(TARGET-build-fixincludes)) + $(MAKE) $(TARGET-build-fixincludes)) @endif build-fixincludes - - - # -------------------------------------- # Modules which run on the host machine # -------------------------------------- - .PHONY: configure-ash maybe-configure-ash maybe-configure-ash: @if ash maybe-configure-ash: configure-ash -configure-ash: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-ash: + @test ! -f ash/Makefile || exit 0; \ + [ -d ash ] || mkdir ash; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/ash/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ash ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/ash; \ - cd "$(HOST_SUBDIR)/ash" || exit 1; \ + echo Configuring in ash; \ + cd ash || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/ash/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/ash"; \ + libsrcdir="$$s/ash";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/ash"; \ + libsrcdir="$$s/ash";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/ash"; \ - libsrcdir="$$s/ash"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif ash - - - - .PHONY: all-ash maybe-all-ash maybe-all-ash: @if ash -TARGET-ash=all maybe-all-ash: all-ash all-ash: configure-ash - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/ash && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-ash)) + (cd ash && $(MAKE) $(FLAGS_TO_PASS) all) @endif ash - - - .PHONY: check-ash maybe-check-ash maybe-check-ash: @if ash maybe-check-ash: check-ash check-ash: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/ash && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd ash && $(MAKE) $(FLAGS_TO_PASS) check) @endif ash @@ -2659,12 +2572,11 @@ maybe-install-ash: maybe-install-ash: install-ash install-ash: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/ash && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd ash && $(MAKE) $(FLAGS_TO_PASS) install) @endif ash @@ -2677,16 +2589,16 @@ maybe-info-ash: info-ash info-ash: \ configure-ash - @: $(MAKE); $(unstage) @[ -f ./ash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in ash" ; \ - (cd $(HOST_SUBDIR)/ash && \ + (cd ash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -2703,16 +2615,16 @@ maybe-dvi-ash: dvi-ash dvi-ash: \ configure-ash - @: $(MAKE); $(unstage) @[ -f ./ash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in ash" ; \ - (cd $(HOST_SUBDIR)/ash && \ + (cd ash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -2722,32 +2634,6 @@ dvi-ash: \ @endif ash -.PHONY: maybe-html-ash html-ash -maybe-html-ash: -@if ash -maybe-html-ash: html-ash - -html-ash: \ - configure-ash - @: $(MAKE); $(unstage) - @[ -f ./ash/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in ash" ; \ - (cd $(HOST_SUBDIR)/ash && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif ash - .PHONY: maybe-TAGS-ash TAGS-ash maybe-TAGS-ash: @if ash @@ -2755,16 +2641,16 @@ maybe-TAGS-ash: TAGS-ash TAGS-ash: \ configure-ash - @: $(MAKE); $(unstage) @[ -f ./ash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in ash" ; \ - (cd $(HOST_SUBDIR)/ash && \ + (cd ash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -2782,16 +2668,16 @@ maybe-install-info-ash: install-info-ash install-info-ash: \ configure-ash \ info-ash - @: $(MAKE); $(unstage) @[ -f ./ash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in ash" ; \ - (cd $(HOST_SUBDIR)/ash && \ + (cd ash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -2808,16 +2694,16 @@ maybe-installcheck-ash: installcheck-ash installcheck-ash: \ configure-ash - @: $(MAKE); $(unstage) @[ -f ./ash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in ash" ; \ - (cd $(HOST_SUBDIR)/ash && \ + (cd ash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -2833,16 +2719,16 @@ maybe-mostlyclean-ash: maybe-mostlyclean-ash: mostlyclean-ash mostlyclean-ash: - @: $(MAKE); $(unstage) @[ -f ./ash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in ash" ; \ - (cd $(HOST_SUBDIR)/ash && \ + (cd ash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -2858,16 +2744,16 @@ maybe-clean-ash: maybe-clean-ash: clean-ash clean-ash: - @: $(MAKE); $(unstage) @[ -f ./ash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in ash" ; \ - (cd $(HOST_SUBDIR)/ash && \ + (cd ash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -2883,16 +2769,16 @@ maybe-distclean-ash: maybe-distclean-ash: distclean-ash distclean-ash: - @: $(MAKE); $(unstage) @[ -f ./ash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in ash" ; \ - (cd $(HOST_SUBDIR)/ash && \ + (cd ash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -2908,16 +2794,16 @@ maybe-maintainer-clean-ash: maybe-maintainer-clean-ash: maintainer-clean-ash maintainer-clean-ash: - @: $(MAKE); $(unstage) @[ -f ./ash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in ash" ; \ - (cd $(HOST_SUBDIR)/ash && \ + (cd ash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -2928,65 +2814,57 @@ maintainer-clean-ash: @endif ash - .PHONY: configure-autoconf maybe-configure-autoconf maybe-configure-autoconf: @if autoconf maybe-configure-autoconf: configure-autoconf -configure-autoconf: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-autoconf: + @test ! -f autoconf/Makefile || exit 0; \ + [ -d autoconf ] || mkdir autoconf; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/autoconf/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/autoconf ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/autoconf; \ - cd "$(HOST_SUBDIR)/autoconf" || exit 1; \ + echo Configuring in autoconf; \ + cd autoconf || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/autoconf/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/autoconf"; \ + libsrcdir="$$s/autoconf";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/autoconf"; \ + libsrcdir="$$s/autoconf";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/autoconf"; \ - libsrcdir="$$s/autoconf"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif autoconf - - - - .PHONY: all-autoconf maybe-all-autoconf maybe-all-autoconf: @if autoconf -TARGET-autoconf=all maybe-all-autoconf: all-autoconf all-autoconf: configure-autoconf - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/autoconf && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-autoconf)) + (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) all) @endif autoconf - - - .PHONY: check-autoconf maybe-check-autoconf maybe-check-autoconf: @if autoconf maybe-check-autoconf: check-autoconf check-autoconf: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/autoconf && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) check) @endif autoconf @@ -2996,12 +2874,11 @@ maybe-install-autoconf: maybe-install-autoconf: install-autoconf install-autoconf: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/autoconf && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) install) @endif autoconf @@ -3014,16 +2891,16 @@ maybe-info-autoconf: info-autoconf info-autoconf: \ configure-autoconf - @: $(MAKE); $(unstage) @[ -f ./autoconf/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in autoconf" ; \ - (cd $(HOST_SUBDIR)/autoconf && \ + (cd autoconf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3040,16 +2917,16 @@ maybe-dvi-autoconf: dvi-autoconf dvi-autoconf: \ configure-autoconf - @: $(MAKE); $(unstage) @[ -f ./autoconf/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in autoconf" ; \ - (cd $(HOST_SUBDIR)/autoconf && \ + (cd autoconf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3059,32 +2936,6 @@ dvi-autoconf: \ @endif autoconf -.PHONY: maybe-html-autoconf html-autoconf -maybe-html-autoconf: -@if autoconf -maybe-html-autoconf: html-autoconf - -html-autoconf: \ - configure-autoconf - @: $(MAKE); $(unstage) - @[ -f ./autoconf/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in autoconf" ; \ - (cd $(HOST_SUBDIR)/autoconf && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif autoconf - .PHONY: maybe-TAGS-autoconf TAGS-autoconf maybe-TAGS-autoconf: @if autoconf @@ -3092,16 +2943,16 @@ maybe-TAGS-autoconf: TAGS-autoconf TAGS-autoconf: \ configure-autoconf - @: $(MAKE); $(unstage) @[ -f ./autoconf/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in autoconf" ; \ - (cd $(HOST_SUBDIR)/autoconf && \ + (cd autoconf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3119,16 +2970,16 @@ maybe-install-info-autoconf: install-info-autoconf install-info-autoconf: \ configure-autoconf \ info-autoconf - @: $(MAKE); $(unstage) @[ -f ./autoconf/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in autoconf" ; \ - (cd $(HOST_SUBDIR)/autoconf && \ + (cd autoconf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3145,16 +2996,16 @@ maybe-installcheck-autoconf: installcheck-autoconf installcheck-autoconf: \ configure-autoconf - @: $(MAKE); $(unstage) @[ -f ./autoconf/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in autoconf" ; \ - (cd $(HOST_SUBDIR)/autoconf && \ + (cd autoconf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3170,16 +3021,16 @@ maybe-mostlyclean-autoconf: maybe-mostlyclean-autoconf: mostlyclean-autoconf mostlyclean-autoconf: - @: $(MAKE); $(unstage) @[ -f ./autoconf/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in autoconf" ; \ - (cd $(HOST_SUBDIR)/autoconf && \ + (cd autoconf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3195,16 +3046,16 @@ maybe-clean-autoconf: maybe-clean-autoconf: clean-autoconf clean-autoconf: - @: $(MAKE); $(unstage) @[ -f ./autoconf/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in autoconf" ; \ - (cd $(HOST_SUBDIR)/autoconf && \ + (cd autoconf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3220,16 +3071,16 @@ maybe-distclean-autoconf: maybe-distclean-autoconf: distclean-autoconf distclean-autoconf: - @: $(MAKE); $(unstage) @[ -f ./autoconf/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in autoconf" ; \ - (cd $(HOST_SUBDIR)/autoconf && \ + (cd autoconf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3245,16 +3096,16 @@ maybe-maintainer-clean-autoconf: maybe-maintainer-clean-autoconf: maintainer-clean-autoconf maintainer-clean-autoconf: - @: $(MAKE); $(unstage) @[ -f ./autoconf/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in autoconf" ; \ - (cd $(HOST_SUBDIR)/autoconf && \ + (cd autoconf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3265,65 +3116,57 @@ maintainer-clean-autoconf: @endif autoconf - .PHONY: configure-automake maybe-configure-automake maybe-configure-automake: @if automake maybe-configure-automake: configure-automake -configure-automake: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-automake: + @test ! -f automake/Makefile || exit 0; \ + [ -d automake ] || mkdir automake; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/automake/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/automake ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/automake; \ - cd "$(HOST_SUBDIR)/automake" || exit 1; \ + echo Configuring in automake; \ + cd automake || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/automake/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/automake"; \ + libsrcdir="$$s/automake";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/automake"; \ + libsrcdir="$$s/automake";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/automake"; \ - libsrcdir="$$s/automake"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif automake - - - - .PHONY: all-automake maybe-all-automake maybe-all-automake: @if automake -TARGET-automake=all maybe-all-automake: all-automake all-automake: configure-automake - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/automake && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-automake)) + (cd automake && $(MAKE) $(FLAGS_TO_PASS) all) @endif automake - - - .PHONY: check-automake maybe-check-automake maybe-check-automake: @if automake maybe-check-automake: check-automake check-automake: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/automake && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd automake && $(MAKE) $(FLAGS_TO_PASS) check) @endif automake @@ -3333,12 +3176,11 @@ maybe-install-automake: maybe-install-automake: install-automake install-automake: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/automake && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd automake && $(MAKE) $(FLAGS_TO_PASS) install) @endif automake @@ -3351,16 +3193,16 @@ maybe-info-automake: info-automake info-automake: \ configure-automake - @: $(MAKE); $(unstage) @[ -f ./automake/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in automake" ; \ - (cd $(HOST_SUBDIR)/automake && \ + (cd automake && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3377,16 +3219,16 @@ maybe-dvi-automake: dvi-automake dvi-automake: \ configure-automake - @: $(MAKE); $(unstage) @[ -f ./automake/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in automake" ; \ - (cd $(HOST_SUBDIR)/automake && \ + (cd automake && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3396,32 +3238,6 @@ dvi-automake: \ @endif automake -.PHONY: maybe-html-automake html-automake -maybe-html-automake: -@if automake -maybe-html-automake: html-automake - -html-automake: \ - configure-automake - @: $(MAKE); $(unstage) - @[ -f ./automake/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in automake" ; \ - (cd $(HOST_SUBDIR)/automake && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif automake - .PHONY: maybe-TAGS-automake TAGS-automake maybe-TAGS-automake: @if automake @@ -3429,16 +3245,16 @@ maybe-TAGS-automake: TAGS-automake TAGS-automake: \ configure-automake - @: $(MAKE); $(unstage) @[ -f ./automake/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in automake" ; \ - (cd $(HOST_SUBDIR)/automake && \ + (cd automake && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3456,16 +3272,16 @@ maybe-install-info-automake: install-info-automake install-info-automake: \ configure-automake \ info-automake - @: $(MAKE); $(unstage) @[ -f ./automake/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in automake" ; \ - (cd $(HOST_SUBDIR)/automake && \ + (cd automake && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3482,16 +3298,16 @@ maybe-installcheck-automake: installcheck-automake installcheck-automake: \ configure-automake - @: $(MAKE); $(unstage) @[ -f ./automake/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in automake" ; \ - (cd $(HOST_SUBDIR)/automake && \ + (cd automake && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3507,16 +3323,16 @@ maybe-mostlyclean-automake: maybe-mostlyclean-automake: mostlyclean-automake mostlyclean-automake: - @: $(MAKE); $(unstage) @[ -f ./automake/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in automake" ; \ - (cd $(HOST_SUBDIR)/automake && \ + (cd automake && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3532,16 +3348,16 @@ maybe-clean-automake: maybe-clean-automake: clean-automake clean-automake: - @: $(MAKE); $(unstage) @[ -f ./automake/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in automake" ; \ - (cd $(HOST_SUBDIR)/automake && \ + (cd automake && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3557,16 +3373,16 @@ maybe-distclean-automake: maybe-distclean-automake: distclean-automake distclean-automake: - @: $(MAKE); $(unstage) @[ -f ./automake/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in automake" ; \ - (cd $(HOST_SUBDIR)/automake && \ + (cd automake && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3582,16 +3398,16 @@ maybe-maintainer-clean-automake: maybe-maintainer-clean-automake: maintainer-clean-automake maintainer-clean-automake: - @: $(MAKE); $(unstage) @[ -f ./automake/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in automake" ; \ - (cd $(HOST_SUBDIR)/automake && \ + (cd automake && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3602,65 +3418,57 @@ maintainer-clean-automake: @endif automake - .PHONY: configure-bash maybe-configure-bash maybe-configure-bash: @if bash maybe-configure-bash: configure-bash -configure-bash: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-bash: + @test ! -f bash/Makefile || exit 0; \ + [ -d bash ] || mkdir bash; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/bash/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bash ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/bash; \ - cd "$(HOST_SUBDIR)/bash" || exit 1; \ + echo Configuring in bash; \ + cd bash || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/bash/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/bash"; \ + libsrcdir="$$s/bash";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/bash"; \ + libsrcdir="$$s/bash";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/bash"; \ - libsrcdir="$$s/bash"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif bash - - - - .PHONY: all-bash maybe-all-bash maybe-all-bash: @if bash -TARGET-bash=all maybe-all-bash: all-bash all-bash: configure-bash - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/bash && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-bash)) + (cd bash && $(MAKE) $(FLAGS_TO_PASS) all) @endif bash - - - .PHONY: check-bash maybe-check-bash maybe-check-bash: @if bash maybe-check-bash: check-bash check-bash: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/bash && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd bash && $(MAKE) $(FLAGS_TO_PASS) check) @endif bash @@ -3670,12 +3478,11 @@ maybe-install-bash: maybe-install-bash: install-bash install-bash: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/bash && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd bash && $(MAKE) $(FLAGS_TO_PASS) install) @endif bash @@ -3688,16 +3495,16 @@ maybe-info-bash: info-bash info-bash: \ configure-bash - @: $(MAKE); $(unstage) @[ -f ./bash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in bash" ; \ - (cd $(HOST_SUBDIR)/bash && \ + (cd bash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3714,16 +3521,16 @@ maybe-dvi-bash: dvi-bash dvi-bash: \ configure-bash - @: $(MAKE); $(unstage) @[ -f ./bash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in bash" ; \ - (cd $(HOST_SUBDIR)/bash && \ + (cd bash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3733,32 +3540,6 @@ dvi-bash: \ @endif bash -.PHONY: maybe-html-bash html-bash -maybe-html-bash: -@if bash -maybe-html-bash: html-bash - -html-bash: \ - configure-bash - @: $(MAKE); $(unstage) - @[ -f ./bash/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in bash" ; \ - (cd $(HOST_SUBDIR)/bash && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif bash - .PHONY: maybe-TAGS-bash TAGS-bash maybe-TAGS-bash: @if bash @@ -3766,16 +3547,16 @@ maybe-TAGS-bash: TAGS-bash TAGS-bash: \ configure-bash - @: $(MAKE); $(unstage) @[ -f ./bash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in bash" ; \ - (cd $(HOST_SUBDIR)/bash && \ + (cd bash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3793,16 +3574,16 @@ maybe-install-info-bash: install-info-bash install-info-bash: \ configure-bash \ info-bash - @: $(MAKE); $(unstage) @[ -f ./bash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in bash" ; \ - (cd $(HOST_SUBDIR)/bash && \ + (cd bash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3819,16 +3600,16 @@ maybe-installcheck-bash: installcheck-bash installcheck-bash: \ configure-bash - @: $(MAKE); $(unstage) @[ -f ./bash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in bash" ; \ - (cd $(HOST_SUBDIR)/bash && \ + (cd bash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3844,16 +3625,16 @@ maybe-mostlyclean-bash: maybe-mostlyclean-bash: mostlyclean-bash mostlyclean-bash: - @: $(MAKE); $(unstage) @[ -f ./bash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in bash" ; \ - (cd $(HOST_SUBDIR)/bash && \ + (cd bash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3869,16 +3650,16 @@ maybe-clean-bash: maybe-clean-bash: clean-bash clean-bash: - @: $(MAKE); $(unstage) @[ -f ./bash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in bash" ; \ - (cd $(HOST_SUBDIR)/bash && \ + (cd bash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3894,16 +3675,16 @@ maybe-distclean-bash: maybe-distclean-bash: distclean-bash distclean-bash: - @: $(MAKE); $(unstage) @[ -f ./bash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in bash" ; \ - (cd $(HOST_SUBDIR)/bash && \ + (cd bash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3919,16 +3700,16 @@ maybe-maintainer-clean-bash: maybe-maintainer-clean-bash: maintainer-clean-bash maintainer-clean-bash: - @: $(MAKE); $(unstage) @[ -f ./bash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in bash" ; \ - (cd $(HOST_SUBDIR)/bash && \ + (cd bash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3939,422 +3720,59 @@ maintainer-clean-bash: @endif bash - .PHONY: configure-bfd maybe-configure-bfd maybe-configure-bfd: @if bfd maybe-configure-bfd: configure-bfd -configure-bfd: -@endif bfd -@if bfd-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif bfd-bootstrap -@if bfd - @r=`${PWD_COMMAND}`; export r; \ +configure-bfd: + @test -f stage_last && exit 0; \ + test ! -f bfd/Makefile || exit 0; \ + [ -d bfd ] || mkdir bfd; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/bfd; \ - cd "$(HOST_SUBDIR)/bfd" || exit 1; \ + echo Configuring in bfd; \ + cd bfd || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/bfd"; \ + libsrcdir="$$s/bfd";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/bfd"; \ + libsrcdir="$$s/bfd";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/bfd"; \ - libsrcdir="$$s/bfd"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif bfd - - -.PHONY: configure-stage1-bfd maybe-configure-stage1-bfd -maybe-configure-stage1-bfd: -@if bfd-bootstrap -maybe-configure-stage1-bfd: configure-stage1-bfd -configure-stage1-bfd: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ - cd $(HOST_SUBDIR)/bfd || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/bfd"; \ - libsrcdir="$$s/bfd"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" -@endif bfd-bootstrap - -.PHONY: configure-stage2-bfd maybe-configure-stage2-bfd -maybe-configure-stage2-bfd: -@if bfd-bootstrap -maybe-configure-stage2-bfd: configure-stage2-bfd -configure-stage2-bfd: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ - cd $(HOST_SUBDIR)/bfd || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/bfd"; \ - libsrcdir="$$s/bfd"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif bfd-bootstrap - -.PHONY: configure-stage3-bfd maybe-configure-stage3-bfd -maybe-configure-stage3-bfd: -@if bfd-bootstrap -maybe-configure-stage3-bfd: configure-stage3-bfd -configure-stage3-bfd: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ - cd $(HOST_SUBDIR)/bfd || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/bfd"; \ - libsrcdir="$$s/bfd"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif bfd-bootstrap - -.PHONY: configure-stage4-bfd maybe-configure-stage4-bfd -maybe-configure-stage4-bfd: -@if bfd-bootstrap -maybe-configure-stage4-bfd: configure-stage4-bfd -configure-stage4-bfd: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ - cd $(HOST_SUBDIR)/bfd || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/bfd"; \ - libsrcdir="$$s/bfd"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif bfd-bootstrap - -.PHONY: configure-stageprofile-bfd maybe-configure-stageprofile-bfd -maybe-configure-stageprofile-bfd: -@if bfd-bootstrap -maybe-configure-stageprofile-bfd: configure-stageprofile-bfd -configure-stageprofile-bfd: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ - cd $(HOST_SUBDIR)/bfd || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/bfd"; \ - libsrcdir="$$s/bfd"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif bfd-bootstrap - -.PHONY: configure-stagefeedback-bfd maybe-configure-stagefeedback-bfd -maybe-configure-stagefeedback-bfd: -@if bfd-bootstrap -maybe-configure-stagefeedback-bfd: configure-stagefeedback-bfd -configure-stagefeedback-bfd: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ - cd $(HOST_SUBDIR)/bfd || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/bfd"; \ - libsrcdir="$$s/bfd"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif bfd-bootstrap - - - - - .PHONY: all-bfd maybe-all-bfd maybe-all-bfd: @if bfd -TARGET-bfd=all maybe-all-bfd: all-bfd all-bfd: configure-bfd -@endif bfd -@if bfd-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif bfd-bootstrap -@if bfd - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-bfd)) + (cd bfd && $(MAKE) $(FLAGS_TO_PASS) all) @endif bfd - - -.PHONY: all-stage1-bfd maybe-all-stage1-bfd -.PHONY: clean-stage1-bfd maybe-clean-stage1-bfd -maybe-all-stage1-bfd: -maybe-clean-stage1-bfd: -@if bfd-bootstrap -maybe-all-stage1-bfd: all-stage1-bfd -all-stage1: all-stage1-bfd -TARGET-stage1-bfd = $(TARGET-bfd) -all-stage1-bfd: configure-stage1-bfd - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ - $(TARGET-stage1-bfd) - -maybe-clean-stage1-bfd: clean-stage1-bfd -clean-stage1: clean-stage1-bfd -clean-stage1-bfd: - @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-bfd/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ - cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" clean -@endif bfd-bootstrap - - -.PHONY: all-stage2-bfd maybe-all-stage2-bfd -.PHONY: clean-stage2-bfd maybe-clean-stage2-bfd -maybe-all-stage2-bfd: -maybe-clean-stage2-bfd: -@if bfd-bootstrap -maybe-all-stage2-bfd: all-stage2-bfd -all-stage2: all-stage2-bfd -TARGET-stage2-bfd = $(TARGET-bfd) -all-stage2-bfd: configure-stage2-bfd - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage2-bfd) - -maybe-clean-stage2-bfd: clean-stage2-bfd -clean-stage2: clean-stage2-bfd -clean-stage2-bfd: - @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-bfd/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ - cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif bfd-bootstrap - - -.PHONY: all-stage3-bfd maybe-all-stage3-bfd -.PHONY: clean-stage3-bfd maybe-clean-stage3-bfd -maybe-all-stage3-bfd: -maybe-clean-stage3-bfd: -@if bfd-bootstrap -maybe-all-stage3-bfd: all-stage3-bfd -all-stage3: all-stage3-bfd -TARGET-stage3-bfd = $(TARGET-bfd) -all-stage3-bfd: configure-stage3-bfd - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage3-bfd) - -maybe-clean-stage3-bfd: clean-stage3-bfd -clean-stage3: clean-stage3-bfd -clean-stage3-bfd: - @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-bfd/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ - cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif bfd-bootstrap - - -.PHONY: all-stage4-bfd maybe-all-stage4-bfd -.PHONY: clean-stage4-bfd maybe-clean-stage4-bfd -maybe-all-stage4-bfd: -maybe-clean-stage4-bfd: -@if bfd-bootstrap -maybe-all-stage4-bfd: all-stage4-bfd -all-stage4: all-stage4-bfd -TARGET-stage4-bfd = $(TARGET-bfd) -all-stage4-bfd: configure-stage4-bfd - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage4-bfd) - -maybe-clean-stage4-bfd: clean-stage4-bfd -clean-stage4: clean-stage4-bfd -clean-stage4-bfd: - @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-bfd/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ - cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif bfd-bootstrap - - -.PHONY: all-stageprofile-bfd maybe-all-stageprofile-bfd -.PHONY: clean-stageprofile-bfd maybe-clean-stageprofile-bfd -maybe-all-stageprofile-bfd: -maybe-clean-stageprofile-bfd: -@if bfd-bootstrap -maybe-all-stageprofile-bfd: all-stageprofile-bfd -all-stageprofile: all-stageprofile-bfd -TARGET-stageprofile-bfd = $(TARGET-bfd) -all-stageprofile-bfd: configure-stageprofile-bfd - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" \ - $(TARGET-stageprofile-bfd) - -maybe-clean-stageprofile-bfd: clean-stageprofile-bfd -clean-stageprofile: clean-stageprofile-bfd -clean-stageprofile-bfd: - @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-bfd/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ - cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean -@endif bfd-bootstrap - - -.PHONY: all-stagefeedback-bfd maybe-all-stagefeedback-bfd -.PHONY: clean-stagefeedback-bfd maybe-clean-stagefeedback-bfd -maybe-all-stagefeedback-bfd: -maybe-clean-stagefeedback-bfd: -@if bfd-bootstrap -maybe-all-stagefeedback-bfd: all-stagefeedback-bfd -all-stagefeedback: all-stagefeedback-bfd -TARGET-stagefeedback-bfd = $(TARGET-bfd) -all-stagefeedback-bfd: configure-stagefeedback-bfd - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" \ - $(TARGET-stagefeedback-bfd) - -maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd -clean-stagefeedback: clean-stagefeedback-bfd -clean-stagefeedback-bfd: - @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-bfd/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ - cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean -@endif bfd-bootstrap - - - - - .PHONY: check-bfd maybe-check-bfd maybe-check-bfd: @if bfd maybe-check-bfd: check-bfd check-bfd: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd bfd && $(MAKE) $(FLAGS_TO_PASS) check) @endif bfd @@ -4364,12 +3782,11 @@ maybe-install-bfd: maybe-install-bfd: install-bfd install-bfd: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd bfd && $(MAKE) $(FLAGS_TO_PASS) install) @endif bfd @@ -4385,12 +3802,13 @@ info-bfd: \ @[ -f ./bfd/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in bfd" ; \ - (cd $(HOST_SUBDIR)/bfd && \ + (cd bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4410,12 +3828,13 @@ dvi-bfd: \ @[ -f ./bfd/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in bfd" ; \ - (cd $(HOST_SUBDIR)/bfd && \ + (cd bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4425,31 +3844,6 @@ dvi-bfd: \ @endif bfd -.PHONY: maybe-html-bfd html-bfd -maybe-html-bfd: -@if bfd -maybe-html-bfd: html-bfd - -html-bfd: \ - configure-bfd - @[ -f ./bfd/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in bfd" ; \ - (cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif bfd - .PHONY: maybe-TAGS-bfd TAGS-bfd maybe-TAGS-bfd: @if bfd @@ -4460,12 +3854,13 @@ TAGS-bfd: \ @[ -f ./bfd/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in bfd" ; \ - (cd $(HOST_SUBDIR)/bfd && \ + (cd bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4486,12 +3881,13 @@ install-info-bfd: \ @[ -f ./bfd/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in bfd" ; \ - (cd $(HOST_SUBDIR)/bfd && \ + (cd bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4511,12 +3907,13 @@ installcheck-bfd: \ @[ -f ./bfd/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in bfd" ; \ - (cd $(HOST_SUBDIR)/bfd && \ + (cd bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4535,12 +3932,13 @@ mostlyclean-bfd: @[ -f ./bfd/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in bfd" ; \ - (cd $(HOST_SUBDIR)/bfd && \ + (cd bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4559,12 +3957,13 @@ clean-bfd: @[ -f ./bfd/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in bfd" ; \ - (cd $(HOST_SUBDIR)/bfd && \ + (cd bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4583,12 +3982,13 @@ distclean-bfd: @[ -f ./bfd/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in bfd" ; \ - (cd $(HOST_SUBDIR)/bfd && \ + (cd bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4607,12 +4007,13 @@ maintainer-clean-bfd: @[ -f ./bfd/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in bfd" ; \ - (cd $(HOST_SUBDIR)/bfd && \ + (cd bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4623,422 +4024,59 @@ maintainer-clean-bfd: @endif bfd - .PHONY: configure-opcodes maybe-configure-opcodes maybe-configure-opcodes: @if opcodes maybe-configure-opcodes: configure-opcodes -configure-opcodes: -@endif opcodes -@if opcodes-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif opcodes-bootstrap -@if opcodes - @r=`${PWD_COMMAND}`; export r; \ +configure-opcodes: + @test -f stage_last && exit 0; \ + test ! -f opcodes/Makefile || exit 0; \ + [ -d opcodes ] || mkdir opcodes; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/opcodes; \ - cd "$(HOST_SUBDIR)/opcodes" || exit 1; \ + echo Configuring in opcodes; \ + cd opcodes || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/opcodes"; \ + libsrcdir="$$s/opcodes";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/opcodes"; \ + libsrcdir="$$s/opcodes";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/opcodes"; \ - libsrcdir="$$s/opcodes"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif opcodes - - -.PHONY: configure-stage1-opcodes maybe-configure-stage1-opcodes -maybe-configure-stage1-opcodes: -@if opcodes-bootstrap -maybe-configure-stage1-opcodes: configure-stage1-opcodes -configure-stage1-opcodes: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ - cd $(HOST_SUBDIR)/opcodes || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/opcodes"; \ - libsrcdir="$$s/opcodes"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" -@endif opcodes-bootstrap - -.PHONY: configure-stage2-opcodes maybe-configure-stage2-opcodes -maybe-configure-stage2-opcodes: -@if opcodes-bootstrap -maybe-configure-stage2-opcodes: configure-stage2-opcodes -configure-stage2-opcodes: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ - cd $(HOST_SUBDIR)/opcodes || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/opcodes"; \ - libsrcdir="$$s/opcodes"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif opcodes-bootstrap - -.PHONY: configure-stage3-opcodes maybe-configure-stage3-opcodes -maybe-configure-stage3-opcodes: -@if opcodes-bootstrap -maybe-configure-stage3-opcodes: configure-stage3-opcodes -configure-stage3-opcodes: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ - cd $(HOST_SUBDIR)/opcodes || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/opcodes"; \ - libsrcdir="$$s/opcodes"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif opcodes-bootstrap - -.PHONY: configure-stage4-opcodes maybe-configure-stage4-opcodes -maybe-configure-stage4-opcodes: -@if opcodes-bootstrap -maybe-configure-stage4-opcodes: configure-stage4-opcodes -configure-stage4-opcodes: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ - cd $(HOST_SUBDIR)/opcodes || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/opcodes"; \ - libsrcdir="$$s/opcodes"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif opcodes-bootstrap - -.PHONY: configure-stageprofile-opcodes maybe-configure-stageprofile-opcodes -maybe-configure-stageprofile-opcodes: -@if opcodes-bootstrap -maybe-configure-stageprofile-opcodes: configure-stageprofile-opcodes -configure-stageprofile-opcodes: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage profile in $(HOST_SUBDIR)/opcodes ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ - cd $(HOST_SUBDIR)/opcodes || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/opcodes"; \ - libsrcdir="$$s/opcodes"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif opcodes-bootstrap - -.PHONY: configure-stagefeedback-opcodes maybe-configure-stagefeedback-opcodes -maybe-configure-stagefeedback-opcodes: -@if opcodes-bootstrap -maybe-configure-stagefeedback-opcodes: configure-stagefeedback-opcodes -configure-stagefeedback-opcodes: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ - cd $(HOST_SUBDIR)/opcodes || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/opcodes"; \ - libsrcdir="$$s/opcodes"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif opcodes-bootstrap - - - - - .PHONY: all-opcodes maybe-all-opcodes maybe-all-opcodes: @if opcodes -TARGET-opcodes=all maybe-all-opcodes: all-opcodes all-opcodes: configure-opcodes -@endif opcodes -@if opcodes-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif opcodes-bootstrap -@if opcodes - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-opcodes)) + (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) all) @endif opcodes - - -.PHONY: all-stage1-opcodes maybe-all-stage1-opcodes -.PHONY: clean-stage1-opcodes maybe-clean-stage1-opcodes -maybe-all-stage1-opcodes: -maybe-clean-stage1-opcodes: -@if opcodes-bootstrap -maybe-all-stage1-opcodes: all-stage1-opcodes -all-stage1: all-stage1-opcodes -TARGET-stage1-opcodes = $(TARGET-opcodes) -all-stage1-opcodes: configure-stage1-opcodes - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ - $(TARGET-stage1-opcodes) - -maybe-clean-stage1-opcodes: clean-stage1-opcodes -clean-stage1: clean-stage1-opcodes -clean-stage1-opcodes: - @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-opcodes/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ - cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" clean -@endif opcodes-bootstrap - - -.PHONY: all-stage2-opcodes maybe-all-stage2-opcodes -.PHONY: clean-stage2-opcodes maybe-clean-stage2-opcodes -maybe-all-stage2-opcodes: -maybe-clean-stage2-opcodes: -@if opcodes-bootstrap -maybe-all-stage2-opcodes: all-stage2-opcodes -all-stage2: all-stage2-opcodes -TARGET-stage2-opcodes = $(TARGET-opcodes) -all-stage2-opcodes: configure-stage2-opcodes - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage2-opcodes) - -maybe-clean-stage2-opcodes: clean-stage2-opcodes -clean-stage2: clean-stage2-opcodes -clean-stage2-opcodes: - @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-opcodes/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ - cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif opcodes-bootstrap - - -.PHONY: all-stage3-opcodes maybe-all-stage3-opcodes -.PHONY: clean-stage3-opcodes maybe-clean-stage3-opcodes -maybe-all-stage3-opcodes: -maybe-clean-stage3-opcodes: -@if opcodes-bootstrap -maybe-all-stage3-opcodes: all-stage3-opcodes -all-stage3: all-stage3-opcodes -TARGET-stage3-opcodes = $(TARGET-opcodes) -all-stage3-opcodes: configure-stage3-opcodes - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage3-opcodes) - -maybe-clean-stage3-opcodes: clean-stage3-opcodes -clean-stage3: clean-stage3-opcodes -clean-stage3-opcodes: - @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-opcodes/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ - cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif opcodes-bootstrap - - -.PHONY: all-stage4-opcodes maybe-all-stage4-opcodes -.PHONY: clean-stage4-opcodes maybe-clean-stage4-opcodes -maybe-all-stage4-opcodes: -maybe-clean-stage4-opcodes: -@if opcodes-bootstrap -maybe-all-stage4-opcodes: all-stage4-opcodes -all-stage4: all-stage4-opcodes -TARGET-stage4-opcodes = $(TARGET-opcodes) -all-stage4-opcodes: configure-stage4-opcodes - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage4-opcodes) - -maybe-clean-stage4-opcodes: clean-stage4-opcodes -clean-stage4: clean-stage4-opcodes -clean-stage4-opcodes: - @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-opcodes/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ - cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif opcodes-bootstrap - - -.PHONY: all-stageprofile-opcodes maybe-all-stageprofile-opcodes -.PHONY: clean-stageprofile-opcodes maybe-clean-stageprofile-opcodes -maybe-all-stageprofile-opcodes: -maybe-clean-stageprofile-opcodes: -@if opcodes-bootstrap -maybe-all-stageprofile-opcodes: all-stageprofile-opcodes -all-stageprofile: all-stageprofile-opcodes -TARGET-stageprofile-opcodes = $(TARGET-opcodes) -all-stageprofile-opcodes: configure-stageprofile-opcodes - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" \ - $(TARGET-stageprofile-opcodes) - -maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes -clean-stageprofile: clean-stageprofile-opcodes -clean-stageprofile-opcodes: - @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-opcodes/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ - cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean -@endif opcodes-bootstrap - - -.PHONY: all-stagefeedback-opcodes maybe-all-stagefeedback-opcodes -.PHONY: clean-stagefeedback-opcodes maybe-clean-stagefeedback-opcodes -maybe-all-stagefeedback-opcodes: -maybe-clean-stagefeedback-opcodes: -@if opcodes-bootstrap -maybe-all-stagefeedback-opcodes: all-stagefeedback-opcodes -all-stagefeedback: all-stagefeedback-opcodes -TARGET-stagefeedback-opcodes = $(TARGET-opcodes) -all-stagefeedback-opcodes: configure-stagefeedback-opcodes - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" \ - $(TARGET-stagefeedback-opcodes) - -maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes -clean-stagefeedback: clean-stagefeedback-opcodes -clean-stagefeedback-opcodes: - @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-opcodes/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ - cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean -@endif opcodes-bootstrap - - - - - .PHONY: check-opcodes maybe-check-opcodes maybe-check-opcodes: @if opcodes maybe-check-opcodes: check-opcodes check-opcodes: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) check) @endif opcodes @@ -5048,12 +4086,11 @@ maybe-install-opcodes: maybe-install-opcodes: install-opcodes install-opcodes: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) install) @endif opcodes @@ -5069,12 +4106,13 @@ info-opcodes: \ @[ -f ./opcodes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in opcodes" ; \ - (cd $(HOST_SUBDIR)/opcodes && \ + (cd opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5094,12 +4132,13 @@ dvi-opcodes: \ @[ -f ./opcodes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in opcodes" ; \ - (cd $(HOST_SUBDIR)/opcodes && \ + (cd opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5109,31 +4148,6 @@ dvi-opcodes: \ @endif opcodes -.PHONY: maybe-html-opcodes html-opcodes -maybe-html-opcodes: -@if opcodes -maybe-html-opcodes: html-opcodes - -html-opcodes: \ - configure-opcodes - @[ -f ./opcodes/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in opcodes" ; \ - (cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif opcodes - .PHONY: maybe-TAGS-opcodes TAGS-opcodes maybe-TAGS-opcodes: @if opcodes @@ -5144,12 +4158,13 @@ TAGS-opcodes: \ @[ -f ./opcodes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in opcodes" ; \ - (cd $(HOST_SUBDIR)/opcodes && \ + (cd opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5170,12 +4185,13 @@ install-info-opcodes: \ @[ -f ./opcodes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in opcodes" ; \ - (cd $(HOST_SUBDIR)/opcodes && \ + (cd opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5195,12 +4211,13 @@ installcheck-opcodes: \ @[ -f ./opcodes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in opcodes" ; \ - (cd $(HOST_SUBDIR)/opcodes && \ + (cd opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5219,12 +4236,13 @@ mostlyclean-opcodes: @[ -f ./opcodes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in opcodes" ; \ - (cd $(HOST_SUBDIR)/opcodes && \ + (cd opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5243,12 +4261,13 @@ clean-opcodes: @[ -f ./opcodes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in opcodes" ; \ - (cd $(HOST_SUBDIR)/opcodes && \ + (cd opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5267,12 +4286,13 @@ distclean-opcodes: @[ -f ./opcodes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in opcodes" ; \ - (cd $(HOST_SUBDIR)/opcodes && \ + (cd opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5291,12 +4311,13 @@ maintainer-clean-opcodes: @[ -f ./opcodes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in opcodes" ; \ - (cd $(HOST_SUBDIR)/opcodes && \ + (cd opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5307,422 +4328,59 @@ maintainer-clean-opcodes: @endif opcodes - .PHONY: configure-binutils maybe-configure-binutils maybe-configure-binutils: @if binutils maybe-configure-binutils: configure-binutils -configure-binutils: -@endif binutils -@if binutils-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif binutils-bootstrap -@if binutils - @r=`${PWD_COMMAND}`; export r; \ +configure-binutils: + @test -f stage_last && exit 0; \ + test ! -f binutils/Makefile || exit 0; \ + [ -d binutils ] || mkdir binutils; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/binutils; \ - cd "$(HOST_SUBDIR)/binutils" || exit 1; \ + echo Configuring in binutils; \ + cd binutils || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/binutils"; \ + libsrcdir="$$s/binutils";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/binutils"; \ + libsrcdir="$$s/binutils";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/binutils"; \ - libsrcdir="$$s/binutils"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif binutils - - -.PHONY: configure-stage1-binutils maybe-configure-stage1-binutils -maybe-configure-stage1-binutils: -@if binutils-bootstrap -maybe-configure-stage1-binutils: configure-stage1-binutils -configure-stage1-binutils: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ - cd $(HOST_SUBDIR)/binutils || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/binutils"; \ - libsrcdir="$$s/binutils"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" -@endif binutils-bootstrap - -.PHONY: configure-stage2-binutils maybe-configure-stage2-binutils -maybe-configure-stage2-binutils: -@if binutils-bootstrap -maybe-configure-stage2-binutils: configure-stage2-binutils -configure-stage2-binutils: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 2 in $(HOST_SUBDIR)/binutils ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ - cd $(HOST_SUBDIR)/binutils || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/binutils"; \ - libsrcdir="$$s/binutils"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif binutils-bootstrap - -.PHONY: configure-stage3-binutils maybe-configure-stage3-binutils -maybe-configure-stage3-binutils: -@if binutils-bootstrap -maybe-configure-stage3-binutils: configure-stage3-binutils -configure-stage3-binutils: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 3 in $(HOST_SUBDIR)/binutils ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ - cd $(HOST_SUBDIR)/binutils || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/binutils"; \ - libsrcdir="$$s/binutils"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif binutils-bootstrap - -.PHONY: configure-stage4-binutils maybe-configure-stage4-binutils -maybe-configure-stage4-binutils: -@if binutils-bootstrap -maybe-configure-stage4-binutils: configure-stage4-binutils -configure-stage4-binutils: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 4 in $(HOST_SUBDIR)/binutils ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ - cd $(HOST_SUBDIR)/binutils || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/binutils"; \ - libsrcdir="$$s/binutils"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif binutils-bootstrap - -.PHONY: configure-stageprofile-binutils maybe-configure-stageprofile-binutils -maybe-configure-stageprofile-binutils: -@if binutils-bootstrap -maybe-configure-stageprofile-binutils: configure-stageprofile-binutils -configure-stageprofile-binutils: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage profile in $(HOST_SUBDIR)/binutils ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ - cd $(HOST_SUBDIR)/binutils || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/binutils"; \ - libsrcdir="$$s/binutils"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif binutils-bootstrap - -.PHONY: configure-stagefeedback-binutils maybe-configure-stagefeedback-binutils -maybe-configure-stagefeedback-binutils: -@if binutils-bootstrap -maybe-configure-stagefeedback-binutils: configure-stagefeedback-binutils -configure-stagefeedback-binutils: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage feedback in $(HOST_SUBDIR)/binutils ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ - cd $(HOST_SUBDIR)/binutils || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/binutils"; \ - libsrcdir="$$s/binutils"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif binutils-bootstrap - - - - - .PHONY: all-binutils maybe-all-binutils maybe-all-binutils: @if binutils -TARGET-binutils=all maybe-all-binutils: all-binutils all-binutils: configure-binutils -@endif binutils -@if binutils-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif binutils-bootstrap -@if binutils - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-binutils)) + (cd binutils && $(MAKE) $(FLAGS_TO_PASS) all) @endif binutils - - -.PHONY: all-stage1-binutils maybe-all-stage1-binutils -.PHONY: clean-stage1-binutils maybe-clean-stage1-binutils -maybe-all-stage1-binutils: -maybe-clean-stage1-binutils: -@if binutils-bootstrap -maybe-all-stage1-binutils: all-stage1-binutils -all-stage1: all-stage1-binutils -TARGET-stage1-binutils = $(TARGET-binutils) -all-stage1-binutils: configure-stage1-binutils - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ - $(TARGET-stage1-binutils) - -maybe-clean-stage1-binutils: clean-stage1-binutils -clean-stage1: clean-stage1-binutils -clean-stage1-binutils: - @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-binutils/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ - cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" clean -@endif binutils-bootstrap - - -.PHONY: all-stage2-binutils maybe-all-stage2-binutils -.PHONY: clean-stage2-binutils maybe-clean-stage2-binutils -maybe-all-stage2-binutils: -maybe-clean-stage2-binutils: -@if binutils-bootstrap -maybe-all-stage2-binutils: all-stage2-binutils -all-stage2: all-stage2-binutils -TARGET-stage2-binutils = $(TARGET-binutils) -all-stage2-binutils: configure-stage2-binutils - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage2-binutils) - -maybe-clean-stage2-binutils: clean-stage2-binutils -clean-stage2: clean-stage2-binutils -clean-stage2-binutils: - @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-binutils/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ - cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif binutils-bootstrap - - -.PHONY: all-stage3-binutils maybe-all-stage3-binutils -.PHONY: clean-stage3-binutils maybe-clean-stage3-binutils -maybe-all-stage3-binutils: -maybe-clean-stage3-binutils: -@if binutils-bootstrap -maybe-all-stage3-binutils: all-stage3-binutils -all-stage3: all-stage3-binutils -TARGET-stage3-binutils = $(TARGET-binutils) -all-stage3-binutils: configure-stage3-binutils - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage3-binutils) - -maybe-clean-stage3-binutils: clean-stage3-binutils -clean-stage3: clean-stage3-binutils -clean-stage3-binutils: - @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-binutils/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ - cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif binutils-bootstrap - - -.PHONY: all-stage4-binutils maybe-all-stage4-binutils -.PHONY: clean-stage4-binutils maybe-clean-stage4-binutils -maybe-all-stage4-binutils: -maybe-clean-stage4-binutils: -@if binutils-bootstrap -maybe-all-stage4-binutils: all-stage4-binutils -all-stage4: all-stage4-binutils -TARGET-stage4-binutils = $(TARGET-binutils) -all-stage4-binutils: configure-stage4-binutils - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage4-binutils) - -maybe-clean-stage4-binutils: clean-stage4-binutils -clean-stage4: clean-stage4-binutils -clean-stage4-binutils: - @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-binutils/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ - cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif binutils-bootstrap - - -.PHONY: all-stageprofile-binutils maybe-all-stageprofile-binutils -.PHONY: clean-stageprofile-binutils maybe-clean-stageprofile-binutils -maybe-all-stageprofile-binutils: -maybe-clean-stageprofile-binutils: -@if binutils-bootstrap -maybe-all-stageprofile-binutils: all-stageprofile-binutils -all-stageprofile: all-stageprofile-binutils -TARGET-stageprofile-binutils = $(TARGET-binutils) -all-stageprofile-binutils: configure-stageprofile-binutils - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" \ - $(TARGET-stageprofile-binutils) - -maybe-clean-stageprofile-binutils: clean-stageprofile-binutils -clean-stageprofile: clean-stageprofile-binutils -clean-stageprofile-binutils: - @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-binutils/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ - cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean -@endif binutils-bootstrap - - -.PHONY: all-stagefeedback-binutils maybe-all-stagefeedback-binutils -.PHONY: clean-stagefeedback-binutils maybe-clean-stagefeedback-binutils -maybe-all-stagefeedback-binutils: -maybe-clean-stagefeedback-binutils: -@if binutils-bootstrap -maybe-all-stagefeedback-binutils: all-stagefeedback-binutils -all-stagefeedback: all-stagefeedback-binutils -TARGET-stagefeedback-binutils = $(TARGET-binutils) -all-stagefeedback-binutils: configure-stagefeedback-binutils - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" \ - $(TARGET-stagefeedback-binutils) - -maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils -clean-stagefeedback: clean-stagefeedback-binutils -clean-stagefeedback-binutils: - @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-binutils/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ - cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean -@endif binutils-bootstrap - - - - - .PHONY: check-binutils maybe-check-binutils maybe-check-binutils: @if binutils maybe-check-binutils: check-binutils check-binutils: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd binutils && $(MAKE) $(FLAGS_TO_PASS) check) @endif binutils @@ -5732,12 +4390,11 @@ maybe-install-binutils: maybe-install-binutils: install-binutils install-binutils: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd binutils && $(MAKE) $(FLAGS_TO_PASS) install) @endif binutils @@ -5753,12 +4410,13 @@ info-binutils: \ @[ -f ./binutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in binutils" ; \ - (cd $(HOST_SUBDIR)/binutils && \ + (cd binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5778,12 +4436,13 @@ dvi-binutils: \ @[ -f ./binutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in binutils" ; \ - (cd $(HOST_SUBDIR)/binutils && \ + (cd binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5793,31 +4452,6 @@ dvi-binutils: \ @endif binutils -.PHONY: maybe-html-binutils html-binutils -maybe-html-binutils: -@if binutils -maybe-html-binutils: html-binutils - -html-binutils: \ - configure-binutils - @[ -f ./binutils/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in binutils" ; \ - (cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif binutils - .PHONY: maybe-TAGS-binutils TAGS-binutils maybe-TAGS-binutils: @if binutils @@ -5828,12 +4462,13 @@ TAGS-binutils: \ @[ -f ./binutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in binutils" ; \ - (cd $(HOST_SUBDIR)/binutils && \ + (cd binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5854,12 +4489,13 @@ install-info-binutils: \ @[ -f ./binutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in binutils" ; \ - (cd $(HOST_SUBDIR)/binutils && \ + (cd binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5879,12 +4515,13 @@ installcheck-binutils: \ @[ -f ./binutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in binutils" ; \ - (cd $(HOST_SUBDIR)/binutils && \ + (cd binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5903,12 +4540,13 @@ mostlyclean-binutils: @[ -f ./binutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in binutils" ; \ - (cd $(HOST_SUBDIR)/binutils && \ + (cd binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5927,12 +4565,13 @@ clean-binutils: @[ -f ./binutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in binutils" ; \ - (cd $(HOST_SUBDIR)/binutils && \ + (cd binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5951,12 +4590,13 @@ distclean-binutils: @[ -f ./binutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in binutils" ; \ - (cd $(HOST_SUBDIR)/binutils && \ + (cd binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5975,12 +4615,13 @@ maintainer-clean-binutils: @[ -f ./binutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in binutils" ; \ - (cd $(HOST_SUBDIR)/binutils && \ + (cd binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5991,53 +4632,46 @@ maintainer-clean-binutils: @endif binutils - .PHONY: configure-bison maybe-configure-bison maybe-configure-bison: @if bison maybe-configure-bison: configure-bison -configure-bison: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-bison: + @test ! -f bison/Makefile || exit 0; \ + [ -d bison ] || mkdir bison; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/bison/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/bison; \ - cd "$(HOST_SUBDIR)/bison" || exit 1; \ + echo Configuring in bison; \ + cd bison || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/bison/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/bison"; \ + libsrcdir="$$s/bison";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/bison"; \ + libsrcdir="$$s/bison";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/bison"; \ - libsrcdir="$$s/bison"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif bison - - - - .PHONY: all-bison maybe-all-bison maybe-all-bison: @if bison -TARGET-bison=all maybe-all-bison: all-bison all-bison: configure-bison - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/bison && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-bison)) + (cd bison && $(MAKE) $(FLAGS_TO_PASS) all) @endif bison - - - .PHONY: check-bison maybe-check-bison maybe-check-bison: @if bison @@ -6045,13 +4679,12 @@ maybe-check-bison: check-bison # This module is only tested in a native toolchain. check-bison: - @: $(MAKE); $(unstage) @if [ '$(host)' = '$(target)' ] ; then \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/bison && \ - $(MAKE) $(FLAGS_TO_PASS) check); \ + (cd bison && $(MAKE) $(FLAGS_TO_PASS) check); \ fi @endif bison @@ -6062,12 +4695,11 @@ maybe-install-bison: maybe-install-bison: install-bison install-bison: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/bison && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd bison && $(MAKE) $(FLAGS_TO_PASS) install) @endif bison @@ -6080,16 +4712,16 @@ maybe-info-bison: info-bison info-bison: \ configure-bison - @: $(MAKE); $(unstage) @[ -f ./bison/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in bison" ; \ - (cd $(HOST_SUBDIR)/bison && \ + (cd bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6106,16 +4738,16 @@ maybe-dvi-bison: dvi-bison dvi-bison: \ configure-bison - @: $(MAKE); $(unstage) @[ -f ./bison/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in bison" ; \ - (cd $(HOST_SUBDIR)/bison && \ + (cd bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6125,32 +4757,6 @@ dvi-bison: \ @endif bison -.PHONY: maybe-html-bison html-bison -maybe-html-bison: -@if bison -maybe-html-bison: html-bison - -html-bison: \ - configure-bison - @: $(MAKE); $(unstage) - @[ -f ./bison/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in bison" ; \ - (cd $(HOST_SUBDIR)/bison && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif bison - .PHONY: maybe-TAGS-bison TAGS-bison maybe-TAGS-bison: @if bison @@ -6158,16 +4764,16 @@ maybe-TAGS-bison: TAGS-bison TAGS-bison: \ configure-bison - @: $(MAKE); $(unstage) @[ -f ./bison/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in bison" ; \ - (cd $(HOST_SUBDIR)/bison && \ + (cd bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6185,16 +4791,16 @@ maybe-install-info-bison: install-info-bison install-info-bison: \ configure-bison \ info-bison - @: $(MAKE); $(unstage) @[ -f ./bison/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in bison" ; \ - (cd $(HOST_SUBDIR)/bison && \ + (cd bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6211,16 +4817,16 @@ maybe-installcheck-bison: installcheck-bison installcheck-bison: \ configure-bison - @: $(MAKE); $(unstage) @[ -f ./bison/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in bison" ; \ - (cd $(HOST_SUBDIR)/bison && \ + (cd bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6236,16 +4842,16 @@ maybe-mostlyclean-bison: maybe-mostlyclean-bison: mostlyclean-bison mostlyclean-bison: - @: $(MAKE); $(unstage) @[ -f ./bison/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in bison" ; \ - (cd $(HOST_SUBDIR)/bison && \ + (cd bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6261,16 +4867,16 @@ maybe-clean-bison: maybe-clean-bison: clean-bison clean-bison: - @: $(MAKE); $(unstage) @[ -f ./bison/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in bison" ; \ - (cd $(HOST_SUBDIR)/bison && \ + (cd bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6286,16 +4892,16 @@ maybe-distclean-bison: maybe-distclean-bison: distclean-bison distclean-bison: - @: $(MAKE); $(unstage) @[ -f ./bison/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in bison" ; \ - (cd $(HOST_SUBDIR)/bison && \ + (cd bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6311,16 +4917,16 @@ maybe-maintainer-clean-bison: maybe-maintainer-clean-bison: maintainer-clean-bison maintainer-clean-bison: - @: $(MAKE); $(unstage) @[ -f ./bison/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in bison" ; \ - (cd $(HOST_SUBDIR)/bison && \ + (cd bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6331,53 +4937,46 @@ maintainer-clean-bison: @endif bison - .PHONY: configure-byacc maybe-configure-byacc maybe-configure-byacc: @if byacc maybe-configure-byacc: configure-byacc -configure-byacc: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-byacc: + @test ! -f byacc/Makefile || exit 0; \ + [ -d byacc ] || mkdir byacc; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/byacc/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/byacc ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/byacc; \ - cd "$(HOST_SUBDIR)/byacc" || exit 1; \ + echo Configuring in byacc; \ + cd byacc || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/byacc/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/byacc"; \ + libsrcdir="$$s/byacc";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/byacc"; \ + libsrcdir="$$s/byacc";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/byacc"; \ - libsrcdir="$$s/byacc"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif byacc - - - - .PHONY: all-byacc maybe-all-byacc maybe-all-byacc: @if byacc -TARGET-byacc=all maybe-all-byacc: all-byacc all-byacc: configure-byacc - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/byacc && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-byacc)) + (cd byacc && $(MAKE) $(FLAGS_TO_PASS) all) @endif byacc - - - .PHONY: check-byacc maybe-check-byacc maybe-check-byacc: @if byacc @@ -6385,13 +4984,12 @@ maybe-check-byacc: check-byacc # This module is only tested in a native toolchain. check-byacc: - @: $(MAKE); $(unstage) @if [ '$(host)' = '$(target)' ] ; then \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/byacc && \ - $(MAKE) $(FLAGS_TO_PASS) check); \ + (cd byacc && $(MAKE) $(FLAGS_TO_PASS) check); \ fi @endif byacc @@ -6402,12 +5000,11 @@ maybe-install-byacc: maybe-install-byacc: install-byacc install-byacc: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/byacc && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd byacc && $(MAKE) $(FLAGS_TO_PASS) install) @endif byacc @@ -6420,16 +5017,16 @@ maybe-info-byacc: info-byacc info-byacc: \ configure-byacc - @: $(MAKE); $(unstage) @[ -f ./byacc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in byacc" ; \ - (cd $(HOST_SUBDIR)/byacc && \ + (cd byacc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6446,16 +5043,16 @@ maybe-dvi-byacc: dvi-byacc dvi-byacc: \ configure-byacc - @: $(MAKE); $(unstage) @[ -f ./byacc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in byacc" ; \ - (cd $(HOST_SUBDIR)/byacc && \ + (cd byacc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6465,32 +5062,6 @@ dvi-byacc: \ @endif byacc -.PHONY: maybe-html-byacc html-byacc -maybe-html-byacc: -@if byacc -maybe-html-byacc: html-byacc - -html-byacc: \ - configure-byacc - @: $(MAKE); $(unstage) - @[ -f ./byacc/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in byacc" ; \ - (cd $(HOST_SUBDIR)/byacc && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif byacc - .PHONY: maybe-TAGS-byacc TAGS-byacc maybe-TAGS-byacc: @if byacc @@ -6498,16 +5069,16 @@ maybe-TAGS-byacc: TAGS-byacc TAGS-byacc: \ configure-byacc - @: $(MAKE); $(unstage) @[ -f ./byacc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in byacc" ; \ - (cd $(HOST_SUBDIR)/byacc && \ + (cd byacc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6525,16 +5096,16 @@ maybe-install-info-byacc: install-info-byacc install-info-byacc: \ configure-byacc \ info-byacc - @: $(MAKE); $(unstage) @[ -f ./byacc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in byacc" ; \ - (cd $(HOST_SUBDIR)/byacc && \ + (cd byacc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6551,16 +5122,16 @@ maybe-installcheck-byacc: installcheck-byacc installcheck-byacc: \ configure-byacc - @: $(MAKE); $(unstage) @[ -f ./byacc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in byacc" ; \ - (cd $(HOST_SUBDIR)/byacc && \ + (cd byacc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6576,16 +5147,16 @@ maybe-mostlyclean-byacc: maybe-mostlyclean-byacc: mostlyclean-byacc mostlyclean-byacc: - @: $(MAKE); $(unstage) @[ -f ./byacc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in byacc" ; \ - (cd $(HOST_SUBDIR)/byacc && \ + (cd byacc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6601,16 +5172,16 @@ maybe-clean-byacc: maybe-clean-byacc: clean-byacc clean-byacc: - @: $(MAKE); $(unstage) @[ -f ./byacc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in byacc" ; \ - (cd $(HOST_SUBDIR)/byacc && \ + (cd byacc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6626,16 +5197,16 @@ maybe-distclean-byacc: maybe-distclean-byacc: distclean-byacc distclean-byacc: - @: $(MAKE); $(unstage) @[ -f ./byacc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in byacc" ; \ - (cd $(HOST_SUBDIR)/byacc && \ + (cd byacc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6651,16 +5222,16 @@ maybe-maintainer-clean-byacc: maybe-maintainer-clean-byacc: maintainer-clean-byacc maintainer-clean-byacc: - @: $(MAKE); $(unstage) @[ -f ./byacc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in byacc" ; \ - (cd $(HOST_SUBDIR)/byacc && \ + (cd byacc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6671,65 +5242,57 @@ maintainer-clean-byacc: @endif byacc - .PHONY: configure-bzip2 maybe-configure-bzip2 maybe-configure-bzip2: @if bzip2 maybe-configure-bzip2: configure-bzip2 -configure-bzip2: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-bzip2: + @test ! -f bzip2/Makefile || exit 0; \ + [ -d bzip2 ] || mkdir bzip2; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/bzip2/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bzip2 ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/bzip2; \ - cd "$(HOST_SUBDIR)/bzip2" || exit 1; \ + echo Configuring in bzip2; \ + cd bzip2 || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/bzip2/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/bzip2"; \ + libsrcdir="$$s/bzip2";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/bzip2"; \ + libsrcdir="$$s/bzip2";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/bzip2"; \ - libsrcdir="$$s/bzip2"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif bzip2 - - - - .PHONY: all-bzip2 maybe-all-bzip2 maybe-all-bzip2: @if bzip2 -TARGET-bzip2=all maybe-all-bzip2: all-bzip2 all-bzip2: configure-bzip2 - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/bzip2 && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-bzip2)) + (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) all) @endif bzip2 - - - .PHONY: check-bzip2 maybe-check-bzip2 maybe-check-bzip2: @if bzip2 maybe-check-bzip2: check-bzip2 check-bzip2: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/bzip2 && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) check) @endif bzip2 @@ -6739,12 +5302,11 @@ maybe-install-bzip2: maybe-install-bzip2: install-bzip2 install-bzip2: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/bzip2 && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) install) @endif bzip2 @@ -6757,16 +5319,16 @@ maybe-info-bzip2: info-bzip2 info-bzip2: \ configure-bzip2 - @: $(MAKE); $(unstage) @[ -f ./bzip2/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in bzip2" ; \ - (cd $(HOST_SUBDIR)/bzip2 && \ + (cd bzip2 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6783,16 +5345,16 @@ maybe-dvi-bzip2: dvi-bzip2 dvi-bzip2: \ configure-bzip2 - @: $(MAKE); $(unstage) @[ -f ./bzip2/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in bzip2" ; \ - (cd $(HOST_SUBDIR)/bzip2 && \ + (cd bzip2 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6802,32 +5364,6 @@ dvi-bzip2: \ @endif bzip2 -.PHONY: maybe-html-bzip2 html-bzip2 -maybe-html-bzip2: -@if bzip2 -maybe-html-bzip2: html-bzip2 - -html-bzip2: \ - configure-bzip2 - @: $(MAKE); $(unstage) - @[ -f ./bzip2/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in bzip2" ; \ - (cd $(HOST_SUBDIR)/bzip2 && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif bzip2 - .PHONY: maybe-TAGS-bzip2 TAGS-bzip2 maybe-TAGS-bzip2: @if bzip2 @@ -6835,16 +5371,16 @@ maybe-TAGS-bzip2: TAGS-bzip2 TAGS-bzip2: \ configure-bzip2 - @: $(MAKE); $(unstage) @[ -f ./bzip2/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in bzip2" ; \ - (cd $(HOST_SUBDIR)/bzip2 && \ + (cd bzip2 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6862,16 +5398,16 @@ maybe-install-info-bzip2: install-info-bzip2 install-info-bzip2: \ configure-bzip2 \ info-bzip2 - @: $(MAKE); $(unstage) @[ -f ./bzip2/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in bzip2" ; \ - (cd $(HOST_SUBDIR)/bzip2 && \ + (cd bzip2 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6888,16 +5424,16 @@ maybe-installcheck-bzip2: installcheck-bzip2 installcheck-bzip2: \ configure-bzip2 - @: $(MAKE); $(unstage) @[ -f ./bzip2/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in bzip2" ; \ - (cd $(HOST_SUBDIR)/bzip2 && \ + (cd bzip2 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6913,16 +5449,16 @@ maybe-mostlyclean-bzip2: maybe-mostlyclean-bzip2: mostlyclean-bzip2 mostlyclean-bzip2: - @: $(MAKE); $(unstage) @[ -f ./bzip2/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in bzip2" ; \ - (cd $(HOST_SUBDIR)/bzip2 && \ + (cd bzip2 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6938,16 +5474,16 @@ maybe-clean-bzip2: maybe-clean-bzip2: clean-bzip2 clean-bzip2: - @: $(MAKE); $(unstage) @[ -f ./bzip2/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in bzip2" ; \ - (cd $(HOST_SUBDIR)/bzip2 && \ + (cd bzip2 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6963,16 +5499,16 @@ maybe-distclean-bzip2: maybe-distclean-bzip2: distclean-bzip2 distclean-bzip2: - @: $(MAKE); $(unstage) @[ -f ./bzip2/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in bzip2" ; \ - (cd $(HOST_SUBDIR)/bzip2 && \ + (cd bzip2 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6988,16 +5524,16 @@ maybe-maintainer-clean-bzip2: maybe-maintainer-clean-bzip2: maintainer-clean-bzip2 maintainer-clean-bzip2: - @: $(MAKE); $(unstage) @[ -f ./bzip2/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in bzip2" ; \ - (cd $(HOST_SUBDIR)/bzip2 && \ + (cd bzip2 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7008,65 +5544,57 @@ maintainer-clean-bzip2: @endif bzip2 - .PHONY: configure-dejagnu maybe-configure-dejagnu maybe-configure-dejagnu: @if dejagnu maybe-configure-dejagnu: configure-dejagnu -configure-dejagnu: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-dejagnu: + @test ! -f dejagnu/Makefile || exit 0; \ + [ -d dejagnu ] || mkdir dejagnu; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/dejagnu/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dejagnu ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/dejagnu; \ - cd "$(HOST_SUBDIR)/dejagnu" || exit 1; \ + echo Configuring in dejagnu; \ + cd dejagnu || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/dejagnu/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/dejagnu"; \ + libsrcdir="$$s/dejagnu";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/dejagnu"; \ + libsrcdir="$$s/dejagnu";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/dejagnu"; \ - libsrcdir="$$s/dejagnu"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif dejagnu - - - - .PHONY: all-dejagnu maybe-all-dejagnu maybe-all-dejagnu: @if dejagnu -TARGET-dejagnu=all maybe-all-dejagnu: all-dejagnu all-dejagnu: configure-dejagnu - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/dejagnu && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-dejagnu)) + (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) all) @endif dejagnu - - - .PHONY: check-dejagnu maybe-check-dejagnu maybe-check-dejagnu: @if dejagnu maybe-check-dejagnu: check-dejagnu check-dejagnu: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/dejagnu && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) check) @endif dejagnu @@ -7076,12 +5604,11 @@ maybe-install-dejagnu: maybe-install-dejagnu: install-dejagnu install-dejagnu: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/dejagnu && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) install) @endif dejagnu @@ -7094,16 +5621,16 @@ maybe-info-dejagnu: info-dejagnu info-dejagnu: \ configure-dejagnu - @: $(MAKE); $(unstage) @[ -f ./dejagnu/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in dejagnu" ; \ - (cd $(HOST_SUBDIR)/dejagnu && \ + (cd dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7120,16 +5647,16 @@ maybe-dvi-dejagnu: dvi-dejagnu dvi-dejagnu: \ configure-dejagnu - @: $(MAKE); $(unstage) @[ -f ./dejagnu/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in dejagnu" ; \ - (cd $(HOST_SUBDIR)/dejagnu && \ + (cd dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7139,32 +5666,6 @@ dvi-dejagnu: \ @endif dejagnu -.PHONY: maybe-html-dejagnu html-dejagnu -maybe-html-dejagnu: -@if dejagnu -maybe-html-dejagnu: html-dejagnu - -html-dejagnu: \ - configure-dejagnu - @: $(MAKE); $(unstage) - @[ -f ./dejagnu/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in dejagnu" ; \ - (cd $(HOST_SUBDIR)/dejagnu && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif dejagnu - .PHONY: maybe-TAGS-dejagnu TAGS-dejagnu maybe-TAGS-dejagnu: @if dejagnu @@ -7172,16 +5673,16 @@ maybe-TAGS-dejagnu: TAGS-dejagnu TAGS-dejagnu: \ configure-dejagnu - @: $(MAKE); $(unstage) @[ -f ./dejagnu/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in dejagnu" ; \ - (cd $(HOST_SUBDIR)/dejagnu && \ + (cd dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7199,16 +5700,16 @@ maybe-install-info-dejagnu: install-info-dejagnu install-info-dejagnu: \ configure-dejagnu \ info-dejagnu - @: $(MAKE); $(unstage) @[ -f ./dejagnu/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in dejagnu" ; \ - (cd $(HOST_SUBDIR)/dejagnu && \ + (cd dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7225,16 +5726,16 @@ maybe-installcheck-dejagnu: installcheck-dejagnu installcheck-dejagnu: \ configure-dejagnu - @: $(MAKE); $(unstage) @[ -f ./dejagnu/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in dejagnu" ; \ - (cd $(HOST_SUBDIR)/dejagnu && \ + (cd dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7250,16 +5751,16 @@ maybe-mostlyclean-dejagnu: maybe-mostlyclean-dejagnu: mostlyclean-dejagnu mostlyclean-dejagnu: - @: $(MAKE); $(unstage) @[ -f ./dejagnu/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in dejagnu" ; \ - (cd $(HOST_SUBDIR)/dejagnu && \ + (cd dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7275,16 +5776,16 @@ maybe-clean-dejagnu: maybe-clean-dejagnu: clean-dejagnu clean-dejagnu: - @: $(MAKE); $(unstage) @[ -f ./dejagnu/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in dejagnu" ; \ - (cd $(HOST_SUBDIR)/dejagnu && \ + (cd dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7300,16 +5801,16 @@ maybe-distclean-dejagnu: maybe-distclean-dejagnu: distclean-dejagnu distclean-dejagnu: - @: $(MAKE); $(unstage) @[ -f ./dejagnu/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in dejagnu" ; \ - (cd $(HOST_SUBDIR)/dejagnu && \ + (cd dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7325,16 +5826,16 @@ maybe-maintainer-clean-dejagnu: maybe-maintainer-clean-dejagnu: maintainer-clean-dejagnu maintainer-clean-dejagnu: - @: $(MAKE); $(unstage) @[ -f ./dejagnu/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in dejagnu" ; \ - (cd $(HOST_SUBDIR)/dejagnu && \ + (cd dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7345,65 +5846,57 @@ maintainer-clean-dejagnu: @endif dejagnu - .PHONY: configure-diff maybe-configure-diff maybe-configure-diff: @if diff maybe-configure-diff: configure-diff -configure-diff: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-diff: + @test ! -f diff/Makefile || exit 0; \ + [ -d diff ] || mkdir diff; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/diff/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/diff ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/diff; \ - cd "$(HOST_SUBDIR)/diff" || exit 1; \ + echo Configuring in diff; \ + cd diff || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/diff/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/diff"; \ + libsrcdir="$$s/diff";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/diff"; \ + libsrcdir="$$s/diff";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/diff"; \ - libsrcdir="$$s/diff"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif diff - - - - .PHONY: all-diff maybe-all-diff maybe-all-diff: @if diff -TARGET-diff=all maybe-all-diff: all-diff all-diff: configure-diff - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/diff && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-diff)) + (cd diff && $(MAKE) $(FLAGS_TO_PASS) all) @endif diff - - - .PHONY: check-diff maybe-check-diff maybe-check-diff: @if diff maybe-check-diff: check-diff check-diff: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/diff && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd diff && $(MAKE) $(FLAGS_TO_PASS) check) @endif diff @@ -7413,12 +5906,11 @@ maybe-install-diff: maybe-install-diff: install-diff install-diff: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/diff && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd diff && $(MAKE) $(FLAGS_TO_PASS) install) @endif diff @@ -7431,16 +5923,16 @@ maybe-info-diff: info-diff info-diff: \ configure-diff - @: $(MAKE); $(unstage) @[ -f ./diff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in diff" ; \ - (cd $(HOST_SUBDIR)/diff && \ + (cd diff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7457,16 +5949,16 @@ maybe-dvi-diff: dvi-diff dvi-diff: \ configure-diff - @: $(MAKE); $(unstage) @[ -f ./diff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in diff" ; \ - (cd $(HOST_SUBDIR)/diff && \ + (cd diff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7476,32 +5968,6 @@ dvi-diff: \ @endif diff -.PHONY: maybe-html-diff html-diff -maybe-html-diff: -@if diff -maybe-html-diff: html-diff - -html-diff: \ - configure-diff - @: $(MAKE); $(unstage) - @[ -f ./diff/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in diff" ; \ - (cd $(HOST_SUBDIR)/diff && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif diff - .PHONY: maybe-TAGS-diff TAGS-diff maybe-TAGS-diff: @if diff @@ -7509,16 +5975,16 @@ maybe-TAGS-diff: TAGS-diff TAGS-diff: \ configure-diff - @: $(MAKE); $(unstage) @[ -f ./diff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in diff" ; \ - (cd $(HOST_SUBDIR)/diff && \ + (cd diff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7536,16 +6002,16 @@ maybe-install-info-diff: install-info-diff install-info-diff: \ configure-diff \ info-diff - @: $(MAKE); $(unstage) @[ -f ./diff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in diff" ; \ - (cd $(HOST_SUBDIR)/diff && \ + (cd diff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7562,16 +6028,16 @@ maybe-installcheck-diff: installcheck-diff installcheck-diff: \ configure-diff - @: $(MAKE); $(unstage) @[ -f ./diff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in diff" ; \ - (cd $(HOST_SUBDIR)/diff && \ + (cd diff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7587,16 +6053,16 @@ maybe-mostlyclean-diff: maybe-mostlyclean-diff: mostlyclean-diff mostlyclean-diff: - @: $(MAKE); $(unstage) @[ -f ./diff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in diff" ; \ - (cd $(HOST_SUBDIR)/diff && \ + (cd diff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7612,16 +6078,16 @@ maybe-clean-diff: maybe-clean-diff: clean-diff clean-diff: - @: $(MAKE); $(unstage) @[ -f ./diff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in diff" ; \ - (cd $(HOST_SUBDIR)/diff && \ + (cd diff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7637,16 +6103,16 @@ maybe-distclean-diff: maybe-distclean-diff: distclean-diff distclean-diff: - @: $(MAKE); $(unstage) @[ -f ./diff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in diff" ; \ - (cd $(HOST_SUBDIR)/diff && \ + (cd diff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7662,16 +6128,16 @@ maybe-maintainer-clean-diff: maybe-maintainer-clean-diff: maintainer-clean-diff maintainer-clean-diff: - @: $(MAKE); $(unstage) @[ -f ./diff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in diff" ; \ - (cd $(HOST_SUBDIR)/diff && \ + (cd diff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7682,53 +6148,46 @@ maintainer-clean-diff: @endif diff - .PHONY: configure-dosutils maybe-configure-dosutils maybe-configure-dosutils: @if dosutils maybe-configure-dosutils: configure-dosutils -configure-dosutils: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-dosutils: + @test ! -f dosutils/Makefile || exit 0; \ + [ -d dosutils ] || mkdir dosutils; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/dosutils/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dosutils ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/dosutils; \ - cd "$(HOST_SUBDIR)/dosutils" || exit 1; \ + echo Configuring in dosutils; \ + cd dosutils || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/dosutils/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/dosutils"; \ + libsrcdir="$$s/dosutils";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/dosutils"; \ + libsrcdir="$$s/dosutils";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/dosutils"; \ - libsrcdir="$$s/dosutils"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif dosutils - - - - .PHONY: all-dosutils maybe-all-dosutils maybe-all-dosutils: @if dosutils -TARGET-dosutils=all maybe-all-dosutils: all-dosutils all-dosutils: configure-dosutils - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/dosutils && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-dosutils)) + (cd dosutils && $(MAKE) $(FLAGS_TO_PASS) all) @endif dosutils - - - .PHONY: check-dosutils maybe-check-dosutils maybe-check-dosutils: @if dosutils @@ -7744,12 +6203,11 @@ maybe-install-dosutils: maybe-install-dosutils: install-dosutils install-dosutils: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/dosutils && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd dosutils && $(MAKE) $(FLAGS_TO_PASS) install) @endif dosutils @@ -7762,16 +6220,16 @@ maybe-info-dosutils: info-dosutils info-dosutils: \ configure-dosutils - @: $(MAKE); $(unstage) @[ -f ./dosutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in dosutils" ; \ - (cd $(HOST_SUBDIR)/dosutils && \ + (cd dosutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7788,16 +6246,16 @@ maybe-dvi-dosutils: dvi-dosutils dvi-dosutils: \ configure-dosutils - @: $(MAKE); $(unstage) @[ -f ./dosutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in dosutils" ; \ - (cd $(HOST_SUBDIR)/dosutils && \ + (cd dosutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7807,32 +6265,6 @@ dvi-dosutils: \ @endif dosutils -.PHONY: maybe-html-dosutils html-dosutils -maybe-html-dosutils: -@if dosutils -maybe-html-dosutils: html-dosutils - -html-dosutils: \ - configure-dosutils - @: $(MAKE); $(unstage) - @[ -f ./dosutils/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in dosutils" ; \ - (cd $(HOST_SUBDIR)/dosutils && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif dosutils - .PHONY: maybe-TAGS-dosutils TAGS-dosutils maybe-TAGS-dosutils: @if dosutils @@ -7840,16 +6272,16 @@ maybe-TAGS-dosutils: TAGS-dosutils TAGS-dosutils: \ configure-dosutils - @: $(MAKE); $(unstage) @[ -f ./dosutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in dosutils" ; \ - (cd $(HOST_SUBDIR)/dosutils && \ + (cd dosutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7867,16 +6299,16 @@ maybe-install-info-dosutils: install-info-dosutils install-info-dosutils: \ configure-dosutils \ info-dosutils - @: $(MAKE); $(unstage) @[ -f ./dosutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in dosutils" ; \ - (cd $(HOST_SUBDIR)/dosutils && \ + (cd dosutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7893,16 +6325,16 @@ maybe-installcheck-dosutils: installcheck-dosutils installcheck-dosutils: \ configure-dosutils - @: $(MAKE); $(unstage) @[ -f ./dosutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in dosutils" ; \ - (cd $(HOST_SUBDIR)/dosutils && \ + (cd dosutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7918,16 +6350,16 @@ maybe-mostlyclean-dosutils: maybe-mostlyclean-dosutils: mostlyclean-dosutils mostlyclean-dosutils: - @: $(MAKE); $(unstage) @[ -f ./dosutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in dosutils" ; \ - (cd $(HOST_SUBDIR)/dosutils && \ + (cd dosutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7943,16 +6375,16 @@ maybe-clean-dosutils: maybe-clean-dosutils: clean-dosutils clean-dosutils: - @: $(MAKE); $(unstage) @[ -f ./dosutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in dosutils" ; \ - (cd $(HOST_SUBDIR)/dosutils && \ + (cd dosutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7968,16 +6400,16 @@ maybe-distclean-dosutils: maybe-distclean-dosutils: distclean-dosutils distclean-dosutils: - @: $(MAKE); $(unstage) @[ -f ./dosutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in dosutils" ; \ - (cd $(HOST_SUBDIR)/dosutils && \ + (cd dosutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7993,16 +6425,16 @@ maybe-maintainer-clean-dosutils: maybe-maintainer-clean-dosutils: maintainer-clean-dosutils maintainer-clean-dosutils: - @: $(MAKE); $(unstage) @[ -f ./dosutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in dosutils" ; \ - (cd $(HOST_SUBDIR)/dosutils && \ + (cd dosutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8013,65 +6445,57 @@ maintainer-clean-dosutils: @endif dosutils - .PHONY: configure-etc maybe-configure-etc maybe-configure-etc: @if etc maybe-configure-etc: configure-etc -configure-etc: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-etc: + @test ! -f etc/Makefile || exit 0; \ + [ -d etc ] || mkdir etc; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/etc/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/etc ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/etc; \ - cd "$(HOST_SUBDIR)/etc" || exit 1; \ + echo Configuring in etc; \ + cd etc || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/etc/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/etc"; \ + libsrcdir="$$s/etc";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/etc"; \ + libsrcdir="$$s/etc";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/etc"; \ - libsrcdir="$$s/etc"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif etc - - - - .PHONY: all-etc maybe-all-etc maybe-all-etc: @if etc -TARGET-etc=all maybe-all-etc: all-etc all-etc: configure-etc - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/etc && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-etc)) + (cd etc && $(MAKE) $(FLAGS_TO_PASS) all) @endif etc - - - .PHONY: check-etc maybe-check-etc maybe-check-etc: @if etc maybe-check-etc: check-etc check-etc: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/etc && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd etc && $(MAKE) $(FLAGS_TO_PASS) check) @endif etc @@ -8081,12 +6505,11 @@ maybe-install-etc: maybe-install-etc: install-etc install-etc: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/etc && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd etc && $(MAKE) $(FLAGS_TO_PASS) install) @endif etc @@ -8099,16 +6522,16 @@ maybe-info-etc: info-etc info-etc: \ configure-etc - @: $(MAKE); $(unstage) @[ -f ./etc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in etc" ; \ - (cd $(HOST_SUBDIR)/etc && \ + (cd etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8125,16 +6548,16 @@ maybe-dvi-etc: dvi-etc dvi-etc: \ configure-etc - @: $(MAKE); $(unstage) @[ -f ./etc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in etc" ; \ - (cd $(HOST_SUBDIR)/etc && \ + (cd etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8144,32 +6567,6 @@ dvi-etc: \ @endif etc -.PHONY: maybe-html-etc html-etc -maybe-html-etc: -@if etc -maybe-html-etc: html-etc - -html-etc: \ - configure-etc - @: $(MAKE); $(unstage) - @[ -f ./etc/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in etc" ; \ - (cd $(HOST_SUBDIR)/etc && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif etc - .PHONY: maybe-TAGS-etc TAGS-etc maybe-TAGS-etc: @if etc @@ -8177,16 +6574,16 @@ maybe-TAGS-etc: TAGS-etc TAGS-etc: \ configure-etc - @: $(MAKE); $(unstage) @[ -f ./etc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in etc" ; \ - (cd $(HOST_SUBDIR)/etc && \ + (cd etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8204,16 +6601,16 @@ maybe-install-info-etc: install-info-etc install-info-etc: \ configure-etc \ info-etc - @: $(MAKE); $(unstage) @[ -f ./etc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in etc" ; \ - (cd $(HOST_SUBDIR)/etc && \ + (cd etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8230,16 +6627,16 @@ maybe-installcheck-etc: installcheck-etc installcheck-etc: \ configure-etc - @: $(MAKE); $(unstage) @[ -f ./etc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in etc" ; \ - (cd $(HOST_SUBDIR)/etc && \ + (cd etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8255,16 +6652,16 @@ maybe-mostlyclean-etc: maybe-mostlyclean-etc: mostlyclean-etc mostlyclean-etc: - @: $(MAKE); $(unstage) @[ -f ./etc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in etc" ; \ - (cd $(HOST_SUBDIR)/etc && \ + (cd etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8280,16 +6677,16 @@ maybe-clean-etc: maybe-clean-etc: clean-etc clean-etc: - @: $(MAKE); $(unstage) @[ -f ./etc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in etc" ; \ - (cd $(HOST_SUBDIR)/etc && \ + (cd etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8305,16 +6702,16 @@ maybe-distclean-etc: maybe-distclean-etc: distclean-etc distclean-etc: - @: $(MAKE); $(unstage) @[ -f ./etc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in etc" ; \ - (cd $(HOST_SUBDIR)/etc && \ + (cd etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8330,16 +6727,16 @@ maybe-maintainer-clean-etc: maybe-maintainer-clean-etc: maintainer-clean-etc maintainer-clean-etc: - @: $(MAKE); $(unstage) @[ -f ./etc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in etc" ; \ - (cd $(HOST_SUBDIR)/etc && \ + (cd etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8350,53 +6747,46 @@ maintainer-clean-etc: @endif etc - .PHONY: configure-fastjar maybe-configure-fastjar maybe-configure-fastjar: @if fastjar maybe-configure-fastjar: configure-fastjar -configure-fastjar: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-fastjar: + @test ! -f fastjar/Makefile || exit 0; \ + [ -d fastjar ] || mkdir fastjar; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/fastjar/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fastjar ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/fastjar; \ - cd "$(HOST_SUBDIR)/fastjar" || exit 1; \ + echo Configuring in fastjar; \ + cd fastjar || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/fastjar/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/fastjar"; \ + libsrcdir="$$s/fastjar";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/fastjar"; \ + libsrcdir="$$s/fastjar";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/fastjar"; \ - libsrcdir="$$s/fastjar"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif fastjar - - - - .PHONY: all-fastjar maybe-all-fastjar maybe-all-fastjar: @if fastjar -TARGET-fastjar=all maybe-all-fastjar: all-fastjar all-fastjar: configure-fastjar - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/fastjar && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-fastjar)) + (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) all) @endif fastjar - - - .PHONY: check-fastjar maybe-check-fastjar maybe-check-fastjar: @if fastjar @@ -8404,13 +6794,12 @@ maybe-check-fastjar: check-fastjar # This module is only tested in a native toolchain. check-fastjar: - @: $(MAKE); $(unstage) @if [ '$(host)' = '$(target)' ] ; then \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/fastjar && \ - $(MAKE) $(FLAGS_TO_PASS) check); \ + (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) check); \ fi @endif fastjar @@ -8421,12 +6810,11 @@ maybe-install-fastjar: maybe-install-fastjar: install-fastjar install-fastjar: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/fastjar && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) install) @endif fastjar @@ -8439,16 +6827,16 @@ maybe-info-fastjar: info-fastjar info-fastjar: \ configure-fastjar - @: $(MAKE); $(unstage) @[ -f ./fastjar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in fastjar" ; \ - (cd $(HOST_SUBDIR)/fastjar && \ + (cd fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8465,16 +6853,16 @@ maybe-dvi-fastjar: dvi-fastjar dvi-fastjar: \ configure-fastjar - @: $(MAKE); $(unstage) @[ -f ./fastjar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in fastjar" ; \ - (cd $(HOST_SUBDIR)/fastjar && \ + (cd fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8484,32 +6872,6 @@ dvi-fastjar: \ @endif fastjar -.PHONY: maybe-html-fastjar html-fastjar -maybe-html-fastjar: -@if fastjar -maybe-html-fastjar: html-fastjar - -html-fastjar: \ - configure-fastjar - @: $(MAKE); $(unstage) - @[ -f ./fastjar/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in fastjar" ; \ - (cd $(HOST_SUBDIR)/fastjar && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif fastjar - .PHONY: maybe-TAGS-fastjar TAGS-fastjar maybe-TAGS-fastjar: @if fastjar @@ -8517,16 +6879,16 @@ maybe-TAGS-fastjar: TAGS-fastjar TAGS-fastjar: \ configure-fastjar - @: $(MAKE); $(unstage) @[ -f ./fastjar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in fastjar" ; \ - (cd $(HOST_SUBDIR)/fastjar && \ + (cd fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8544,16 +6906,16 @@ maybe-install-info-fastjar: install-info-fastjar install-info-fastjar: \ configure-fastjar \ info-fastjar - @: $(MAKE); $(unstage) @[ -f ./fastjar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in fastjar" ; \ - (cd $(HOST_SUBDIR)/fastjar && \ + (cd fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8570,16 +6932,16 @@ maybe-installcheck-fastjar: installcheck-fastjar installcheck-fastjar: \ configure-fastjar - @: $(MAKE); $(unstage) @[ -f ./fastjar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in fastjar" ; \ - (cd $(HOST_SUBDIR)/fastjar && \ + (cd fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8595,16 +6957,16 @@ maybe-mostlyclean-fastjar: maybe-mostlyclean-fastjar: mostlyclean-fastjar mostlyclean-fastjar: - @: $(MAKE); $(unstage) @[ -f ./fastjar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in fastjar" ; \ - (cd $(HOST_SUBDIR)/fastjar && \ + (cd fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8620,16 +6982,16 @@ maybe-clean-fastjar: maybe-clean-fastjar: clean-fastjar clean-fastjar: - @: $(MAKE); $(unstage) @[ -f ./fastjar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in fastjar" ; \ - (cd $(HOST_SUBDIR)/fastjar && \ + (cd fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8645,16 +7007,16 @@ maybe-distclean-fastjar: maybe-distclean-fastjar: distclean-fastjar distclean-fastjar: - @: $(MAKE); $(unstage) @[ -f ./fastjar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in fastjar" ; \ - (cd $(HOST_SUBDIR)/fastjar && \ + (cd fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8670,16 +7032,16 @@ maybe-maintainer-clean-fastjar: maybe-maintainer-clean-fastjar: maintainer-clean-fastjar maintainer-clean-fastjar: - @: $(MAKE); $(unstage) @[ -f ./fastjar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in fastjar" ; \ - (cd $(HOST_SUBDIR)/fastjar && \ + (cd fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8690,65 +7052,57 @@ maintainer-clean-fastjar: @endif fastjar - .PHONY: configure-fileutils maybe-configure-fileutils maybe-configure-fileutils: @if fileutils maybe-configure-fileutils: configure-fileutils -configure-fileutils: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-fileutils: + @test ! -f fileutils/Makefile || exit 0; \ + [ -d fileutils ] || mkdir fileutils; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/fileutils/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fileutils ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/fileutils; \ - cd "$(HOST_SUBDIR)/fileutils" || exit 1; \ + echo Configuring in fileutils; \ + cd fileutils || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/fileutils/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/fileutils"; \ + libsrcdir="$$s/fileutils";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/fileutils"; \ + libsrcdir="$$s/fileutils";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/fileutils"; \ - libsrcdir="$$s/fileutils"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif fileutils - - - - .PHONY: all-fileutils maybe-all-fileutils maybe-all-fileutils: @if fileutils -TARGET-fileutils=all maybe-all-fileutils: all-fileutils all-fileutils: configure-fileutils - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/fileutils && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-fileutils)) + (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) all) @endif fileutils - - - .PHONY: check-fileutils maybe-check-fileutils maybe-check-fileutils: @if fileutils maybe-check-fileutils: check-fileutils check-fileutils: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/fileutils && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) check) @endif fileutils @@ -8758,12 +7112,11 @@ maybe-install-fileutils: maybe-install-fileutils: install-fileutils install-fileutils: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/fileutils && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) install) @endif fileutils @@ -8776,16 +7129,16 @@ maybe-info-fileutils: info-fileutils info-fileutils: \ configure-fileutils - @: $(MAKE); $(unstage) @[ -f ./fileutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in fileutils" ; \ - (cd $(HOST_SUBDIR)/fileutils && \ + (cd fileutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8802,16 +7155,16 @@ maybe-dvi-fileutils: dvi-fileutils dvi-fileutils: \ configure-fileutils - @: $(MAKE); $(unstage) @[ -f ./fileutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in fileutils" ; \ - (cd $(HOST_SUBDIR)/fileutils && \ + (cd fileutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8821,32 +7174,6 @@ dvi-fileutils: \ @endif fileutils -.PHONY: maybe-html-fileutils html-fileutils -maybe-html-fileutils: -@if fileutils -maybe-html-fileutils: html-fileutils - -html-fileutils: \ - configure-fileutils - @: $(MAKE); $(unstage) - @[ -f ./fileutils/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in fileutils" ; \ - (cd $(HOST_SUBDIR)/fileutils && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif fileutils - .PHONY: maybe-TAGS-fileutils TAGS-fileutils maybe-TAGS-fileutils: @if fileutils @@ -8854,16 +7181,16 @@ maybe-TAGS-fileutils: TAGS-fileutils TAGS-fileutils: \ configure-fileutils - @: $(MAKE); $(unstage) @[ -f ./fileutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in fileutils" ; \ - (cd $(HOST_SUBDIR)/fileutils && \ + (cd fileutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8881,16 +7208,16 @@ maybe-install-info-fileutils: install-info-fileutils install-info-fileutils: \ configure-fileutils \ info-fileutils - @: $(MAKE); $(unstage) @[ -f ./fileutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in fileutils" ; \ - (cd $(HOST_SUBDIR)/fileutils && \ + (cd fileutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8907,16 +7234,16 @@ maybe-installcheck-fileutils: installcheck-fileutils installcheck-fileutils: \ configure-fileutils - @: $(MAKE); $(unstage) @[ -f ./fileutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in fileutils" ; \ - (cd $(HOST_SUBDIR)/fileutils && \ + (cd fileutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8932,16 +7259,16 @@ maybe-mostlyclean-fileutils: maybe-mostlyclean-fileutils: mostlyclean-fileutils mostlyclean-fileutils: - @: $(MAKE); $(unstage) @[ -f ./fileutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in fileutils" ; \ - (cd $(HOST_SUBDIR)/fileutils && \ + (cd fileutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8957,16 +7284,16 @@ maybe-clean-fileutils: maybe-clean-fileutils: clean-fileutils clean-fileutils: - @: $(MAKE); $(unstage) @[ -f ./fileutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in fileutils" ; \ - (cd $(HOST_SUBDIR)/fileutils && \ + (cd fileutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8982,16 +7309,16 @@ maybe-distclean-fileutils: maybe-distclean-fileutils: distclean-fileutils distclean-fileutils: - @: $(MAKE); $(unstage) @[ -f ./fileutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in fileutils" ; \ - (cd $(HOST_SUBDIR)/fileutils && \ + (cd fileutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9007,16 +7334,16 @@ maybe-maintainer-clean-fileutils: maybe-maintainer-clean-fileutils: maintainer-clean-fileutils maintainer-clean-fileutils: - @: $(MAKE); $(unstage) @[ -f ./fileutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in fileutils" ; \ - (cd $(HOST_SUBDIR)/fileutils && \ + (cd fileutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9027,65 +7354,57 @@ maintainer-clean-fileutils: @endif fileutils - .PHONY: configure-findutils maybe-configure-findutils maybe-configure-findutils: @if findutils maybe-configure-findutils: configure-findutils -configure-findutils: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-findutils: + @test ! -f findutils/Makefile || exit 0; \ + [ -d findutils ] || mkdir findutils; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/findutils/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/findutils ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/findutils; \ - cd "$(HOST_SUBDIR)/findutils" || exit 1; \ + echo Configuring in findutils; \ + cd findutils || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/findutils/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/findutils"; \ + libsrcdir="$$s/findutils";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/findutils"; \ + libsrcdir="$$s/findutils";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/findutils"; \ - libsrcdir="$$s/findutils"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif findutils - - - - .PHONY: all-findutils maybe-all-findutils maybe-all-findutils: @if findutils -TARGET-findutils=all maybe-all-findutils: all-findutils all-findutils: configure-findutils - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/findutils && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-findutils)) + (cd findutils && $(MAKE) $(FLAGS_TO_PASS) all) @endif findutils - - - .PHONY: check-findutils maybe-check-findutils maybe-check-findutils: @if findutils maybe-check-findutils: check-findutils check-findutils: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/findutils && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd findutils && $(MAKE) $(FLAGS_TO_PASS) check) @endif findutils @@ -9095,12 +7414,11 @@ maybe-install-findutils: maybe-install-findutils: install-findutils install-findutils: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/findutils && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd findutils && $(MAKE) $(FLAGS_TO_PASS) install) @endif findutils @@ -9113,16 +7431,16 @@ maybe-info-findutils: info-findutils info-findutils: \ configure-findutils - @: $(MAKE); $(unstage) @[ -f ./findutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in findutils" ; \ - (cd $(HOST_SUBDIR)/findutils && \ + (cd findutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9139,16 +7457,16 @@ maybe-dvi-findutils: dvi-findutils dvi-findutils: \ configure-findutils - @: $(MAKE); $(unstage) @[ -f ./findutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in findutils" ; \ - (cd $(HOST_SUBDIR)/findutils && \ + (cd findutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9158,32 +7476,6 @@ dvi-findutils: \ @endif findutils -.PHONY: maybe-html-findutils html-findutils -maybe-html-findutils: -@if findutils -maybe-html-findutils: html-findutils - -html-findutils: \ - configure-findutils - @: $(MAKE); $(unstage) - @[ -f ./findutils/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in findutils" ; \ - (cd $(HOST_SUBDIR)/findutils && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif findutils - .PHONY: maybe-TAGS-findutils TAGS-findutils maybe-TAGS-findutils: @if findutils @@ -9191,16 +7483,16 @@ maybe-TAGS-findutils: TAGS-findutils TAGS-findutils: \ configure-findutils - @: $(MAKE); $(unstage) @[ -f ./findutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in findutils" ; \ - (cd $(HOST_SUBDIR)/findutils && \ + (cd findutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9218,16 +7510,16 @@ maybe-install-info-findutils: install-info-findutils install-info-findutils: \ configure-findutils \ info-findutils - @: $(MAKE); $(unstage) @[ -f ./findutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in findutils" ; \ - (cd $(HOST_SUBDIR)/findutils && \ + (cd findutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9244,16 +7536,16 @@ maybe-installcheck-findutils: installcheck-findutils installcheck-findutils: \ configure-findutils - @: $(MAKE); $(unstage) @[ -f ./findutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in findutils" ; \ - (cd $(HOST_SUBDIR)/findutils && \ + (cd findutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9269,16 +7561,16 @@ maybe-mostlyclean-findutils: maybe-mostlyclean-findutils: mostlyclean-findutils mostlyclean-findutils: - @: $(MAKE); $(unstage) @[ -f ./findutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in findutils" ; \ - (cd $(HOST_SUBDIR)/findutils && \ + (cd findutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9294,16 +7586,16 @@ maybe-clean-findutils: maybe-clean-findutils: clean-findutils clean-findutils: - @: $(MAKE); $(unstage) @[ -f ./findutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in findutils" ; \ - (cd $(HOST_SUBDIR)/findutils && \ + (cd findutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9319,16 +7611,16 @@ maybe-distclean-findutils: maybe-distclean-findutils: distclean-findutils distclean-findutils: - @: $(MAKE); $(unstage) @[ -f ./findutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in findutils" ; \ - (cd $(HOST_SUBDIR)/findutils && \ + (cd findutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9344,16 +7636,16 @@ maybe-maintainer-clean-findutils: maybe-maintainer-clean-findutils: maintainer-clean-findutils maintainer-clean-findutils: - @: $(MAKE); $(unstage) @[ -f ./findutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in findutils" ; \ - (cd $(HOST_SUBDIR)/findutils && \ + (cd findutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9364,65 +7656,57 @@ maintainer-clean-findutils: @endif findutils - .PHONY: configure-find maybe-configure-find maybe-configure-find: @if find maybe-configure-find: configure-find -configure-find: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-find: + @test ! -f find/Makefile || exit 0; \ + [ -d find ] || mkdir find; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/find/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/find ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/find; \ - cd "$(HOST_SUBDIR)/find" || exit 1; \ + echo Configuring in find; \ + cd find || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/find/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/find"; \ + libsrcdir="$$s/find";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/find"; \ + libsrcdir="$$s/find";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/find"; \ - libsrcdir="$$s/find"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif find - - - - .PHONY: all-find maybe-all-find maybe-all-find: @if find -TARGET-find=all maybe-all-find: all-find all-find: configure-find - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/find && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-find)) + (cd find && $(MAKE) $(FLAGS_TO_PASS) all) @endif find - - - .PHONY: check-find maybe-check-find maybe-check-find: @if find maybe-check-find: check-find check-find: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/find && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd find && $(MAKE) $(FLAGS_TO_PASS) check) @endif find @@ -9432,12 +7716,11 @@ maybe-install-find: maybe-install-find: install-find install-find: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/find && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd find && $(MAKE) $(FLAGS_TO_PASS) install) @endif find @@ -9450,16 +7733,16 @@ maybe-info-find: info-find info-find: \ configure-find - @: $(MAKE); $(unstage) @[ -f ./find/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in find" ; \ - (cd $(HOST_SUBDIR)/find && \ + (cd find && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9476,16 +7759,16 @@ maybe-dvi-find: dvi-find dvi-find: \ configure-find - @: $(MAKE); $(unstage) @[ -f ./find/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in find" ; \ - (cd $(HOST_SUBDIR)/find && \ + (cd find && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9495,32 +7778,6 @@ dvi-find: \ @endif find -.PHONY: maybe-html-find html-find -maybe-html-find: -@if find -maybe-html-find: html-find - -html-find: \ - configure-find - @: $(MAKE); $(unstage) - @[ -f ./find/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in find" ; \ - (cd $(HOST_SUBDIR)/find && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif find - .PHONY: maybe-TAGS-find TAGS-find maybe-TAGS-find: @if find @@ -9528,16 +7785,16 @@ maybe-TAGS-find: TAGS-find TAGS-find: \ configure-find - @: $(MAKE); $(unstage) @[ -f ./find/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in find" ; \ - (cd $(HOST_SUBDIR)/find && \ + (cd find && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9555,16 +7812,16 @@ maybe-install-info-find: install-info-find install-info-find: \ configure-find \ info-find - @: $(MAKE); $(unstage) @[ -f ./find/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in find" ; \ - (cd $(HOST_SUBDIR)/find && \ + (cd find && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9581,16 +7838,16 @@ maybe-installcheck-find: installcheck-find installcheck-find: \ configure-find - @: $(MAKE); $(unstage) @[ -f ./find/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in find" ; \ - (cd $(HOST_SUBDIR)/find && \ + (cd find && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9606,16 +7863,16 @@ maybe-mostlyclean-find: maybe-mostlyclean-find: mostlyclean-find mostlyclean-find: - @: $(MAKE); $(unstage) @[ -f ./find/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in find" ; \ - (cd $(HOST_SUBDIR)/find && \ + (cd find && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9631,16 +7888,16 @@ maybe-clean-find: maybe-clean-find: clean-find clean-find: - @: $(MAKE); $(unstage) @[ -f ./find/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in find" ; \ - (cd $(HOST_SUBDIR)/find && \ + (cd find && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9656,16 +7913,16 @@ maybe-distclean-find: maybe-distclean-find: distclean-find distclean-find: - @: $(MAKE); $(unstage) @[ -f ./find/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in find" ; \ - (cd $(HOST_SUBDIR)/find && \ + (cd find && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9681,16 +7938,16 @@ maybe-maintainer-clean-find: maybe-maintainer-clean-find: maintainer-clean-find maintainer-clean-find: - @: $(MAKE); $(unstage) @[ -f ./find/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in find" ; \ - (cd $(HOST_SUBDIR)/find && \ + (cd find && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9701,309 +7958,46 @@ maintainer-clean-find: @endif find - -.PHONY: configure-fixincludes maybe-configure-fixincludes -maybe-configure-fixincludes: -@if fixincludes -maybe-configure-fixincludes: configure-fixincludes -configure-fixincludes: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \ - $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/fixincludes; \ - cd "$(HOST_SUBDIR)/fixincludes" || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/fixincludes"; \ - libsrcdir="$$s/fixincludes"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - || exit 1 -@endif fixincludes - - - - - -.PHONY: all-fixincludes maybe-all-fixincludes -maybe-all-fixincludes: -@if fixincludes -TARGET-fixincludes=all -maybe-all-fixincludes: all-fixincludes -all-fixincludes: configure-fixincludes - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/fixincludes && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-fixincludes)) -@endif fixincludes - - - - -.PHONY: check-fixincludes maybe-check-fixincludes -maybe-check-fixincludes: -@if fixincludes -maybe-check-fixincludes: check-fixincludes - -check-fixincludes: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/fixincludes && \ - $(MAKE) $(FLAGS_TO_PASS) check) - -@endif fixincludes - -.PHONY: install-fixincludes maybe-install-fixincludes -maybe-install-fixincludes: -@if fixincludes -maybe-install-fixincludes: install-fixincludes - -install-fixincludes: installdirs - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/fixincludes && \ - $(MAKE) $(FLAGS_TO_PASS) install) - -@endif fixincludes - -# Other targets (info, dvi, etc.) - -.PHONY: maybe-info-fixincludes info-fixincludes -maybe-info-fixincludes: -@if fixincludes -maybe-info-fixincludes: info-fixincludes - -# fixincludes doesn't support info. -info-fixincludes: - -@endif fixincludes - -.PHONY: maybe-dvi-fixincludes dvi-fixincludes -maybe-dvi-fixincludes: -@if fixincludes -maybe-dvi-fixincludes: dvi-fixincludes - -# fixincludes doesn't support dvi. -dvi-fixincludes: - -@endif fixincludes - -.PHONY: maybe-html-fixincludes html-fixincludes -maybe-html-fixincludes: -@if fixincludes -maybe-html-fixincludes: html-fixincludes - -html-fixincludes: \ - configure-fixincludes - @: $(MAKE); $(unstage) - @[ -f ./fixincludes/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in fixincludes" ; \ - (cd $(HOST_SUBDIR)/fixincludes && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif fixincludes - -.PHONY: maybe-TAGS-fixincludes TAGS-fixincludes -maybe-TAGS-fixincludes: -@if fixincludes -maybe-TAGS-fixincludes: TAGS-fixincludes - -# fixincludes doesn't support TAGS. -TAGS-fixincludes: - -@endif fixincludes - -.PHONY: maybe-install-info-fixincludes install-info-fixincludes -maybe-install-info-fixincludes: -@if fixincludes -maybe-install-info-fixincludes: install-info-fixincludes - -# fixincludes doesn't support install-info. -install-info-fixincludes: - -@endif fixincludes - -.PHONY: maybe-installcheck-fixincludes installcheck-fixincludes -maybe-installcheck-fixincludes: -@if fixincludes -maybe-installcheck-fixincludes: installcheck-fixincludes - -# fixincludes doesn't support installcheck. -installcheck-fixincludes: - -@endif fixincludes - -.PHONY: maybe-mostlyclean-fixincludes mostlyclean-fixincludes -maybe-mostlyclean-fixincludes: -@if fixincludes -maybe-mostlyclean-fixincludes: mostlyclean-fixincludes - -mostlyclean-fixincludes: - @: $(MAKE); $(unstage) - @[ -f ./fixincludes/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing mostlyclean in fixincludes" ; \ - (cd $(HOST_SUBDIR)/fixincludes && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - mostlyclean) \ - || exit 1 - -@endif fixincludes - -.PHONY: maybe-clean-fixincludes clean-fixincludes -maybe-clean-fixincludes: -@if fixincludes -maybe-clean-fixincludes: clean-fixincludes - -clean-fixincludes: - @: $(MAKE); $(unstage) - @[ -f ./fixincludes/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing clean in fixincludes" ; \ - (cd $(HOST_SUBDIR)/fixincludes && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - clean) \ - || exit 1 - -@endif fixincludes - -.PHONY: maybe-distclean-fixincludes distclean-fixincludes -maybe-distclean-fixincludes: -@if fixincludes -maybe-distclean-fixincludes: distclean-fixincludes - -distclean-fixincludes: - @: $(MAKE); $(unstage) - @[ -f ./fixincludes/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing distclean in fixincludes" ; \ - (cd $(HOST_SUBDIR)/fixincludes && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - distclean) \ - || exit 1 - -@endif fixincludes - -.PHONY: maybe-maintainer-clean-fixincludes maintainer-clean-fixincludes -maybe-maintainer-clean-fixincludes: -@if fixincludes -maybe-maintainer-clean-fixincludes: maintainer-clean-fixincludes - -maintainer-clean-fixincludes: - @: $(MAKE); $(unstage) - @[ -f ./fixincludes/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing maintainer-clean in fixincludes" ; \ - (cd $(HOST_SUBDIR)/fixincludes && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - maintainer-clean) \ - || exit 1 - -@endif fixincludes - - - .PHONY: configure-flex maybe-configure-flex maybe-configure-flex: @if flex maybe-configure-flex: configure-flex -configure-flex: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-flex: + @test ! -f flex/Makefile || exit 0; \ + [ -d flex ] || mkdir flex; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/flex/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/flex ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/flex; \ - cd "$(HOST_SUBDIR)/flex" || exit 1; \ + echo Configuring in flex; \ + cd flex || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/flex/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/flex"; \ + libsrcdir="$$s/flex";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/flex"; \ + libsrcdir="$$s/flex";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/flex"; \ - libsrcdir="$$s/flex"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif flex - - - - .PHONY: all-flex maybe-all-flex maybe-all-flex: @if flex -TARGET-flex=all maybe-all-flex: all-flex all-flex: configure-flex - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/flex && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-flex)) + (cd flex && $(MAKE) $(FLAGS_TO_PASS) all) @endif flex - - - .PHONY: check-flex maybe-check-flex maybe-check-flex: @if flex @@ -10011,13 +8005,12 @@ maybe-check-flex: check-flex # This module is only tested in a native toolchain. check-flex: - @: $(MAKE); $(unstage) @if [ '$(host)' = '$(target)' ] ; then \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/flex && \ - $(MAKE) $(FLAGS_TO_PASS) check); \ + (cd flex && $(MAKE) $(FLAGS_TO_PASS) check); \ fi @endif flex @@ -10028,12 +8021,11 @@ maybe-install-flex: maybe-install-flex: install-flex install-flex: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/flex && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd flex && $(MAKE) $(FLAGS_TO_PASS) install) @endif flex @@ -10046,16 +8038,16 @@ maybe-info-flex: info-flex info-flex: \ configure-flex - @: $(MAKE); $(unstage) @[ -f ./flex/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in flex" ; \ - (cd $(HOST_SUBDIR)/flex && \ + (cd flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10072,16 +8064,16 @@ maybe-dvi-flex: dvi-flex dvi-flex: \ configure-flex - @: $(MAKE); $(unstage) @[ -f ./flex/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in flex" ; \ - (cd $(HOST_SUBDIR)/flex && \ + (cd flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10091,32 +8083,6 @@ dvi-flex: \ @endif flex -.PHONY: maybe-html-flex html-flex -maybe-html-flex: -@if flex -maybe-html-flex: html-flex - -html-flex: \ - configure-flex - @: $(MAKE); $(unstage) - @[ -f ./flex/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in flex" ; \ - (cd $(HOST_SUBDIR)/flex && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif flex - .PHONY: maybe-TAGS-flex TAGS-flex maybe-TAGS-flex: @if flex @@ -10124,16 +8090,16 @@ maybe-TAGS-flex: TAGS-flex TAGS-flex: \ configure-flex - @: $(MAKE); $(unstage) @[ -f ./flex/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in flex" ; \ - (cd $(HOST_SUBDIR)/flex && \ + (cd flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10151,16 +8117,16 @@ maybe-install-info-flex: install-info-flex install-info-flex: \ configure-flex \ info-flex - @: $(MAKE); $(unstage) @[ -f ./flex/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in flex" ; \ - (cd $(HOST_SUBDIR)/flex && \ + (cd flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10177,16 +8143,16 @@ maybe-installcheck-flex: installcheck-flex installcheck-flex: \ configure-flex - @: $(MAKE); $(unstage) @[ -f ./flex/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in flex" ; \ - (cd $(HOST_SUBDIR)/flex && \ + (cd flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10202,16 +8168,16 @@ maybe-mostlyclean-flex: maybe-mostlyclean-flex: mostlyclean-flex mostlyclean-flex: - @: $(MAKE); $(unstage) @[ -f ./flex/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in flex" ; \ - (cd $(HOST_SUBDIR)/flex && \ + (cd flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10227,16 +8193,16 @@ maybe-clean-flex: maybe-clean-flex: clean-flex clean-flex: - @: $(MAKE); $(unstage) @[ -f ./flex/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in flex" ; \ - (cd $(HOST_SUBDIR)/flex && \ + (cd flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10252,16 +8218,16 @@ maybe-distclean-flex: maybe-distclean-flex: distclean-flex distclean-flex: - @: $(MAKE); $(unstage) @[ -f ./flex/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in flex" ; \ - (cd $(HOST_SUBDIR)/flex && \ + (cd flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10277,16 +8243,16 @@ maybe-maintainer-clean-flex: maybe-maintainer-clean-flex: maintainer-clean-flex maintainer-clean-flex: - @: $(MAKE); $(unstage) @[ -f ./flex/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in flex" ; \ - (cd $(HOST_SUBDIR)/flex && \ + (cd flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10297,422 +8263,59 @@ maintainer-clean-flex: @endif flex - .PHONY: configure-gas maybe-configure-gas maybe-configure-gas: @if gas maybe-configure-gas: configure-gas -configure-gas: -@endif gas -@if gas-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif gas-bootstrap -@if gas - @r=`${PWD_COMMAND}`; export r; \ +configure-gas: + @test -f stage_last && exit 0; \ + test ! -f gas/Makefile || exit 0; \ + [ -d gas ] || mkdir gas; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/gas; \ - cd "$(HOST_SUBDIR)/gas" || exit 1; \ + echo Configuring in gas; \ + cd gas || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gas/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gas"; \ + libsrcdir="$$s/gas";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gas"; \ + libsrcdir="$$s/gas";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gas"; \ - libsrcdir="$$s/gas"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif gas - - -.PHONY: configure-stage1-gas maybe-configure-stage1-gas -maybe-configure-stage1-gas: -@if gas-bootstrap -maybe-configure-stage1-gas: configure-stage1-gas -configure-stage1-gas: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - echo Configuring stage 1 in $(HOST_SUBDIR)/gas ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ - cd $(HOST_SUBDIR)/gas || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gas/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/gas"; \ - libsrcdir="$$s/gas"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" -@endif gas-bootstrap - -.PHONY: configure-stage2-gas maybe-configure-stage2-gas -maybe-configure-stage2-gas: -@if gas-bootstrap -maybe-configure-stage2-gas: configure-stage2-gas -configure-stage2-gas: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 2 in $(HOST_SUBDIR)/gas ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ - cd $(HOST_SUBDIR)/gas || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gas/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/gas"; \ - libsrcdir="$$s/gas"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif gas-bootstrap - -.PHONY: configure-stage3-gas maybe-configure-stage3-gas -maybe-configure-stage3-gas: -@if gas-bootstrap -maybe-configure-stage3-gas: configure-stage3-gas -configure-stage3-gas: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 3 in $(HOST_SUBDIR)/gas ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ - cd $(HOST_SUBDIR)/gas || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gas/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/gas"; \ - libsrcdir="$$s/gas"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif gas-bootstrap - -.PHONY: configure-stage4-gas maybe-configure-stage4-gas -maybe-configure-stage4-gas: -@if gas-bootstrap -maybe-configure-stage4-gas: configure-stage4-gas -configure-stage4-gas: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 4 in $(HOST_SUBDIR)/gas ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ - cd $(HOST_SUBDIR)/gas || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gas/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/gas"; \ - libsrcdir="$$s/gas"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif gas-bootstrap - -.PHONY: configure-stageprofile-gas maybe-configure-stageprofile-gas -maybe-configure-stageprofile-gas: -@if gas-bootstrap -maybe-configure-stageprofile-gas: configure-stageprofile-gas -configure-stageprofile-gas: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage profile in $(HOST_SUBDIR)/gas ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ - cd $(HOST_SUBDIR)/gas || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gas/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/gas"; \ - libsrcdir="$$s/gas"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif gas-bootstrap - -.PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas -maybe-configure-stagefeedback-gas: -@if gas-bootstrap -maybe-configure-stagefeedback-gas: configure-stagefeedback-gas -configure-stagefeedback-gas: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage feedback in $(HOST_SUBDIR)/gas ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ - cd $(HOST_SUBDIR)/gas || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gas/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/gas"; \ - libsrcdir="$$s/gas"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif gas-bootstrap - - - - - .PHONY: all-gas maybe-all-gas maybe-all-gas: @if gas -TARGET-gas=all maybe-all-gas: all-gas all-gas: configure-gas -@endif gas -@if gas-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif gas-bootstrap -@if gas - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gas)) + (cd gas && $(MAKE) $(FLAGS_TO_PASS) all) @endif gas - - -.PHONY: all-stage1-gas maybe-all-stage1-gas -.PHONY: clean-stage1-gas maybe-clean-stage1-gas -maybe-all-stage1-gas: -maybe-clean-stage1-gas: -@if gas-bootstrap -maybe-all-stage1-gas: all-stage1-gas -all-stage1: all-stage1-gas -TARGET-stage1-gas = $(TARGET-gas) -all-stage1-gas: configure-stage1-gas - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ - $(TARGET-stage1-gas) - -maybe-clean-stage1-gas: clean-stage1-gas -clean-stage1: clean-stage1-gas -clean-stage1-gas: - @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-gas/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ - cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" clean -@endif gas-bootstrap - - -.PHONY: all-stage2-gas maybe-all-stage2-gas -.PHONY: clean-stage2-gas maybe-clean-stage2-gas -maybe-all-stage2-gas: -maybe-clean-stage2-gas: -@if gas-bootstrap -maybe-all-stage2-gas: all-stage2-gas -all-stage2: all-stage2-gas -TARGET-stage2-gas = $(TARGET-gas) -all-stage2-gas: configure-stage2-gas - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage2-gas) - -maybe-clean-stage2-gas: clean-stage2-gas -clean-stage2: clean-stage2-gas -clean-stage2-gas: - @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-gas/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ - cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif gas-bootstrap - - -.PHONY: all-stage3-gas maybe-all-stage3-gas -.PHONY: clean-stage3-gas maybe-clean-stage3-gas -maybe-all-stage3-gas: -maybe-clean-stage3-gas: -@if gas-bootstrap -maybe-all-stage3-gas: all-stage3-gas -all-stage3: all-stage3-gas -TARGET-stage3-gas = $(TARGET-gas) -all-stage3-gas: configure-stage3-gas - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage3-gas) - -maybe-clean-stage3-gas: clean-stage3-gas -clean-stage3: clean-stage3-gas -clean-stage3-gas: - @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-gas/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ - cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif gas-bootstrap - - -.PHONY: all-stage4-gas maybe-all-stage4-gas -.PHONY: clean-stage4-gas maybe-clean-stage4-gas -maybe-all-stage4-gas: -maybe-clean-stage4-gas: -@if gas-bootstrap -maybe-all-stage4-gas: all-stage4-gas -all-stage4: all-stage4-gas -TARGET-stage4-gas = $(TARGET-gas) -all-stage4-gas: configure-stage4-gas - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage4-gas) - -maybe-clean-stage4-gas: clean-stage4-gas -clean-stage4: clean-stage4-gas -clean-stage4-gas: - @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-gas/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ - cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif gas-bootstrap - - -.PHONY: all-stageprofile-gas maybe-all-stageprofile-gas -.PHONY: clean-stageprofile-gas maybe-clean-stageprofile-gas -maybe-all-stageprofile-gas: -maybe-clean-stageprofile-gas: -@if gas-bootstrap -maybe-all-stageprofile-gas: all-stageprofile-gas -all-stageprofile: all-stageprofile-gas -TARGET-stageprofile-gas = $(TARGET-gas) -all-stageprofile-gas: configure-stageprofile-gas - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" \ - $(TARGET-stageprofile-gas) - -maybe-clean-stageprofile-gas: clean-stageprofile-gas -clean-stageprofile: clean-stageprofile-gas -clean-stageprofile-gas: - @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-gas/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ - cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean -@endif gas-bootstrap - - -.PHONY: all-stagefeedback-gas maybe-all-stagefeedback-gas -.PHONY: clean-stagefeedback-gas maybe-clean-stagefeedback-gas -maybe-all-stagefeedback-gas: -maybe-clean-stagefeedback-gas: -@if gas-bootstrap -maybe-all-stagefeedback-gas: all-stagefeedback-gas -all-stagefeedback: all-stagefeedback-gas -TARGET-stagefeedback-gas = $(TARGET-gas) -all-stagefeedback-gas: configure-stagefeedback-gas - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" \ - $(TARGET-stagefeedback-gas) - -maybe-clean-stagefeedback-gas: clean-stagefeedback-gas -clean-stagefeedback: clean-stagefeedback-gas -clean-stagefeedback-gas: - @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-gas/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ - cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean -@endif gas-bootstrap - - - - - .PHONY: check-gas maybe-check-gas maybe-check-gas: @if gas maybe-check-gas: check-gas check-gas: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd gas && $(MAKE) $(FLAGS_TO_PASS) check) @endif gas @@ -10722,12 +8325,11 @@ maybe-install-gas: maybe-install-gas: install-gas install-gas: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd gas && $(MAKE) $(FLAGS_TO_PASS) install) @endif gas @@ -10743,12 +8345,13 @@ info-gas: \ @[ -f ./gas/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in gas" ; \ - (cd $(HOST_SUBDIR)/gas && \ + (cd gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10768,12 +8371,13 @@ dvi-gas: \ @[ -f ./gas/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in gas" ; \ - (cd $(HOST_SUBDIR)/gas && \ + (cd gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10783,31 +8387,6 @@ dvi-gas: \ @endif gas -.PHONY: maybe-html-gas html-gas -maybe-html-gas: -@if gas -maybe-html-gas: html-gas - -html-gas: \ - configure-gas - @[ -f ./gas/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in gas" ; \ - (cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif gas - .PHONY: maybe-TAGS-gas TAGS-gas maybe-TAGS-gas: @if gas @@ -10818,12 +8397,13 @@ TAGS-gas: \ @[ -f ./gas/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in gas" ; \ - (cd $(HOST_SUBDIR)/gas && \ + (cd gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10844,12 +8424,13 @@ install-info-gas: \ @[ -f ./gas/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in gas" ; \ - (cd $(HOST_SUBDIR)/gas && \ + (cd gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10869,12 +8450,13 @@ installcheck-gas: \ @[ -f ./gas/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in gas" ; \ - (cd $(HOST_SUBDIR)/gas && \ + (cd gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10893,12 +8475,13 @@ mostlyclean-gas: @[ -f ./gas/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in gas" ; \ - (cd $(HOST_SUBDIR)/gas && \ + (cd gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10917,12 +8500,13 @@ clean-gas: @[ -f ./gas/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in gas" ; \ - (cd $(HOST_SUBDIR)/gas && \ + (cd gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10941,12 +8525,13 @@ distclean-gas: @[ -f ./gas/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in gas" ; \ - (cd $(HOST_SUBDIR)/gas && \ + (cd gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10965,12 +8550,13 @@ maintainer-clean-gas: @[ -f ./gas/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in gas" ; \ - (cd $(HOST_SUBDIR)/gas && \ + (cd gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10981,422 +8567,60 @@ maintainer-clean-gas: @endif gas - .PHONY: configure-gcc maybe-configure-gcc maybe-configure-gcc: @if gcc maybe-configure-gcc: configure-gcc -configure-gcc: -@endif gcc -@if gcc-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif gcc-bootstrap -@if gcc - @r=`${PWD_COMMAND}`; export r; \ +configure-gcc: + @test -f stage_last && exit 0; \ + test ! -f gcc/Makefile || exit 0; \ + [ -d gcc ] || mkdir gcc; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/gcc; \ - cd "$(HOST_SUBDIR)/gcc" || exit 1; \ + echo Configuring in gcc; \ + cd gcc || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gcc"; \ + libsrcdir="$$s/gcc";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gcc"; \ + libsrcdir="$$s/gcc";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gcc"; \ - libsrcdir="$$s/gcc"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif gcc - - -.PHONY: configure-stage1-gcc maybe-configure-stage1-gcc -maybe-configure-stage1-gcc: -@if gcc-bootstrap -maybe-configure-stage1-gcc: configure-stage1-gcc -configure-stage1-gcc: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ - cd $(HOST_SUBDIR)/gcc || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/gcc"; \ - libsrcdir="$$s/gcc"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" -@endif gcc-bootstrap - -.PHONY: configure-stage2-gcc maybe-configure-stage2-gcc -maybe-configure-stage2-gcc: -@if gcc-bootstrap -maybe-configure-stage2-gcc: configure-stage2-gcc -configure-stage2-gcc: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 2 in $(HOST_SUBDIR)/gcc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ - cd $(HOST_SUBDIR)/gcc || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/gcc"; \ - libsrcdir="$$s/gcc"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif gcc-bootstrap - -.PHONY: configure-stage3-gcc maybe-configure-stage3-gcc -maybe-configure-stage3-gcc: -@if gcc-bootstrap -maybe-configure-stage3-gcc: configure-stage3-gcc -configure-stage3-gcc: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 3 in $(HOST_SUBDIR)/gcc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ - cd $(HOST_SUBDIR)/gcc || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/gcc"; \ - libsrcdir="$$s/gcc"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif gcc-bootstrap - -.PHONY: configure-stage4-gcc maybe-configure-stage4-gcc -maybe-configure-stage4-gcc: -@if gcc-bootstrap -maybe-configure-stage4-gcc: configure-stage4-gcc -configure-stage4-gcc: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 4 in $(HOST_SUBDIR)/gcc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ - cd $(HOST_SUBDIR)/gcc || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/gcc"; \ - libsrcdir="$$s/gcc"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif gcc-bootstrap - -.PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc -maybe-configure-stageprofile-gcc: -@if gcc-bootstrap -maybe-configure-stageprofile-gcc: configure-stageprofile-gcc -configure-stageprofile-gcc: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage profile in $(HOST_SUBDIR)/gcc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ - cd $(HOST_SUBDIR)/gcc || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/gcc"; \ - libsrcdir="$$s/gcc"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif gcc-bootstrap - -.PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc -maybe-configure-stagefeedback-gcc: -@if gcc-bootstrap -maybe-configure-stagefeedback-gcc: configure-stagefeedback-gcc -configure-stagefeedback-gcc: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage feedback in $(HOST_SUBDIR)/gcc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ - cd $(HOST_SUBDIR)/gcc || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/gcc"; \ - libsrcdir="$$s/gcc"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif gcc-bootstrap - - - - - .PHONY: all-gcc maybe-all-gcc maybe-all-gcc: @if gcc -TARGET-gcc=`if [ -f stage_last ]; then echo quickstrap ; else echo all; fi` maybe-all-gcc: all-gcc all-gcc: configure-gcc -@endif gcc -@if gcc-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif gcc-bootstrap -@if gcc - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(TARGET-gcc)) + (cd gcc && $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ + `if [ -f gcc/stage_last ]; then echo quickstrap ; else echo all; fi` ) @endif gcc - - -.PHONY: all-stage1-gcc maybe-all-stage1-gcc -.PHONY: clean-stage1-gcc maybe-clean-stage1-gcc -maybe-all-stage1-gcc: -maybe-clean-stage1-gcc: -@if gcc-bootstrap -maybe-all-stage1-gcc: all-stage1-gcc -all-stage1: all-stage1-gcc -TARGET-stage1-gcc = $(TARGET-gcc) -all-stage1-gcc: configure-stage1-gcc - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) \ - $(TARGET-stage1-gcc) - -maybe-clean-stage1-gcc: clean-stage1-gcc -clean-stage1: clean-stage1-gcc -clean-stage1-gcc: - @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-gcc/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ - cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) clean -@endif gcc-bootstrap - - -.PHONY: all-stage2-gcc maybe-all-stage2-gcc -.PHONY: clean-stage2-gcc maybe-clean-stage2-gcc -maybe-all-stage2-gcc: -maybe-clean-stage2-gcc: -@if gcc-bootstrap -maybe-all-stage2-gcc: all-stage2-gcc -all-stage2: all-stage2-gcc -TARGET-stage2-gcc = $(TARGET-gcc) -all-stage2-gcc: configure-stage2-gcc - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ - $(TARGET-stage2-gcc) - -maybe-clean-stage2-gcc: clean-stage2-gcc -clean-stage2: clean-stage2-gcc -clean-stage2-gcc: - @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-gcc/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ - cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(EXTRA_GCC_FLAGS) clean -@endif gcc-bootstrap - - -.PHONY: all-stage3-gcc maybe-all-stage3-gcc -.PHONY: clean-stage3-gcc maybe-clean-stage3-gcc -maybe-all-stage3-gcc: -maybe-clean-stage3-gcc: -@if gcc-bootstrap -maybe-all-stage3-gcc: all-stage3-gcc -all-stage3: all-stage3-gcc -TARGET-stage3-gcc = $(TARGET-gcc) -all-stage3-gcc: configure-stage3-gcc - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ - $(TARGET-stage3-gcc) - -maybe-clean-stage3-gcc: clean-stage3-gcc -clean-stage3: clean-stage3-gcc -clean-stage3-gcc: - @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-gcc/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ - cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(EXTRA_GCC_FLAGS) clean -@endif gcc-bootstrap - - -.PHONY: all-stage4-gcc maybe-all-stage4-gcc -.PHONY: clean-stage4-gcc maybe-clean-stage4-gcc -maybe-all-stage4-gcc: -maybe-clean-stage4-gcc: -@if gcc-bootstrap -maybe-all-stage4-gcc: all-stage4-gcc -all-stage4: all-stage4-gcc -TARGET-stage4-gcc = $(TARGET-gcc) -all-stage4-gcc: configure-stage4-gcc - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ - $(TARGET-stage4-gcc) - -maybe-clean-stage4-gcc: clean-stage4-gcc -clean-stage4: clean-stage4-gcc -clean-stage4-gcc: - @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-gcc/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ - cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(EXTRA_GCC_FLAGS) clean -@endif gcc-bootstrap - - -.PHONY: all-stageprofile-gcc maybe-all-stageprofile-gcc -.PHONY: clean-stageprofile-gcc maybe-clean-stageprofile-gcc -maybe-all-stageprofile-gcc: -maybe-clean-stageprofile-gcc: -@if gcc-bootstrap -maybe-all-stageprofile-gcc: all-stageprofile-gcc -all-stageprofile: all-stageprofile-gcc -TARGET-stageprofile-gcc = $(TARGET-gcc) -all-stageprofile-gcc: configure-stageprofile-gcc - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS) \ - $(TARGET-stageprofile-gcc) - -maybe-clean-stageprofile-gcc: clean-stageprofile-gcc -clean-stageprofile: clean-stageprofile-gcc -clean-stageprofile-gcc: - @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-gcc/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ - cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS) clean -@endif gcc-bootstrap - - -.PHONY: all-stagefeedback-gcc maybe-all-stagefeedback-gcc -.PHONY: clean-stagefeedback-gcc maybe-clean-stagefeedback-gcc -maybe-all-stagefeedback-gcc: -maybe-clean-stagefeedback-gcc: -@if gcc-bootstrap -maybe-all-stagefeedback-gcc: all-stagefeedback-gcc -all-stagefeedback: all-stagefeedback-gcc -TARGET-stagefeedback-gcc = $(TARGET-gcc) -all-stagefeedback-gcc: configure-stagefeedback-gcc - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS) \ - $(TARGET-stagefeedback-gcc) - -maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc -clean-stagefeedback: clean-stagefeedback-gcc -clean-stagefeedback-gcc: - @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-gcc/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ - cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS) clean -@endif gcc-bootstrap - - - - - .PHONY: check-gcc maybe-check-gcc maybe-check-gcc: @if gcc maybe-check-gcc: check-gcc check-gcc: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) check) + (cd gcc && $(MAKE) $(FLAGS_TO_PASS)$(EXTRA_GCC_FLAGS) check) @endif gcc @@ -11406,12 +8630,11 @@ maybe-install-gcc: maybe-install-gcc: install-gcc install-gcc: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) install) + (cd gcc && $(MAKE) $(FLAGS_TO_PASS)$(EXTRA_GCC_FLAGS) install) @endif gcc @@ -11427,12 +8650,13 @@ info-gcc: \ @[ -f ./gcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in gcc" ; \ - (cd $(HOST_SUBDIR)/gcc && \ + (cd gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11452,12 +8676,13 @@ dvi-gcc: \ @[ -f ./gcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in gcc" ; \ - (cd $(HOST_SUBDIR)/gcc && \ + (cd gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11467,31 +8692,6 @@ dvi-gcc: \ @endif gcc -.PHONY: maybe-html-gcc html-gcc -maybe-html-gcc: -@if gcc -maybe-html-gcc: html-gcc - -html-gcc: \ - configure-gcc - @[ -f ./gcc/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in gcc" ; \ - (cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif gcc - .PHONY: maybe-TAGS-gcc TAGS-gcc maybe-TAGS-gcc: @if gcc @@ -11502,12 +8702,13 @@ TAGS-gcc: \ @[ -f ./gcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in gcc" ; \ - (cd $(HOST_SUBDIR)/gcc && \ + (cd gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11528,12 +8729,13 @@ install-info-gcc: \ @[ -f ./gcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in gcc" ; \ - (cd $(HOST_SUBDIR)/gcc && \ + (cd gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11553,12 +8755,13 @@ installcheck-gcc: \ @[ -f ./gcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in gcc" ; \ - (cd $(HOST_SUBDIR)/gcc && \ + (cd gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11577,12 +8780,13 @@ mostlyclean-gcc: @[ -f ./gcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in gcc" ; \ - (cd $(HOST_SUBDIR)/gcc && \ + (cd gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11601,12 +8805,13 @@ clean-gcc: @[ -f ./gcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in gcc" ; \ - (cd $(HOST_SUBDIR)/gcc && \ + (cd gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11625,12 +8830,13 @@ distclean-gcc: @[ -f ./gcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in gcc" ; \ - (cd $(HOST_SUBDIR)/gcc && \ + (cd gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11649,12 +8855,13 @@ maintainer-clean-gcc: @[ -f ./gcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in gcc" ; \ - (cd $(HOST_SUBDIR)/gcc && \ + (cd gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11665,65 +8872,57 @@ maintainer-clean-gcc: @endif gcc - .PHONY: configure-gawk maybe-configure-gawk maybe-configure-gawk: @if gawk maybe-configure-gawk: configure-gawk -configure-gawk: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-gawk: + @test ! -f gawk/Makefile || exit 0; \ + [ -d gawk ] || mkdir gawk; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gawk/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gawk ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/gawk; \ - cd "$(HOST_SUBDIR)/gawk" || exit 1; \ + echo Configuring in gawk; \ + cd gawk || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gawk/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gawk"; \ + libsrcdir="$$s/gawk";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gawk"; \ + libsrcdir="$$s/gawk";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gawk"; \ - libsrcdir="$$s/gawk"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif gawk - - - - .PHONY: all-gawk maybe-all-gawk maybe-all-gawk: @if gawk -TARGET-gawk=all maybe-all-gawk: all-gawk all-gawk: configure-gawk - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gawk && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gawk)) + (cd gawk && $(MAKE) $(FLAGS_TO_PASS) all) @endif gawk - - - .PHONY: check-gawk maybe-check-gawk maybe-check-gawk: @if gawk maybe-check-gawk: check-gawk check-gawk: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gawk && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd gawk && $(MAKE) $(FLAGS_TO_PASS) check) @endif gawk @@ -11733,12 +8932,11 @@ maybe-install-gawk: maybe-install-gawk: install-gawk install-gawk: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gawk && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd gawk && $(MAKE) $(FLAGS_TO_PASS) install) @endif gawk @@ -11751,16 +8949,16 @@ maybe-info-gawk: info-gawk info-gawk: \ configure-gawk - @: $(MAKE); $(unstage) @[ -f ./gawk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in gawk" ; \ - (cd $(HOST_SUBDIR)/gawk && \ + (cd gawk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11777,16 +8975,16 @@ maybe-dvi-gawk: dvi-gawk dvi-gawk: \ configure-gawk - @: $(MAKE); $(unstage) @[ -f ./gawk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in gawk" ; \ - (cd $(HOST_SUBDIR)/gawk && \ + (cd gawk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11796,32 +8994,6 @@ dvi-gawk: \ @endif gawk -.PHONY: maybe-html-gawk html-gawk -maybe-html-gawk: -@if gawk -maybe-html-gawk: html-gawk - -html-gawk: \ - configure-gawk - @: $(MAKE); $(unstage) - @[ -f ./gawk/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in gawk" ; \ - (cd $(HOST_SUBDIR)/gawk && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif gawk - .PHONY: maybe-TAGS-gawk TAGS-gawk maybe-TAGS-gawk: @if gawk @@ -11829,16 +9001,16 @@ maybe-TAGS-gawk: TAGS-gawk TAGS-gawk: \ configure-gawk - @: $(MAKE); $(unstage) @[ -f ./gawk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in gawk" ; \ - (cd $(HOST_SUBDIR)/gawk && \ + (cd gawk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11856,16 +9028,16 @@ maybe-install-info-gawk: install-info-gawk install-info-gawk: \ configure-gawk \ info-gawk - @: $(MAKE); $(unstage) @[ -f ./gawk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in gawk" ; \ - (cd $(HOST_SUBDIR)/gawk && \ + (cd gawk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11882,16 +9054,16 @@ maybe-installcheck-gawk: installcheck-gawk installcheck-gawk: \ configure-gawk - @: $(MAKE); $(unstage) @[ -f ./gawk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in gawk" ; \ - (cd $(HOST_SUBDIR)/gawk && \ + (cd gawk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11907,16 +9079,16 @@ maybe-mostlyclean-gawk: maybe-mostlyclean-gawk: mostlyclean-gawk mostlyclean-gawk: - @: $(MAKE); $(unstage) @[ -f ./gawk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in gawk" ; \ - (cd $(HOST_SUBDIR)/gawk && \ + (cd gawk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11932,16 +9104,16 @@ maybe-clean-gawk: maybe-clean-gawk: clean-gawk clean-gawk: - @: $(MAKE); $(unstage) @[ -f ./gawk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in gawk" ; \ - (cd $(HOST_SUBDIR)/gawk && \ + (cd gawk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11957,16 +9129,16 @@ maybe-distclean-gawk: maybe-distclean-gawk: distclean-gawk distclean-gawk: - @: $(MAKE); $(unstage) @[ -f ./gawk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in gawk" ; \ - (cd $(HOST_SUBDIR)/gawk && \ + (cd gawk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11982,16 +9154,16 @@ maybe-maintainer-clean-gawk: maybe-maintainer-clean-gawk: maintainer-clean-gawk maintainer-clean-gawk: - @: $(MAKE); $(unstage) @[ -f ./gawk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in gawk" ; \ - (cd $(HOST_SUBDIR)/gawk && \ + (cd gawk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12002,65 +9174,57 @@ maintainer-clean-gawk: @endif gawk - .PHONY: configure-gettext maybe-configure-gettext maybe-configure-gettext: @if gettext maybe-configure-gettext: configure-gettext -configure-gettext: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-gettext: + @test ! -f gettext/Makefile || exit 0; \ + [ -d gettext ] || mkdir gettext; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/gettext; \ - cd "$(HOST_SUBDIR)/gettext" || exit 1; \ + echo Configuring in gettext; \ + cd gettext || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gettext/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gettext"; \ + libsrcdir="$$s/gettext";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gettext"; \ + libsrcdir="$$s/gettext";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gettext"; \ - libsrcdir="$$s/gettext"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif gettext - - - - .PHONY: all-gettext maybe-all-gettext maybe-all-gettext: @if gettext -TARGET-gettext=all maybe-all-gettext: all-gettext all-gettext: configure-gettext - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gettext && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gettext)) + (cd gettext && $(MAKE) $(FLAGS_TO_PASS) all) @endif gettext - - - .PHONY: check-gettext maybe-check-gettext maybe-check-gettext: @if gettext maybe-check-gettext: check-gettext check-gettext: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gettext && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd gettext && $(MAKE) $(FLAGS_TO_PASS) check) @endif gettext @@ -12070,12 +9234,11 @@ maybe-install-gettext: maybe-install-gettext: install-gettext install-gettext: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gettext && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd gettext && $(MAKE) $(FLAGS_TO_PASS) install) @endif gettext @@ -12088,16 +9251,16 @@ maybe-info-gettext: info-gettext info-gettext: \ configure-gettext - @: $(MAKE); $(unstage) @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in gettext" ; \ - (cd $(HOST_SUBDIR)/gettext && \ + (cd gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12114,16 +9277,16 @@ maybe-dvi-gettext: dvi-gettext dvi-gettext: \ configure-gettext - @: $(MAKE); $(unstage) @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in gettext" ; \ - (cd $(HOST_SUBDIR)/gettext && \ + (cd gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12133,32 +9296,6 @@ dvi-gettext: \ @endif gettext -.PHONY: maybe-html-gettext html-gettext -maybe-html-gettext: -@if gettext -maybe-html-gettext: html-gettext - -html-gettext: \ - configure-gettext - @: $(MAKE); $(unstage) - @[ -f ./gettext/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in gettext" ; \ - (cd $(HOST_SUBDIR)/gettext && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif gettext - .PHONY: maybe-TAGS-gettext TAGS-gettext maybe-TAGS-gettext: @if gettext @@ -12166,16 +9303,16 @@ maybe-TAGS-gettext: TAGS-gettext TAGS-gettext: \ configure-gettext - @: $(MAKE); $(unstage) @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in gettext" ; \ - (cd $(HOST_SUBDIR)/gettext && \ + (cd gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12193,16 +9330,16 @@ maybe-install-info-gettext: install-info-gettext install-info-gettext: \ configure-gettext \ info-gettext - @: $(MAKE); $(unstage) @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in gettext" ; \ - (cd $(HOST_SUBDIR)/gettext && \ + (cd gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12219,16 +9356,16 @@ maybe-installcheck-gettext: installcheck-gettext installcheck-gettext: \ configure-gettext - @: $(MAKE); $(unstage) @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in gettext" ; \ - (cd $(HOST_SUBDIR)/gettext && \ + (cd gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12244,16 +9381,16 @@ maybe-mostlyclean-gettext: maybe-mostlyclean-gettext: mostlyclean-gettext mostlyclean-gettext: - @: $(MAKE); $(unstage) @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in gettext" ; \ - (cd $(HOST_SUBDIR)/gettext && \ + (cd gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12269,16 +9406,16 @@ maybe-clean-gettext: maybe-clean-gettext: clean-gettext clean-gettext: - @: $(MAKE); $(unstage) @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in gettext" ; \ - (cd $(HOST_SUBDIR)/gettext && \ + (cd gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12294,16 +9431,16 @@ maybe-distclean-gettext: maybe-distclean-gettext: distclean-gettext distclean-gettext: - @: $(MAKE); $(unstage) @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in gettext" ; \ - (cd $(HOST_SUBDIR)/gettext && \ + (cd gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12319,16 +9456,16 @@ maybe-maintainer-clean-gettext: maybe-maintainer-clean-gettext: maintainer-clean-gettext maintainer-clean-gettext: - @: $(MAKE); $(unstage) @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in gettext" ; \ - (cd $(HOST_SUBDIR)/gettext && \ + (cd gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12339,65 +9476,57 @@ maintainer-clean-gettext: @endif gettext - .PHONY: configure-gnuserv maybe-configure-gnuserv maybe-configure-gnuserv: @if gnuserv maybe-configure-gnuserv: configure-gnuserv -configure-gnuserv: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-gnuserv: + @test ! -f gnuserv/Makefile || exit 0; \ + [ -d gnuserv ] || mkdir gnuserv; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gnuserv/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnuserv ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/gnuserv; \ - cd "$(HOST_SUBDIR)/gnuserv" || exit 1; \ + echo Configuring in gnuserv; \ + cd gnuserv || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gnuserv/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gnuserv"; \ + libsrcdir="$$s/gnuserv";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gnuserv"; \ + libsrcdir="$$s/gnuserv";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gnuserv"; \ - libsrcdir="$$s/gnuserv"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif gnuserv - - - - .PHONY: all-gnuserv maybe-all-gnuserv maybe-all-gnuserv: @if gnuserv -TARGET-gnuserv=all maybe-all-gnuserv: all-gnuserv all-gnuserv: configure-gnuserv - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gnuserv && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gnuserv)) + (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) all) @endif gnuserv - - - .PHONY: check-gnuserv maybe-check-gnuserv maybe-check-gnuserv: @if gnuserv maybe-check-gnuserv: check-gnuserv check-gnuserv: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gnuserv && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) check) @endif gnuserv @@ -12407,12 +9536,11 @@ maybe-install-gnuserv: maybe-install-gnuserv: install-gnuserv install-gnuserv: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gnuserv && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) install) @endif gnuserv @@ -12425,16 +9553,16 @@ maybe-info-gnuserv: info-gnuserv info-gnuserv: \ configure-gnuserv - @: $(MAKE); $(unstage) @[ -f ./gnuserv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in gnuserv" ; \ - (cd $(HOST_SUBDIR)/gnuserv && \ + (cd gnuserv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12451,16 +9579,16 @@ maybe-dvi-gnuserv: dvi-gnuserv dvi-gnuserv: \ configure-gnuserv - @: $(MAKE); $(unstage) @[ -f ./gnuserv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in gnuserv" ; \ - (cd $(HOST_SUBDIR)/gnuserv && \ + (cd gnuserv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12470,32 +9598,6 @@ dvi-gnuserv: \ @endif gnuserv -.PHONY: maybe-html-gnuserv html-gnuserv -maybe-html-gnuserv: -@if gnuserv -maybe-html-gnuserv: html-gnuserv - -html-gnuserv: \ - configure-gnuserv - @: $(MAKE); $(unstage) - @[ -f ./gnuserv/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in gnuserv" ; \ - (cd $(HOST_SUBDIR)/gnuserv && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif gnuserv - .PHONY: maybe-TAGS-gnuserv TAGS-gnuserv maybe-TAGS-gnuserv: @if gnuserv @@ -12503,16 +9605,16 @@ maybe-TAGS-gnuserv: TAGS-gnuserv TAGS-gnuserv: \ configure-gnuserv - @: $(MAKE); $(unstage) @[ -f ./gnuserv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in gnuserv" ; \ - (cd $(HOST_SUBDIR)/gnuserv && \ + (cd gnuserv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12530,16 +9632,16 @@ maybe-install-info-gnuserv: install-info-gnuserv install-info-gnuserv: \ configure-gnuserv \ info-gnuserv - @: $(MAKE); $(unstage) @[ -f ./gnuserv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in gnuserv" ; \ - (cd $(HOST_SUBDIR)/gnuserv && \ + (cd gnuserv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12556,16 +9658,16 @@ maybe-installcheck-gnuserv: installcheck-gnuserv installcheck-gnuserv: \ configure-gnuserv - @: $(MAKE); $(unstage) @[ -f ./gnuserv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in gnuserv" ; \ - (cd $(HOST_SUBDIR)/gnuserv && \ + (cd gnuserv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12581,16 +9683,16 @@ maybe-mostlyclean-gnuserv: maybe-mostlyclean-gnuserv: mostlyclean-gnuserv mostlyclean-gnuserv: - @: $(MAKE); $(unstage) @[ -f ./gnuserv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in gnuserv" ; \ - (cd $(HOST_SUBDIR)/gnuserv && \ + (cd gnuserv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12606,16 +9708,16 @@ maybe-clean-gnuserv: maybe-clean-gnuserv: clean-gnuserv clean-gnuserv: - @: $(MAKE); $(unstage) @[ -f ./gnuserv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in gnuserv" ; \ - (cd $(HOST_SUBDIR)/gnuserv && \ + (cd gnuserv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12631,16 +9733,16 @@ maybe-distclean-gnuserv: maybe-distclean-gnuserv: distclean-gnuserv distclean-gnuserv: - @: $(MAKE); $(unstage) @[ -f ./gnuserv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in gnuserv" ; \ - (cd $(HOST_SUBDIR)/gnuserv && \ + (cd gnuserv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12656,16 +9758,16 @@ maybe-maintainer-clean-gnuserv: maybe-maintainer-clean-gnuserv: maintainer-clean-gnuserv maintainer-clean-gnuserv: - @: $(MAKE); $(unstage) @[ -f ./gnuserv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in gnuserv" ; \ - (cd $(HOST_SUBDIR)/gnuserv && \ + (cd gnuserv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12676,65 +9778,57 @@ maintainer-clean-gnuserv: @endif gnuserv - .PHONY: configure-gprof maybe-configure-gprof maybe-configure-gprof: @if gprof maybe-configure-gprof: configure-gprof -configure-gprof: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-gprof: + @test ! -f gprof/Makefile || exit 0; \ + [ -d gprof ] || mkdir gprof; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/gprof; \ - cd "$(HOST_SUBDIR)/gprof" || exit 1; \ + echo Configuring in gprof; \ + cd gprof || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gprof/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gprof"; \ + libsrcdir="$$s/gprof";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gprof"; \ + libsrcdir="$$s/gprof";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gprof"; \ - libsrcdir="$$s/gprof"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif gprof - - - - .PHONY: all-gprof maybe-all-gprof maybe-all-gprof: @if gprof -TARGET-gprof=all maybe-all-gprof: all-gprof all-gprof: configure-gprof - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gprof && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gprof)) + (cd gprof && $(MAKE) $(FLAGS_TO_PASS) all) @endif gprof - - - .PHONY: check-gprof maybe-check-gprof maybe-check-gprof: @if gprof maybe-check-gprof: check-gprof check-gprof: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gprof && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd gprof && $(MAKE) $(FLAGS_TO_PASS) check) @endif gprof @@ -12744,12 +9838,11 @@ maybe-install-gprof: maybe-install-gprof: install-gprof install-gprof: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gprof && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd gprof && $(MAKE) $(FLAGS_TO_PASS) install) @endif gprof @@ -12762,16 +9855,16 @@ maybe-info-gprof: info-gprof info-gprof: \ configure-gprof - @: $(MAKE); $(unstage) @[ -f ./gprof/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in gprof" ; \ - (cd $(HOST_SUBDIR)/gprof && \ + (cd gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12788,16 +9881,16 @@ maybe-dvi-gprof: dvi-gprof dvi-gprof: \ configure-gprof - @: $(MAKE); $(unstage) @[ -f ./gprof/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in gprof" ; \ - (cd $(HOST_SUBDIR)/gprof && \ + (cd gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12807,32 +9900,6 @@ dvi-gprof: \ @endif gprof -.PHONY: maybe-html-gprof html-gprof -maybe-html-gprof: -@if gprof -maybe-html-gprof: html-gprof - -html-gprof: \ - configure-gprof - @: $(MAKE); $(unstage) - @[ -f ./gprof/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in gprof" ; \ - (cd $(HOST_SUBDIR)/gprof && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif gprof - .PHONY: maybe-TAGS-gprof TAGS-gprof maybe-TAGS-gprof: @if gprof @@ -12840,16 +9907,16 @@ maybe-TAGS-gprof: TAGS-gprof TAGS-gprof: \ configure-gprof - @: $(MAKE); $(unstage) @[ -f ./gprof/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in gprof" ; \ - (cd $(HOST_SUBDIR)/gprof && \ + (cd gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12867,16 +9934,16 @@ maybe-install-info-gprof: install-info-gprof install-info-gprof: \ configure-gprof \ info-gprof - @: $(MAKE); $(unstage) @[ -f ./gprof/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in gprof" ; \ - (cd $(HOST_SUBDIR)/gprof && \ + (cd gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12893,16 +9960,16 @@ maybe-installcheck-gprof: installcheck-gprof installcheck-gprof: \ configure-gprof - @: $(MAKE); $(unstage) @[ -f ./gprof/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in gprof" ; \ - (cd $(HOST_SUBDIR)/gprof && \ + (cd gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12918,16 +9985,16 @@ maybe-mostlyclean-gprof: maybe-mostlyclean-gprof: mostlyclean-gprof mostlyclean-gprof: - @: $(MAKE); $(unstage) @[ -f ./gprof/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in gprof" ; \ - (cd $(HOST_SUBDIR)/gprof && \ + (cd gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12943,16 +10010,16 @@ maybe-clean-gprof: maybe-clean-gprof: clean-gprof clean-gprof: - @: $(MAKE); $(unstage) @[ -f ./gprof/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in gprof" ; \ - (cd $(HOST_SUBDIR)/gprof && \ + (cd gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12968,16 +10035,16 @@ maybe-distclean-gprof: maybe-distclean-gprof: distclean-gprof distclean-gprof: - @: $(MAKE); $(unstage) @[ -f ./gprof/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in gprof" ; \ - (cd $(HOST_SUBDIR)/gprof && \ + (cd gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12993,16 +10060,16 @@ maybe-maintainer-clean-gprof: maybe-maintainer-clean-gprof: maintainer-clean-gprof maintainer-clean-gprof: - @: $(MAKE); $(unstage) @[ -f ./gprof/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in gprof" ; \ - (cd $(HOST_SUBDIR)/gprof && \ + (cd gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13013,65 +10080,57 @@ maintainer-clean-gprof: @endif gprof - .PHONY: configure-gzip maybe-configure-gzip maybe-configure-gzip: @if gzip maybe-configure-gzip: configure-gzip -configure-gzip: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-gzip: + @test ! -f gzip/Makefile || exit 0; \ + [ -d gzip ] || mkdir gzip; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gzip/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gzip ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/gzip; \ - cd "$(HOST_SUBDIR)/gzip" || exit 1; \ + echo Configuring in gzip; \ + cd gzip || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gzip/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gzip"; \ + libsrcdir="$$s/gzip";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gzip"; \ + libsrcdir="$$s/gzip";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gzip"; \ - libsrcdir="$$s/gzip"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif gzip - - - - .PHONY: all-gzip maybe-all-gzip maybe-all-gzip: @if gzip -TARGET-gzip=all maybe-all-gzip: all-gzip all-gzip: configure-gzip - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gzip && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gzip)) + (cd gzip && $(MAKE) $(FLAGS_TO_PASS) all) @endif gzip - - - .PHONY: check-gzip maybe-check-gzip maybe-check-gzip: @if gzip maybe-check-gzip: check-gzip check-gzip: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gzip && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd gzip && $(MAKE) $(FLAGS_TO_PASS) check) @endif gzip @@ -13081,12 +10140,11 @@ maybe-install-gzip: maybe-install-gzip: install-gzip install-gzip: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gzip && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd gzip && $(MAKE) $(FLAGS_TO_PASS) install) @endif gzip @@ -13099,16 +10157,16 @@ maybe-info-gzip: info-gzip info-gzip: \ configure-gzip - @: $(MAKE); $(unstage) @[ -f ./gzip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in gzip" ; \ - (cd $(HOST_SUBDIR)/gzip && \ + (cd gzip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13125,16 +10183,16 @@ maybe-dvi-gzip: dvi-gzip dvi-gzip: \ configure-gzip - @: $(MAKE); $(unstage) @[ -f ./gzip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in gzip" ; \ - (cd $(HOST_SUBDIR)/gzip && \ + (cd gzip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13144,32 +10202,6 @@ dvi-gzip: \ @endif gzip -.PHONY: maybe-html-gzip html-gzip -maybe-html-gzip: -@if gzip -maybe-html-gzip: html-gzip - -html-gzip: \ - configure-gzip - @: $(MAKE); $(unstage) - @[ -f ./gzip/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in gzip" ; \ - (cd $(HOST_SUBDIR)/gzip && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif gzip - .PHONY: maybe-TAGS-gzip TAGS-gzip maybe-TAGS-gzip: @if gzip @@ -13177,16 +10209,16 @@ maybe-TAGS-gzip: TAGS-gzip TAGS-gzip: \ configure-gzip - @: $(MAKE); $(unstage) @[ -f ./gzip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in gzip" ; \ - (cd $(HOST_SUBDIR)/gzip && \ + (cd gzip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13204,16 +10236,16 @@ maybe-install-info-gzip: install-info-gzip install-info-gzip: \ configure-gzip \ info-gzip - @: $(MAKE); $(unstage) @[ -f ./gzip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in gzip" ; \ - (cd $(HOST_SUBDIR)/gzip && \ + (cd gzip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13230,16 +10262,16 @@ maybe-installcheck-gzip: installcheck-gzip installcheck-gzip: \ configure-gzip - @: $(MAKE); $(unstage) @[ -f ./gzip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in gzip" ; \ - (cd $(HOST_SUBDIR)/gzip && \ + (cd gzip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13255,16 +10287,16 @@ maybe-mostlyclean-gzip: maybe-mostlyclean-gzip: mostlyclean-gzip mostlyclean-gzip: - @: $(MAKE); $(unstage) @[ -f ./gzip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in gzip" ; \ - (cd $(HOST_SUBDIR)/gzip && \ + (cd gzip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13280,16 +10312,16 @@ maybe-clean-gzip: maybe-clean-gzip: clean-gzip clean-gzip: - @: $(MAKE); $(unstage) @[ -f ./gzip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in gzip" ; \ - (cd $(HOST_SUBDIR)/gzip && \ + (cd gzip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13305,16 +10337,16 @@ maybe-distclean-gzip: maybe-distclean-gzip: distclean-gzip distclean-gzip: - @: $(MAKE); $(unstage) @[ -f ./gzip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in gzip" ; \ - (cd $(HOST_SUBDIR)/gzip && \ + (cd gzip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13330,16 +10362,16 @@ maybe-maintainer-clean-gzip: maybe-maintainer-clean-gzip: maintainer-clean-gzip maintainer-clean-gzip: - @: $(MAKE); $(unstage) @[ -f ./gzip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in gzip" ; \ - (cd $(HOST_SUBDIR)/gzip && \ + (cd gzip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13350,65 +10382,57 @@ maintainer-clean-gzip: @endif gzip - .PHONY: configure-hello maybe-configure-hello maybe-configure-hello: @if hello maybe-configure-hello: configure-hello -configure-hello: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-hello: + @test ! -f hello/Makefile || exit 0; \ + [ -d hello ] || mkdir hello; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/hello/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/hello ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/hello; \ - cd "$(HOST_SUBDIR)/hello" || exit 1; \ + echo Configuring in hello; \ + cd hello || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/hello/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/hello"; \ + libsrcdir="$$s/hello";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/hello"; \ + libsrcdir="$$s/hello";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/hello"; \ - libsrcdir="$$s/hello"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif hello - - - - .PHONY: all-hello maybe-all-hello maybe-all-hello: @if hello -TARGET-hello=all maybe-all-hello: all-hello all-hello: configure-hello - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/hello && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-hello)) + (cd hello && $(MAKE) $(FLAGS_TO_PASS) all) @endif hello - - - .PHONY: check-hello maybe-check-hello maybe-check-hello: @if hello maybe-check-hello: check-hello check-hello: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/hello && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd hello && $(MAKE) $(FLAGS_TO_PASS) check) @endif hello @@ -13418,12 +10442,11 @@ maybe-install-hello: maybe-install-hello: install-hello install-hello: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/hello && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd hello && $(MAKE) $(FLAGS_TO_PASS) install) @endif hello @@ -13436,16 +10459,16 @@ maybe-info-hello: info-hello info-hello: \ configure-hello - @: $(MAKE); $(unstage) @[ -f ./hello/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in hello" ; \ - (cd $(HOST_SUBDIR)/hello && \ + (cd hello && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13462,16 +10485,16 @@ maybe-dvi-hello: dvi-hello dvi-hello: \ configure-hello - @: $(MAKE); $(unstage) @[ -f ./hello/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in hello" ; \ - (cd $(HOST_SUBDIR)/hello && \ + (cd hello && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13481,32 +10504,6 @@ dvi-hello: \ @endif hello -.PHONY: maybe-html-hello html-hello -maybe-html-hello: -@if hello -maybe-html-hello: html-hello - -html-hello: \ - configure-hello - @: $(MAKE); $(unstage) - @[ -f ./hello/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in hello" ; \ - (cd $(HOST_SUBDIR)/hello && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif hello - .PHONY: maybe-TAGS-hello TAGS-hello maybe-TAGS-hello: @if hello @@ -13514,16 +10511,16 @@ maybe-TAGS-hello: TAGS-hello TAGS-hello: \ configure-hello - @: $(MAKE); $(unstage) @[ -f ./hello/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in hello" ; \ - (cd $(HOST_SUBDIR)/hello && \ + (cd hello && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13541,16 +10538,16 @@ maybe-install-info-hello: install-info-hello install-info-hello: \ configure-hello \ info-hello - @: $(MAKE); $(unstage) @[ -f ./hello/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in hello" ; \ - (cd $(HOST_SUBDIR)/hello && \ + (cd hello && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13567,16 +10564,16 @@ maybe-installcheck-hello: installcheck-hello installcheck-hello: \ configure-hello - @: $(MAKE); $(unstage) @[ -f ./hello/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in hello" ; \ - (cd $(HOST_SUBDIR)/hello && \ + (cd hello && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13592,16 +10589,16 @@ maybe-mostlyclean-hello: maybe-mostlyclean-hello: mostlyclean-hello mostlyclean-hello: - @: $(MAKE); $(unstage) @[ -f ./hello/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in hello" ; \ - (cd $(HOST_SUBDIR)/hello && \ + (cd hello && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13617,16 +10614,16 @@ maybe-clean-hello: maybe-clean-hello: clean-hello clean-hello: - @: $(MAKE); $(unstage) @[ -f ./hello/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in hello" ; \ - (cd $(HOST_SUBDIR)/hello && \ + (cd hello && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13642,16 +10639,16 @@ maybe-distclean-hello: maybe-distclean-hello: distclean-hello distclean-hello: - @: $(MAKE); $(unstage) @[ -f ./hello/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in hello" ; \ - (cd $(HOST_SUBDIR)/hello && \ + (cd hello && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13667,16 +10664,16 @@ maybe-maintainer-clean-hello: maybe-maintainer-clean-hello: maintainer-clean-hello maintainer-clean-hello: - @: $(MAKE); $(unstage) @[ -f ./hello/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in hello" ; \ - (cd $(HOST_SUBDIR)/hello && \ + (cd hello && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13687,65 +10684,57 @@ maintainer-clean-hello: @endif hello - .PHONY: configure-indent maybe-configure-indent maybe-configure-indent: @if indent maybe-configure-indent: configure-indent -configure-indent: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-indent: + @test ! -f indent/Makefile || exit 0; \ + [ -d indent ] || mkdir indent; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/indent/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/indent ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/indent; \ - cd "$(HOST_SUBDIR)/indent" || exit 1; \ + echo Configuring in indent; \ + cd indent || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/indent/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/indent"; \ + libsrcdir="$$s/indent";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/indent"; \ + libsrcdir="$$s/indent";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/indent"; \ - libsrcdir="$$s/indent"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif indent - - - - .PHONY: all-indent maybe-all-indent maybe-all-indent: @if indent -TARGET-indent=all maybe-all-indent: all-indent all-indent: configure-indent - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/indent && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-indent)) + (cd indent && $(MAKE) $(FLAGS_TO_PASS) all) @endif indent - - - .PHONY: check-indent maybe-check-indent maybe-check-indent: @if indent maybe-check-indent: check-indent check-indent: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/indent && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd indent && $(MAKE) $(FLAGS_TO_PASS) check) @endif indent @@ -13755,12 +10744,11 @@ maybe-install-indent: maybe-install-indent: install-indent install-indent: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/indent && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd indent && $(MAKE) $(FLAGS_TO_PASS) install) @endif indent @@ -13773,16 +10761,16 @@ maybe-info-indent: info-indent info-indent: \ configure-indent - @: $(MAKE); $(unstage) @[ -f ./indent/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in indent" ; \ - (cd $(HOST_SUBDIR)/indent && \ + (cd indent && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13799,16 +10787,16 @@ maybe-dvi-indent: dvi-indent dvi-indent: \ configure-indent - @: $(MAKE); $(unstage) @[ -f ./indent/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in indent" ; \ - (cd $(HOST_SUBDIR)/indent && \ + (cd indent && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13818,32 +10806,6 @@ dvi-indent: \ @endif indent -.PHONY: maybe-html-indent html-indent -maybe-html-indent: -@if indent -maybe-html-indent: html-indent - -html-indent: \ - configure-indent - @: $(MAKE); $(unstage) - @[ -f ./indent/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in indent" ; \ - (cd $(HOST_SUBDIR)/indent && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif indent - .PHONY: maybe-TAGS-indent TAGS-indent maybe-TAGS-indent: @if indent @@ -13851,16 +10813,16 @@ maybe-TAGS-indent: TAGS-indent TAGS-indent: \ configure-indent - @: $(MAKE); $(unstage) @[ -f ./indent/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in indent" ; \ - (cd $(HOST_SUBDIR)/indent && \ + (cd indent && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13878,16 +10840,16 @@ maybe-install-info-indent: install-info-indent install-info-indent: \ configure-indent \ info-indent - @: $(MAKE); $(unstage) @[ -f ./indent/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in indent" ; \ - (cd $(HOST_SUBDIR)/indent && \ + (cd indent && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13904,16 +10866,16 @@ maybe-installcheck-indent: installcheck-indent installcheck-indent: \ configure-indent - @: $(MAKE); $(unstage) @[ -f ./indent/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in indent" ; \ - (cd $(HOST_SUBDIR)/indent && \ + (cd indent && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13929,16 +10891,16 @@ maybe-mostlyclean-indent: maybe-mostlyclean-indent: mostlyclean-indent mostlyclean-indent: - @: $(MAKE); $(unstage) @[ -f ./indent/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in indent" ; \ - (cd $(HOST_SUBDIR)/indent && \ + (cd indent && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13954,16 +10916,16 @@ maybe-clean-indent: maybe-clean-indent: clean-indent clean-indent: - @: $(MAKE); $(unstage) @[ -f ./indent/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in indent" ; \ - (cd $(HOST_SUBDIR)/indent && \ + (cd indent && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13979,16 +10941,16 @@ maybe-distclean-indent: maybe-distclean-indent: distclean-indent distclean-indent: - @: $(MAKE); $(unstage) @[ -f ./indent/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in indent" ; \ - (cd $(HOST_SUBDIR)/indent && \ + (cd indent && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14004,16 +10966,16 @@ maybe-maintainer-clean-indent: maybe-maintainer-clean-indent: maintainer-clean-indent maintainer-clean-indent: - @: $(MAKE); $(unstage) @[ -f ./indent/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in indent" ; \ - (cd $(HOST_SUBDIR)/indent && \ + (cd indent && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14024,422 +10986,59 @@ maintainer-clean-indent: @endif indent - .PHONY: configure-intl maybe-configure-intl maybe-configure-intl: @if intl maybe-configure-intl: configure-intl -configure-intl: -@endif intl -@if intl-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif intl-bootstrap -@if intl - @r=`${PWD_COMMAND}`; export r; \ +configure-intl: + @test -f stage_last && exit 0; \ + test ! -f intl/Makefile || exit 0; \ + [ -d intl ] || mkdir intl; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/intl; \ - cd "$(HOST_SUBDIR)/intl" || exit 1; \ + echo Configuring in intl; \ + cd intl || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/intl"; \ + libsrcdir="$$s/intl";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/intl"; \ + libsrcdir="$$s/intl";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/intl"; \ - libsrcdir="$$s/intl"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif intl - - -.PHONY: configure-stage1-intl maybe-configure-stage1-intl -maybe-configure-stage1-intl: -@if intl-bootstrap -maybe-configure-stage1-intl: configure-stage1-intl -configure-stage1-intl: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ - cd $(HOST_SUBDIR)/intl || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/intl"; \ - libsrcdir="$$s/intl"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" -@endif intl-bootstrap - -.PHONY: configure-stage2-intl maybe-configure-stage2-intl -maybe-configure-stage2-intl: -@if intl-bootstrap -maybe-configure-stage2-intl: configure-stage2-intl -configure-stage2-intl: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 2 in $(HOST_SUBDIR)/intl ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ - cd $(HOST_SUBDIR)/intl || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/intl"; \ - libsrcdir="$$s/intl"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif intl-bootstrap - -.PHONY: configure-stage3-intl maybe-configure-stage3-intl -maybe-configure-stage3-intl: -@if intl-bootstrap -maybe-configure-stage3-intl: configure-stage3-intl -configure-stage3-intl: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 3 in $(HOST_SUBDIR)/intl ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ - cd $(HOST_SUBDIR)/intl || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/intl"; \ - libsrcdir="$$s/intl"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif intl-bootstrap - -.PHONY: configure-stage4-intl maybe-configure-stage4-intl -maybe-configure-stage4-intl: -@if intl-bootstrap -maybe-configure-stage4-intl: configure-stage4-intl -configure-stage4-intl: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 4 in $(HOST_SUBDIR)/intl ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ - cd $(HOST_SUBDIR)/intl || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/intl"; \ - libsrcdir="$$s/intl"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif intl-bootstrap - -.PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl -maybe-configure-stageprofile-intl: -@if intl-bootstrap -maybe-configure-stageprofile-intl: configure-stageprofile-intl -configure-stageprofile-intl: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage profile in $(HOST_SUBDIR)/intl ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ - cd $(HOST_SUBDIR)/intl || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/intl"; \ - libsrcdir="$$s/intl"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif intl-bootstrap - -.PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl -maybe-configure-stagefeedback-intl: -@if intl-bootstrap -maybe-configure-stagefeedback-intl: configure-stagefeedback-intl -configure-stagefeedback-intl: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage feedback in $(HOST_SUBDIR)/intl ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ - cd $(HOST_SUBDIR)/intl || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/intl"; \ - libsrcdir="$$s/intl"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif intl-bootstrap - - - - - .PHONY: all-intl maybe-all-intl maybe-all-intl: @if intl -TARGET-intl=all maybe-all-intl: all-intl all-intl: configure-intl -@endif intl -@if intl-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif intl-bootstrap -@if intl - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-intl)) + (cd intl && $(MAKE) $(FLAGS_TO_PASS) all) @endif intl - - -.PHONY: all-stage1-intl maybe-all-stage1-intl -.PHONY: clean-stage1-intl maybe-clean-stage1-intl -maybe-all-stage1-intl: -maybe-clean-stage1-intl: -@if intl-bootstrap -maybe-all-stage1-intl: all-stage1-intl -all-stage1: all-stage1-intl -TARGET-stage1-intl = $(TARGET-intl) -all-stage1-intl: configure-stage1-intl - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ - $(TARGET-stage1-intl) - -maybe-clean-stage1-intl: clean-stage1-intl -clean-stage1: clean-stage1-intl -clean-stage1-intl: - @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-intl/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ - cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" clean -@endif intl-bootstrap - - -.PHONY: all-stage2-intl maybe-all-stage2-intl -.PHONY: clean-stage2-intl maybe-clean-stage2-intl -maybe-all-stage2-intl: -maybe-clean-stage2-intl: -@if intl-bootstrap -maybe-all-stage2-intl: all-stage2-intl -all-stage2: all-stage2-intl -TARGET-stage2-intl = $(TARGET-intl) -all-stage2-intl: configure-stage2-intl - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage2-intl) - -maybe-clean-stage2-intl: clean-stage2-intl -clean-stage2: clean-stage2-intl -clean-stage2-intl: - @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-intl/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ - cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif intl-bootstrap - - -.PHONY: all-stage3-intl maybe-all-stage3-intl -.PHONY: clean-stage3-intl maybe-clean-stage3-intl -maybe-all-stage3-intl: -maybe-clean-stage3-intl: -@if intl-bootstrap -maybe-all-stage3-intl: all-stage3-intl -all-stage3: all-stage3-intl -TARGET-stage3-intl = $(TARGET-intl) -all-stage3-intl: configure-stage3-intl - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage3-intl) - -maybe-clean-stage3-intl: clean-stage3-intl -clean-stage3: clean-stage3-intl -clean-stage3-intl: - @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-intl/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ - cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif intl-bootstrap - - -.PHONY: all-stage4-intl maybe-all-stage4-intl -.PHONY: clean-stage4-intl maybe-clean-stage4-intl -maybe-all-stage4-intl: -maybe-clean-stage4-intl: -@if intl-bootstrap -maybe-all-stage4-intl: all-stage4-intl -all-stage4: all-stage4-intl -TARGET-stage4-intl = $(TARGET-intl) -all-stage4-intl: configure-stage4-intl - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage4-intl) - -maybe-clean-stage4-intl: clean-stage4-intl -clean-stage4: clean-stage4-intl -clean-stage4-intl: - @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-intl/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ - cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif intl-bootstrap - - -.PHONY: all-stageprofile-intl maybe-all-stageprofile-intl -.PHONY: clean-stageprofile-intl maybe-clean-stageprofile-intl -maybe-all-stageprofile-intl: -maybe-clean-stageprofile-intl: -@if intl-bootstrap -maybe-all-stageprofile-intl: all-stageprofile-intl -all-stageprofile: all-stageprofile-intl -TARGET-stageprofile-intl = $(TARGET-intl) -all-stageprofile-intl: configure-stageprofile-intl - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" \ - $(TARGET-stageprofile-intl) - -maybe-clean-stageprofile-intl: clean-stageprofile-intl -clean-stageprofile: clean-stageprofile-intl -clean-stageprofile-intl: - @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-intl/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ - cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean -@endif intl-bootstrap - - -.PHONY: all-stagefeedback-intl maybe-all-stagefeedback-intl -.PHONY: clean-stagefeedback-intl maybe-clean-stagefeedback-intl -maybe-all-stagefeedback-intl: -maybe-clean-stagefeedback-intl: -@if intl-bootstrap -maybe-all-stagefeedback-intl: all-stagefeedback-intl -all-stagefeedback: all-stagefeedback-intl -TARGET-stagefeedback-intl = $(TARGET-intl) -all-stagefeedback-intl: configure-stagefeedback-intl - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" \ - $(TARGET-stagefeedback-intl) - -maybe-clean-stagefeedback-intl: clean-stagefeedback-intl -clean-stagefeedback: clean-stagefeedback-intl -clean-stagefeedback-intl: - @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-intl/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ - cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean -@endif intl-bootstrap - - - - - .PHONY: check-intl maybe-check-intl maybe-check-intl: @if intl maybe-check-intl: check-intl check-intl: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd intl && $(MAKE) $(FLAGS_TO_PASS) check) @endif intl @@ -14449,12 +11048,11 @@ maybe-install-intl: maybe-install-intl: install-intl install-intl: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd intl && $(MAKE) $(FLAGS_TO_PASS) install) @endif intl @@ -14470,12 +11068,13 @@ info-intl: \ @[ -f ./intl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in intl" ; \ - (cd $(HOST_SUBDIR)/intl && \ + (cd intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14495,12 +11094,13 @@ dvi-intl: \ @[ -f ./intl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in intl" ; \ - (cd $(HOST_SUBDIR)/intl && \ + (cd intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14510,31 +11110,6 @@ dvi-intl: \ @endif intl -.PHONY: maybe-html-intl html-intl -maybe-html-intl: -@if intl -maybe-html-intl: html-intl - -html-intl: \ - configure-intl - @[ -f ./intl/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in intl" ; \ - (cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif intl - .PHONY: maybe-TAGS-intl TAGS-intl maybe-TAGS-intl: @if intl @@ -14545,12 +11120,13 @@ TAGS-intl: \ @[ -f ./intl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in intl" ; \ - (cd $(HOST_SUBDIR)/intl && \ + (cd intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14571,12 +11147,13 @@ install-info-intl: \ @[ -f ./intl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in intl" ; \ - (cd $(HOST_SUBDIR)/intl && \ + (cd intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14596,12 +11173,13 @@ installcheck-intl: \ @[ -f ./intl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in intl" ; \ - (cd $(HOST_SUBDIR)/intl && \ + (cd intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14620,12 +11198,13 @@ mostlyclean-intl: @[ -f ./intl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in intl" ; \ - (cd $(HOST_SUBDIR)/intl && \ + (cd intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14644,12 +11223,13 @@ clean-intl: @[ -f ./intl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in intl" ; \ - (cd $(HOST_SUBDIR)/intl && \ + (cd intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14668,12 +11248,13 @@ distclean-intl: @[ -f ./intl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in intl" ; \ - (cd $(HOST_SUBDIR)/intl && \ + (cd intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14692,12 +11273,13 @@ maintainer-clean-intl: @[ -f ./intl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in intl" ; \ - (cd $(HOST_SUBDIR)/intl && \ + (cd intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14708,65 +11290,57 @@ maintainer-clean-intl: @endif intl - .PHONY: configure-tcl maybe-configure-tcl maybe-configure-tcl: @if tcl maybe-configure-tcl: configure-tcl -configure-tcl: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-tcl: + @test ! -f tcl/Makefile || exit 0; \ + [ -d tcl ] || mkdir tcl; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/tcl/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tcl ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/tcl; \ - cd "$(HOST_SUBDIR)/tcl" || exit 1; \ + echo Configuring in tcl; \ + cd tcl || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/tcl/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/tcl"; \ + libsrcdir="$$s/tcl";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/tcl"; \ + libsrcdir="$$s/tcl";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/tcl"; \ - libsrcdir="$$s/tcl"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif tcl - - - - .PHONY: all-tcl maybe-all-tcl maybe-all-tcl: @if tcl -TARGET-tcl=all maybe-all-tcl: all-tcl all-tcl: configure-tcl - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/tcl && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-tcl)) + (cd tcl && $(MAKE) $(FLAGS_TO_PASS) all) @endif tcl - - - .PHONY: check-tcl maybe-check-tcl maybe-check-tcl: @if tcl maybe-check-tcl: check-tcl check-tcl: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/tcl && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd tcl && $(MAKE) $(FLAGS_TO_PASS) check) @endif tcl @@ -14776,12 +11350,11 @@ maybe-install-tcl: maybe-install-tcl: install-tcl install-tcl: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/tcl && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd tcl && $(MAKE) $(FLAGS_TO_PASS) install) @endif tcl @@ -14794,16 +11367,16 @@ maybe-info-tcl: info-tcl info-tcl: \ configure-tcl - @: $(MAKE); $(unstage) @[ -f ./tcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in tcl" ; \ - (cd $(HOST_SUBDIR)/tcl && \ + (cd tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14820,16 +11393,16 @@ maybe-dvi-tcl: dvi-tcl dvi-tcl: \ configure-tcl - @: $(MAKE); $(unstage) @[ -f ./tcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in tcl" ; \ - (cd $(HOST_SUBDIR)/tcl && \ + (cd tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14839,32 +11412,6 @@ dvi-tcl: \ @endif tcl -.PHONY: maybe-html-tcl html-tcl -maybe-html-tcl: -@if tcl -maybe-html-tcl: html-tcl - -html-tcl: \ - configure-tcl - @: $(MAKE); $(unstage) - @[ -f ./tcl/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in tcl" ; \ - (cd $(HOST_SUBDIR)/tcl && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif tcl - .PHONY: maybe-TAGS-tcl TAGS-tcl maybe-TAGS-tcl: @if tcl @@ -14872,16 +11419,16 @@ maybe-TAGS-tcl: TAGS-tcl TAGS-tcl: \ configure-tcl - @: $(MAKE); $(unstage) @[ -f ./tcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in tcl" ; \ - (cd $(HOST_SUBDIR)/tcl && \ + (cd tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14899,16 +11446,16 @@ maybe-install-info-tcl: install-info-tcl install-info-tcl: \ configure-tcl \ info-tcl - @: $(MAKE); $(unstage) @[ -f ./tcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in tcl" ; \ - (cd $(HOST_SUBDIR)/tcl && \ + (cd tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14925,16 +11472,16 @@ maybe-installcheck-tcl: installcheck-tcl installcheck-tcl: \ configure-tcl - @: $(MAKE); $(unstage) @[ -f ./tcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in tcl" ; \ - (cd $(HOST_SUBDIR)/tcl && \ + (cd tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14960,16 +11507,16 @@ maybe-clean-tcl: maybe-clean-tcl: clean-tcl clean-tcl: - @: $(MAKE); $(unstage) @[ -f ./tcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in tcl" ; \ - (cd $(HOST_SUBDIR)/tcl && \ + (cd tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14985,16 +11532,16 @@ maybe-distclean-tcl: maybe-distclean-tcl: distclean-tcl distclean-tcl: - @: $(MAKE); $(unstage) @[ -f ./tcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in tcl" ; \ - (cd $(HOST_SUBDIR)/tcl && \ + (cd tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15010,16 +11557,16 @@ maybe-maintainer-clean-tcl: maybe-maintainer-clean-tcl: maintainer-clean-tcl maintainer-clean-tcl: - @: $(MAKE); $(unstage) @[ -f ./tcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in tcl" ; \ - (cd $(HOST_SUBDIR)/tcl && \ + (cd tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15030,65 +11577,57 @@ maintainer-clean-tcl: @endif tcl - .PHONY: configure-itcl maybe-configure-itcl maybe-configure-itcl: @if itcl maybe-configure-itcl: configure-itcl -configure-itcl: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-itcl: + @test ! -f itcl/Makefile || exit 0; \ + [ -d itcl ] || mkdir itcl; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/itcl/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/itcl ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/itcl; \ - cd "$(HOST_SUBDIR)/itcl" || exit 1; \ + echo Configuring in itcl; \ + cd itcl || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/itcl/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/itcl"; \ + libsrcdir="$$s/itcl";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/itcl"; \ + libsrcdir="$$s/itcl";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/itcl"; \ - libsrcdir="$$s/itcl"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif itcl - - - - .PHONY: all-itcl maybe-all-itcl maybe-all-itcl: @if itcl -TARGET-itcl=all maybe-all-itcl: all-itcl all-itcl: configure-itcl - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/itcl && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-itcl)) + (cd itcl && $(MAKE) $(FLAGS_TO_PASS) all) @endif itcl - - - .PHONY: check-itcl maybe-check-itcl maybe-check-itcl: @if itcl maybe-check-itcl: check-itcl check-itcl: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/itcl && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd itcl && $(MAKE) $(FLAGS_TO_PASS) check) @endif itcl @@ -15098,12 +11637,11 @@ maybe-install-itcl: maybe-install-itcl: install-itcl install-itcl: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/itcl && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd itcl && $(MAKE) $(FLAGS_TO_PASS) install) @endif itcl @@ -15116,16 +11654,16 @@ maybe-info-itcl: info-itcl info-itcl: \ configure-itcl - @: $(MAKE); $(unstage) @[ -f ./itcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in itcl" ; \ - (cd $(HOST_SUBDIR)/itcl && \ + (cd itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15142,16 +11680,16 @@ maybe-dvi-itcl: dvi-itcl dvi-itcl: \ configure-itcl - @: $(MAKE); $(unstage) @[ -f ./itcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in itcl" ; \ - (cd $(HOST_SUBDIR)/itcl && \ + (cd itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15161,32 +11699,6 @@ dvi-itcl: \ @endif itcl -.PHONY: maybe-html-itcl html-itcl -maybe-html-itcl: -@if itcl -maybe-html-itcl: html-itcl - -html-itcl: \ - configure-itcl - @: $(MAKE); $(unstage) - @[ -f ./itcl/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in itcl" ; \ - (cd $(HOST_SUBDIR)/itcl && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif itcl - .PHONY: maybe-TAGS-itcl TAGS-itcl maybe-TAGS-itcl: @if itcl @@ -15194,16 +11706,16 @@ maybe-TAGS-itcl: TAGS-itcl TAGS-itcl: \ configure-itcl - @: $(MAKE); $(unstage) @[ -f ./itcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in itcl" ; \ - (cd $(HOST_SUBDIR)/itcl && \ + (cd itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15221,16 +11733,16 @@ maybe-install-info-itcl: install-info-itcl install-info-itcl: \ configure-itcl \ info-itcl - @: $(MAKE); $(unstage) @[ -f ./itcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in itcl" ; \ - (cd $(HOST_SUBDIR)/itcl && \ + (cd itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15247,16 +11759,16 @@ maybe-installcheck-itcl: installcheck-itcl installcheck-itcl: \ configure-itcl - @: $(MAKE); $(unstage) @[ -f ./itcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in itcl" ; \ - (cd $(HOST_SUBDIR)/itcl && \ + (cd itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15272,16 +11784,16 @@ maybe-mostlyclean-itcl: maybe-mostlyclean-itcl: mostlyclean-itcl mostlyclean-itcl: - @: $(MAKE); $(unstage) @[ -f ./itcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in itcl" ; \ - (cd $(HOST_SUBDIR)/itcl && \ + (cd itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15297,16 +11809,16 @@ maybe-clean-itcl: maybe-clean-itcl: clean-itcl clean-itcl: - @: $(MAKE); $(unstage) @[ -f ./itcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in itcl" ; \ - (cd $(HOST_SUBDIR)/itcl && \ + (cd itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15322,16 +11834,16 @@ maybe-distclean-itcl: maybe-distclean-itcl: distclean-itcl distclean-itcl: - @: $(MAKE); $(unstage) @[ -f ./itcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in itcl" ; \ - (cd $(HOST_SUBDIR)/itcl && \ + (cd itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15347,16 +11859,16 @@ maybe-maintainer-clean-itcl: maybe-maintainer-clean-itcl: maintainer-clean-itcl maintainer-clean-itcl: - @: $(MAKE); $(unstage) @[ -f ./itcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in itcl" ; \ - (cd $(HOST_SUBDIR)/itcl && \ + (cd itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15367,422 +11879,59 @@ maintainer-clean-itcl: @endif itcl - .PHONY: configure-ld maybe-configure-ld maybe-configure-ld: @if ld maybe-configure-ld: configure-ld -configure-ld: -@endif ld -@if ld-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif ld-bootstrap -@if ld - @r=`${PWD_COMMAND}`; export r; \ +configure-ld: + @test -f stage_last && exit 0; \ + test ! -f ld/Makefile || exit 0; \ + [ -d ld ] || mkdir ld; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/ld; \ - cd "$(HOST_SUBDIR)/ld" || exit 1; \ + echo Configuring in ld; \ + cd ld || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/ld/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/ld"; \ + libsrcdir="$$s/ld";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/ld"; \ + libsrcdir="$$s/ld";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/ld"; \ - libsrcdir="$$s/ld"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif ld - - -.PHONY: configure-stage1-ld maybe-configure-stage1-ld -maybe-configure-stage1-ld: -@if ld-bootstrap -maybe-configure-stage1-ld: configure-stage1-ld -configure-stage1-ld: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - echo Configuring stage 1 in $(HOST_SUBDIR)/ld ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ - cd $(HOST_SUBDIR)/ld || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/ld/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/ld"; \ - libsrcdir="$$s/ld"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" -@endif ld-bootstrap - -.PHONY: configure-stage2-ld maybe-configure-stage2-ld -maybe-configure-stage2-ld: -@if ld-bootstrap -maybe-configure-stage2-ld: configure-stage2-ld -configure-stage2-ld: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 2 in $(HOST_SUBDIR)/ld ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ - cd $(HOST_SUBDIR)/ld || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/ld/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/ld"; \ - libsrcdir="$$s/ld"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif ld-bootstrap - -.PHONY: configure-stage3-ld maybe-configure-stage3-ld -maybe-configure-stage3-ld: -@if ld-bootstrap -maybe-configure-stage3-ld: configure-stage3-ld -configure-stage3-ld: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 3 in $(HOST_SUBDIR)/ld ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ - cd $(HOST_SUBDIR)/ld || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/ld/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/ld"; \ - libsrcdir="$$s/ld"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif ld-bootstrap - -.PHONY: configure-stage4-ld maybe-configure-stage4-ld -maybe-configure-stage4-ld: -@if ld-bootstrap -maybe-configure-stage4-ld: configure-stage4-ld -configure-stage4-ld: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 4 in $(HOST_SUBDIR)/ld ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ - cd $(HOST_SUBDIR)/ld || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/ld/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/ld"; \ - libsrcdir="$$s/ld"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif ld-bootstrap - -.PHONY: configure-stageprofile-ld maybe-configure-stageprofile-ld -maybe-configure-stageprofile-ld: -@if ld-bootstrap -maybe-configure-stageprofile-ld: configure-stageprofile-ld -configure-stageprofile-ld: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage profile in $(HOST_SUBDIR)/ld ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ - cd $(HOST_SUBDIR)/ld || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/ld/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/ld"; \ - libsrcdir="$$s/ld"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif ld-bootstrap - -.PHONY: configure-stagefeedback-ld maybe-configure-stagefeedback-ld -maybe-configure-stagefeedback-ld: -@if ld-bootstrap -maybe-configure-stagefeedback-ld: configure-stagefeedback-ld -configure-stagefeedback-ld: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage feedback in $(HOST_SUBDIR)/ld ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ - cd $(HOST_SUBDIR)/ld || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/ld/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/ld"; \ - libsrcdir="$$s/ld"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif ld-bootstrap - - - - - .PHONY: all-ld maybe-all-ld maybe-all-ld: @if ld -TARGET-ld=all maybe-all-ld: all-ld all-ld: configure-ld -@endif ld -@if ld-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif ld-bootstrap -@if ld - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-ld)) + (cd ld && $(MAKE) $(FLAGS_TO_PASS) all) @endif ld - - -.PHONY: all-stage1-ld maybe-all-stage1-ld -.PHONY: clean-stage1-ld maybe-clean-stage1-ld -maybe-all-stage1-ld: -maybe-clean-stage1-ld: -@if ld-bootstrap -maybe-all-stage1-ld: all-stage1-ld -all-stage1: all-stage1-ld -TARGET-stage1-ld = $(TARGET-ld) -all-stage1-ld: configure-stage1-ld - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ - $(TARGET-stage1-ld) - -maybe-clean-stage1-ld: clean-stage1-ld -clean-stage1: clean-stage1-ld -clean-stage1-ld: - @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-ld/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ - cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" clean -@endif ld-bootstrap - - -.PHONY: all-stage2-ld maybe-all-stage2-ld -.PHONY: clean-stage2-ld maybe-clean-stage2-ld -maybe-all-stage2-ld: -maybe-clean-stage2-ld: -@if ld-bootstrap -maybe-all-stage2-ld: all-stage2-ld -all-stage2: all-stage2-ld -TARGET-stage2-ld = $(TARGET-ld) -all-stage2-ld: configure-stage2-ld - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage2-ld) - -maybe-clean-stage2-ld: clean-stage2-ld -clean-stage2: clean-stage2-ld -clean-stage2-ld: - @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-ld/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ - cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif ld-bootstrap - - -.PHONY: all-stage3-ld maybe-all-stage3-ld -.PHONY: clean-stage3-ld maybe-clean-stage3-ld -maybe-all-stage3-ld: -maybe-clean-stage3-ld: -@if ld-bootstrap -maybe-all-stage3-ld: all-stage3-ld -all-stage3: all-stage3-ld -TARGET-stage3-ld = $(TARGET-ld) -all-stage3-ld: configure-stage3-ld - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage3-ld) - -maybe-clean-stage3-ld: clean-stage3-ld -clean-stage3: clean-stage3-ld -clean-stage3-ld: - @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-ld/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ - cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif ld-bootstrap - - -.PHONY: all-stage4-ld maybe-all-stage4-ld -.PHONY: clean-stage4-ld maybe-clean-stage4-ld -maybe-all-stage4-ld: -maybe-clean-stage4-ld: -@if ld-bootstrap -maybe-all-stage4-ld: all-stage4-ld -all-stage4: all-stage4-ld -TARGET-stage4-ld = $(TARGET-ld) -all-stage4-ld: configure-stage4-ld - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage4-ld) - -maybe-clean-stage4-ld: clean-stage4-ld -clean-stage4: clean-stage4-ld -clean-stage4-ld: - @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-ld/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ - cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif ld-bootstrap - - -.PHONY: all-stageprofile-ld maybe-all-stageprofile-ld -.PHONY: clean-stageprofile-ld maybe-clean-stageprofile-ld -maybe-all-stageprofile-ld: -maybe-clean-stageprofile-ld: -@if ld-bootstrap -maybe-all-stageprofile-ld: all-stageprofile-ld -all-stageprofile: all-stageprofile-ld -TARGET-stageprofile-ld = $(TARGET-ld) -all-stageprofile-ld: configure-stageprofile-ld - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" \ - $(TARGET-stageprofile-ld) - -maybe-clean-stageprofile-ld: clean-stageprofile-ld -clean-stageprofile: clean-stageprofile-ld -clean-stageprofile-ld: - @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-ld/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ - cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean -@endif ld-bootstrap - - -.PHONY: all-stagefeedback-ld maybe-all-stagefeedback-ld -.PHONY: clean-stagefeedback-ld maybe-clean-stagefeedback-ld -maybe-all-stagefeedback-ld: -maybe-clean-stagefeedback-ld: -@if ld-bootstrap -maybe-all-stagefeedback-ld: all-stagefeedback-ld -all-stagefeedback: all-stagefeedback-ld -TARGET-stagefeedback-ld = $(TARGET-ld) -all-stagefeedback-ld: configure-stagefeedback-ld - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" \ - $(TARGET-stagefeedback-ld) - -maybe-clean-stagefeedback-ld: clean-stagefeedback-ld -clean-stagefeedback: clean-stagefeedback-ld -clean-stagefeedback-ld: - @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-ld/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ - cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean -@endif ld-bootstrap - - - - - .PHONY: check-ld maybe-check-ld maybe-check-ld: @if ld maybe-check-ld: check-ld check-ld: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd ld && $(MAKE) $(FLAGS_TO_PASS) check) @endif ld @@ -15792,12 +11941,11 @@ maybe-install-ld: maybe-install-ld: install-ld install-ld: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd ld && $(MAKE) $(FLAGS_TO_PASS) install) @endif ld @@ -15813,12 +11961,13 @@ info-ld: \ @[ -f ./ld/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in ld" ; \ - (cd $(HOST_SUBDIR)/ld && \ + (cd ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15838,12 +11987,13 @@ dvi-ld: \ @[ -f ./ld/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in ld" ; \ - (cd $(HOST_SUBDIR)/ld && \ + (cd ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15853,31 +12003,6 @@ dvi-ld: \ @endif ld -.PHONY: maybe-html-ld html-ld -maybe-html-ld: -@if ld -maybe-html-ld: html-ld - -html-ld: \ - configure-ld - @[ -f ./ld/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in ld" ; \ - (cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif ld - .PHONY: maybe-TAGS-ld TAGS-ld maybe-TAGS-ld: @if ld @@ -15888,12 +12013,13 @@ TAGS-ld: \ @[ -f ./ld/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in ld" ; \ - (cd $(HOST_SUBDIR)/ld && \ + (cd ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15914,12 +12040,13 @@ install-info-ld: \ @[ -f ./ld/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in ld" ; \ - (cd $(HOST_SUBDIR)/ld && \ + (cd ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15939,12 +12066,13 @@ installcheck-ld: \ @[ -f ./ld/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in ld" ; \ - (cd $(HOST_SUBDIR)/ld && \ + (cd ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15963,12 +12091,13 @@ mostlyclean-ld: @[ -f ./ld/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in ld" ; \ - (cd $(HOST_SUBDIR)/ld && \ + (cd ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15987,12 +12116,13 @@ clean-ld: @[ -f ./ld/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in ld" ; \ - (cd $(HOST_SUBDIR)/ld && \ + (cd ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16011,12 +12141,13 @@ distclean-ld: @[ -f ./ld/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in ld" ; \ - (cd $(HOST_SUBDIR)/ld && \ + (cd ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16035,12 +12166,13 @@ maintainer-clean-ld: @[ -f ./ld/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in ld" ; \ - (cd $(HOST_SUBDIR)/ld && \ + (cd ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16051,422 +12183,59 @@ maintainer-clean-ld: @endif ld - .PHONY: configure-libcpp maybe-configure-libcpp maybe-configure-libcpp: @if libcpp maybe-configure-libcpp: configure-libcpp -configure-libcpp: -@endif libcpp -@if libcpp-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif libcpp-bootstrap -@if libcpp - @r=`${PWD_COMMAND}`; export r; \ +configure-libcpp: + @test -f stage_last && exit 0; \ + test ! -f libcpp/Makefile || exit 0; \ + [ -d libcpp ] || mkdir libcpp; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/libcpp; \ - cd "$(HOST_SUBDIR)/libcpp" || exit 1; \ + echo Configuring in libcpp; \ + cd libcpp || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/libcpp"; \ + libsrcdir="$$s/libcpp";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/libcpp"; \ + libsrcdir="$$s/libcpp";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libcpp"; \ - libsrcdir="$$s/libcpp"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif libcpp - - -.PHONY: configure-stage1-libcpp maybe-configure-stage1-libcpp -maybe-configure-stage1-libcpp: -@if libcpp-bootstrap -maybe-configure-stage1-libcpp: configure-stage1-libcpp -configure-stage1-libcpp: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ - cd $(HOST_SUBDIR)/libcpp || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libcpp"; \ - libsrcdir="$$s/libcpp"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" -@endif libcpp-bootstrap - -.PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp -maybe-configure-stage2-libcpp: -@if libcpp-bootstrap -maybe-configure-stage2-libcpp: configure-stage2-libcpp -configure-stage2-libcpp: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 2 in $(HOST_SUBDIR)/libcpp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ - cd $(HOST_SUBDIR)/libcpp || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libcpp"; \ - libsrcdir="$$s/libcpp"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif libcpp-bootstrap - -.PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp -maybe-configure-stage3-libcpp: -@if libcpp-bootstrap -maybe-configure-stage3-libcpp: configure-stage3-libcpp -configure-stage3-libcpp: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 3 in $(HOST_SUBDIR)/libcpp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ - cd $(HOST_SUBDIR)/libcpp || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libcpp"; \ - libsrcdir="$$s/libcpp"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif libcpp-bootstrap - -.PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp -maybe-configure-stage4-libcpp: -@if libcpp-bootstrap -maybe-configure-stage4-libcpp: configure-stage4-libcpp -configure-stage4-libcpp: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 4 in $(HOST_SUBDIR)/libcpp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ - cd $(HOST_SUBDIR)/libcpp || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libcpp"; \ - libsrcdir="$$s/libcpp"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif libcpp-bootstrap - -.PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp -maybe-configure-stageprofile-libcpp: -@if libcpp-bootstrap -maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp -configure-stageprofile-libcpp: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage profile in $(HOST_SUBDIR)/libcpp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ - cd $(HOST_SUBDIR)/libcpp || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libcpp"; \ - libsrcdir="$$s/libcpp"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif libcpp-bootstrap - -.PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp -maybe-configure-stagefeedback-libcpp: -@if libcpp-bootstrap -maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp -configure-stagefeedback-libcpp: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage feedback in $(HOST_SUBDIR)/libcpp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ - cd $(HOST_SUBDIR)/libcpp || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libcpp"; \ - libsrcdir="$$s/libcpp"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif libcpp-bootstrap - - - - - .PHONY: all-libcpp maybe-all-libcpp maybe-all-libcpp: @if libcpp -TARGET-libcpp=all maybe-all-libcpp: all-libcpp all-libcpp: configure-libcpp -@endif libcpp -@if libcpp-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif libcpp-bootstrap -@if libcpp - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libcpp)) + (cd libcpp && $(MAKE) $(FLAGS_TO_PASS) all) @endif libcpp - - -.PHONY: all-stage1-libcpp maybe-all-stage1-libcpp -.PHONY: clean-stage1-libcpp maybe-clean-stage1-libcpp -maybe-all-stage1-libcpp: -maybe-clean-stage1-libcpp: -@if libcpp-bootstrap -maybe-all-stage1-libcpp: all-stage1-libcpp -all-stage1: all-stage1-libcpp -TARGET-stage1-libcpp = $(TARGET-libcpp) -all-stage1-libcpp: configure-stage1-libcpp - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ - $(TARGET-stage1-libcpp) - -maybe-clean-stage1-libcpp: clean-stage1-libcpp -clean-stage1: clean-stage1-libcpp -clean-stage1-libcpp: - @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libcpp/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ - cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" clean -@endif libcpp-bootstrap - - -.PHONY: all-stage2-libcpp maybe-all-stage2-libcpp -.PHONY: clean-stage2-libcpp maybe-clean-stage2-libcpp -maybe-all-stage2-libcpp: -maybe-clean-stage2-libcpp: -@if libcpp-bootstrap -maybe-all-stage2-libcpp: all-stage2-libcpp -all-stage2: all-stage2-libcpp -TARGET-stage2-libcpp = $(TARGET-libcpp) -all-stage2-libcpp: configure-stage2-libcpp - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage2-libcpp) - -maybe-clean-stage2-libcpp: clean-stage2-libcpp -clean-stage2: clean-stage2-libcpp -clean-stage2-libcpp: - @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libcpp/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ - cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif libcpp-bootstrap - - -.PHONY: all-stage3-libcpp maybe-all-stage3-libcpp -.PHONY: clean-stage3-libcpp maybe-clean-stage3-libcpp -maybe-all-stage3-libcpp: -maybe-clean-stage3-libcpp: -@if libcpp-bootstrap -maybe-all-stage3-libcpp: all-stage3-libcpp -all-stage3: all-stage3-libcpp -TARGET-stage3-libcpp = $(TARGET-libcpp) -all-stage3-libcpp: configure-stage3-libcpp - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage3-libcpp) - -maybe-clean-stage3-libcpp: clean-stage3-libcpp -clean-stage3: clean-stage3-libcpp -clean-stage3-libcpp: - @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libcpp/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ - cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif libcpp-bootstrap - - -.PHONY: all-stage4-libcpp maybe-all-stage4-libcpp -.PHONY: clean-stage4-libcpp maybe-clean-stage4-libcpp -maybe-all-stage4-libcpp: -maybe-clean-stage4-libcpp: -@if libcpp-bootstrap -maybe-all-stage4-libcpp: all-stage4-libcpp -all-stage4: all-stage4-libcpp -TARGET-stage4-libcpp = $(TARGET-libcpp) -all-stage4-libcpp: configure-stage4-libcpp - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage4-libcpp) - -maybe-clean-stage4-libcpp: clean-stage4-libcpp -clean-stage4: clean-stage4-libcpp -clean-stage4-libcpp: - @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libcpp/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ - cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif libcpp-bootstrap - - -.PHONY: all-stageprofile-libcpp maybe-all-stageprofile-libcpp -.PHONY: clean-stageprofile-libcpp maybe-clean-stageprofile-libcpp -maybe-all-stageprofile-libcpp: -maybe-clean-stageprofile-libcpp: -@if libcpp-bootstrap -maybe-all-stageprofile-libcpp: all-stageprofile-libcpp -all-stageprofile: all-stageprofile-libcpp -TARGET-stageprofile-libcpp = $(TARGET-libcpp) -all-stageprofile-libcpp: configure-stageprofile-libcpp - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" \ - $(TARGET-stageprofile-libcpp) - -maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp -clean-stageprofile: clean-stageprofile-libcpp -clean-stageprofile-libcpp: - @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libcpp/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ - cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean -@endif libcpp-bootstrap - - -.PHONY: all-stagefeedback-libcpp maybe-all-stagefeedback-libcpp -.PHONY: clean-stagefeedback-libcpp maybe-clean-stagefeedback-libcpp -maybe-all-stagefeedback-libcpp: -maybe-clean-stagefeedback-libcpp: -@if libcpp-bootstrap -maybe-all-stagefeedback-libcpp: all-stagefeedback-libcpp -all-stagefeedback: all-stagefeedback-libcpp -TARGET-stagefeedback-libcpp = $(TARGET-libcpp) -all-stagefeedback-libcpp: configure-stagefeedback-libcpp - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" \ - $(TARGET-stagefeedback-libcpp) - -maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp -clean-stagefeedback: clean-stagefeedback-libcpp -clean-stagefeedback-libcpp: - @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libcpp/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ - cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean -@endif libcpp-bootstrap - - - - - .PHONY: check-libcpp maybe-check-libcpp maybe-check-libcpp: @if libcpp maybe-check-libcpp: check-libcpp check-libcpp: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd libcpp && $(MAKE) $(FLAGS_TO_PASS) check) @endif libcpp @@ -16476,12 +12245,11 @@ maybe-install-libcpp: maybe-install-libcpp: install-libcpp install-libcpp: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd libcpp && $(MAKE) $(FLAGS_TO_PASS) install) @endif libcpp @@ -16497,12 +12265,13 @@ info-libcpp: \ @[ -f ./libcpp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in libcpp" ; \ - (cd $(HOST_SUBDIR)/libcpp && \ + (cd libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16522,12 +12291,13 @@ dvi-libcpp: \ @[ -f ./libcpp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in libcpp" ; \ - (cd $(HOST_SUBDIR)/libcpp && \ + (cd libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16537,31 +12307,6 @@ dvi-libcpp: \ @endif libcpp -.PHONY: maybe-html-libcpp html-libcpp -maybe-html-libcpp: -@if libcpp -maybe-html-libcpp: html-libcpp - -html-libcpp: \ - configure-libcpp - @[ -f ./libcpp/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in libcpp" ; \ - (cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif libcpp - .PHONY: maybe-TAGS-libcpp TAGS-libcpp maybe-TAGS-libcpp: @if libcpp @@ -16572,12 +12317,13 @@ TAGS-libcpp: \ @[ -f ./libcpp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in libcpp" ; \ - (cd $(HOST_SUBDIR)/libcpp && \ + (cd libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16598,12 +12344,13 @@ install-info-libcpp: \ @[ -f ./libcpp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in libcpp" ; \ - (cd $(HOST_SUBDIR)/libcpp && \ + (cd libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16623,12 +12370,13 @@ installcheck-libcpp: \ @[ -f ./libcpp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in libcpp" ; \ - (cd $(HOST_SUBDIR)/libcpp && \ + (cd libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16647,12 +12395,13 @@ mostlyclean-libcpp: @[ -f ./libcpp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in libcpp" ; \ - (cd $(HOST_SUBDIR)/libcpp && \ + (cd libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16671,12 +12420,13 @@ clean-libcpp: @[ -f ./libcpp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in libcpp" ; \ - (cd $(HOST_SUBDIR)/libcpp && \ + (cd libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16695,12 +12445,13 @@ distclean-libcpp: @[ -f ./libcpp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in libcpp" ; \ - (cd $(HOST_SUBDIR)/libcpp && \ + (cd libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16719,12 +12470,13 @@ maintainer-clean-libcpp: @[ -f ./libcpp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in libcpp" ; \ - (cd $(HOST_SUBDIR)/libcpp && \ + (cd libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16735,749 +12487,57 @@ maintainer-clean-libcpp: @endif libcpp - -.PHONY: configure-libdecnumber maybe-configure-libdecnumber -maybe-configure-libdecnumber: -@if libdecnumber -maybe-configure-libdecnumber: configure-libdecnumber -configure-libdecnumber: -@endif libdecnumber -@if libdecnumber-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif libdecnumber-bootstrap -@if libdecnumber - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ - $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/libdecnumber; \ - cd "$(HOST_SUBDIR)/libdecnumber" || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libdecnumber"; \ - libsrcdir="$$s/libdecnumber"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - || exit 1 -@endif libdecnumber - - - -.PHONY: configure-stage1-libdecnumber maybe-configure-stage1-libdecnumber -maybe-configure-stage1-libdecnumber: -@if libdecnumber-bootstrap -maybe-configure-stage1-libdecnumber: configure-stage1-libdecnumber -configure-stage1-libdecnumber: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ - cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libdecnumber"; \ - libsrcdir="$$s/libdecnumber"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" -@endif libdecnumber-bootstrap - -.PHONY: configure-stage2-libdecnumber maybe-configure-stage2-libdecnumber -maybe-configure-stage2-libdecnumber: -@if libdecnumber-bootstrap -maybe-configure-stage2-libdecnumber: configure-stage2-libdecnumber -configure-stage2-libdecnumber: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 2 in $(HOST_SUBDIR)/libdecnumber ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ - cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libdecnumber"; \ - libsrcdir="$$s/libdecnumber"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif libdecnumber-bootstrap - -.PHONY: configure-stage3-libdecnumber maybe-configure-stage3-libdecnumber -maybe-configure-stage3-libdecnumber: -@if libdecnumber-bootstrap -maybe-configure-stage3-libdecnumber: configure-stage3-libdecnumber -configure-stage3-libdecnumber: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 3 in $(HOST_SUBDIR)/libdecnumber ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ - cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libdecnumber"; \ - libsrcdir="$$s/libdecnumber"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif libdecnumber-bootstrap - -.PHONY: configure-stage4-libdecnumber maybe-configure-stage4-libdecnumber -maybe-configure-stage4-libdecnumber: -@if libdecnumber-bootstrap -maybe-configure-stage4-libdecnumber: configure-stage4-libdecnumber -configure-stage4-libdecnumber: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 4 in $(HOST_SUBDIR)/libdecnumber ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ - cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libdecnumber"; \ - libsrcdir="$$s/libdecnumber"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif libdecnumber-bootstrap - -.PHONY: configure-stageprofile-libdecnumber maybe-configure-stageprofile-libdecnumber -maybe-configure-stageprofile-libdecnumber: -@if libdecnumber-bootstrap -maybe-configure-stageprofile-libdecnumber: configure-stageprofile-libdecnumber -configure-stageprofile-libdecnumber: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage profile in $(HOST_SUBDIR)/libdecnumber ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ - cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libdecnumber"; \ - libsrcdir="$$s/libdecnumber"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif libdecnumber-bootstrap - -.PHONY: configure-stagefeedback-libdecnumber maybe-configure-stagefeedback-libdecnumber -maybe-configure-stagefeedback-libdecnumber: -@if libdecnumber-bootstrap -maybe-configure-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber -configure-stagefeedback-libdecnumber: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage feedback in $(HOST_SUBDIR)/libdecnumber ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ - cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libdecnumber"; \ - libsrcdir="$$s/libdecnumber"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif libdecnumber-bootstrap - - - - - -.PHONY: all-libdecnumber maybe-all-libdecnumber -maybe-all-libdecnumber: -@if libdecnumber -TARGET-libdecnumber=all -maybe-all-libdecnumber: all-libdecnumber -all-libdecnumber: configure-libdecnumber -@endif libdecnumber -@if libdecnumber-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif libdecnumber-bootstrap -@if libdecnumber - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libdecnumber)) -@endif libdecnumber - - - -.PHONY: all-stage1-libdecnumber maybe-all-stage1-libdecnumber -.PHONY: clean-stage1-libdecnumber maybe-clean-stage1-libdecnumber -maybe-all-stage1-libdecnumber: -maybe-clean-stage1-libdecnumber: -@if libdecnumber-bootstrap -maybe-all-stage1-libdecnumber: all-stage1-libdecnumber -all-stage1: all-stage1-libdecnumber -TARGET-stage1-libdecnumber = $(TARGET-libdecnumber) -all-stage1-libdecnumber: configure-stage1-libdecnumber - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ - $(TARGET-stage1-libdecnumber) - -maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber -clean-stage1: clean-stage1-libdecnumber -clean-stage1-libdecnumber: - @[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libdecnumber/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ - cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" clean -@endif libdecnumber-bootstrap - - -.PHONY: all-stage2-libdecnumber maybe-all-stage2-libdecnumber -.PHONY: clean-stage2-libdecnumber maybe-clean-stage2-libdecnumber -maybe-all-stage2-libdecnumber: -maybe-clean-stage2-libdecnumber: -@if libdecnumber-bootstrap -maybe-all-stage2-libdecnumber: all-stage2-libdecnumber -all-stage2: all-stage2-libdecnumber -TARGET-stage2-libdecnumber = $(TARGET-libdecnumber) -all-stage2-libdecnumber: configure-stage2-libdecnumber - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage2-libdecnumber) - -maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber -clean-stage2: clean-stage2-libdecnumber -clean-stage2-libdecnumber: - @[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libdecnumber/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ - cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif libdecnumber-bootstrap - - -.PHONY: all-stage3-libdecnumber maybe-all-stage3-libdecnumber -.PHONY: clean-stage3-libdecnumber maybe-clean-stage3-libdecnumber -maybe-all-stage3-libdecnumber: -maybe-clean-stage3-libdecnumber: -@if libdecnumber-bootstrap -maybe-all-stage3-libdecnumber: all-stage3-libdecnumber -all-stage3: all-stage3-libdecnumber -TARGET-stage3-libdecnumber = $(TARGET-libdecnumber) -all-stage3-libdecnumber: configure-stage3-libdecnumber - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage3-libdecnumber) - -maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber -clean-stage3: clean-stage3-libdecnumber -clean-stage3-libdecnumber: - @[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libdecnumber/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ - cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif libdecnumber-bootstrap - - -.PHONY: all-stage4-libdecnumber maybe-all-stage4-libdecnumber -.PHONY: clean-stage4-libdecnumber maybe-clean-stage4-libdecnumber -maybe-all-stage4-libdecnumber: -maybe-clean-stage4-libdecnumber: -@if libdecnumber-bootstrap -maybe-all-stage4-libdecnumber: all-stage4-libdecnumber -all-stage4: all-stage4-libdecnumber -TARGET-stage4-libdecnumber = $(TARGET-libdecnumber) -all-stage4-libdecnumber: configure-stage4-libdecnumber - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage4-libdecnumber) - -maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber -clean-stage4: clean-stage4-libdecnumber -clean-stage4-libdecnumber: - @[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libdecnumber/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ - cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif libdecnumber-bootstrap - - -.PHONY: all-stageprofile-libdecnumber maybe-all-stageprofile-libdecnumber -.PHONY: clean-stageprofile-libdecnumber maybe-clean-stageprofile-libdecnumber -maybe-all-stageprofile-libdecnumber: -maybe-clean-stageprofile-libdecnumber: -@if libdecnumber-bootstrap -maybe-all-stageprofile-libdecnumber: all-stageprofile-libdecnumber -all-stageprofile: all-stageprofile-libdecnumber -TARGET-stageprofile-libdecnumber = $(TARGET-libdecnumber) -all-stageprofile-libdecnumber: configure-stageprofile-libdecnumber - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" \ - $(TARGET-stageprofile-libdecnumber) - -maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber -clean-stageprofile: clean-stageprofile-libdecnumber -clean-stageprofile-libdecnumber: - @[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libdecnumber/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ - cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean -@endif libdecnumber-bootstrap - - -.PHONY: all-stagefeedback-libdecnumber maybe-all-stagefeedback-libdecnumber -.PHONY: clean-stagefeedback-libdecnumber maybe-clean-stagefeedback-libdecnumber -maybe-all-stagefeedback-libdecnumber: -maybe-clean-stagefeedback-libdecnumber: -@if libdecnumber-bootstrap -maybe-all-stagefeedback-libdecnumber: all-stagefeedback-libdecnumber -all-stagefeedback: all-stagefeedback-libdecnumber -TARGET-stagefeedback-libdecnumber = $(TARGET-libdecnumber) -all-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" \ - $(TARGET-stagefeedback-libdecnumber) - -maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber -clean-stagefeedback: clean-stagefeedback-libdecnumber -clean-stagefeedback-libdecnumber: - @[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libdecnumber/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ - cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean -@endif libdecnumber-bootstrap - - - - - -.PHONY: check-libdecnumber maybe-check-libdecnumber -maybe-check-libdecnumber: -@if libdecnumber -maybe-check-libdecnumber: check-libdecnumber - -check-libdecnumber: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) check) - -@endif libdecnumber - -.PHONY: install-libdecnumber maybe-install-libdecnumber -maybe-install-libdecnumber: -@if libdecnumber -maybe-install-libdecnumber: install-libdecnumber - -install-libdecnumber: installdirs - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) install) - -@endif libdecnumber - -# Other targets (info, dvi, etc.) - -.PHONY: maybe-info-libdecnumber info-libdecnumber -maybe-info-libdecnumber: -@if libdecnumber -maybe-info-libdecnumber: info-libdecnumber - -info-libdecnumber: \ - configure-libdecnumber - @[ -f ./libdecnumber/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing info in libdecnumber" ; \ - (cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - info) \ - || exit 1 - -@endif libdecnumber - -.PHONY: maybe-dvi-libdecnumber dvi-libdecnumber -maybe-dvi-libdecnumber: -@if libdecnumber -maybe-dvi-libdecnumber: dvi-libdecnumber - -dvi-libdecnumber: \ - configure-libdecnumber - @[ -f ./libdecnumber/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing dvi in libdecnumber" ; \ - (cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - dvi) \ - || exit 1 - -@endif libdecnumber - -.PHONY: maybe-html-libdecnumber html-libdecnumber -maybe-html-libdecnumber: -@if libdecnumber -maybe-html-libdecnumber: html-libdecnumber - -html-libdecnumber: \ - configure-libdecnumber - @[ -f ./libdecnumber/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in libdecnumber" ; \ - (cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif libdecnumber - -.PHONY: maybe-TAGS-libdecnumber TAGS-libdecnumber -maybe-TAGS-libdecnumber: -@if libdecnumber -maybe-TAGS-libdecnumber: TAGS-libdecnumber - -TAGS-libdecnumber: \ - configure-libdecnumber - @[ -f ./libdecnumber/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing TAGS in libdecnumber" ; \ - (cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - TAGS) \ - || exit 1 - -@endif libdecnumber - -.PHONY: maybe-install-info-libdecnumber install-info-libdecnumber -maybe-install-info-libdecnumber: -@if libdecnumber -maybe-install-info-libdecnumber: install-info-libdecnumber - -install-info-libdecnumber: \ - configure-libdecnumber \ - info-libdecnumber - @[ -f ./libdecnumber/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing install-info in libdecnumber" ; \ - (cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - install-info) \ - || exit 1 - -@endif libdecnumber - -.PHONY: maybe-installcheck-libdecnumber installcheck-libdecnumber -maybe-installcheck-libdecnumber: -@if libdecnumber -maybe-installcheck-libdecnumber: installcheck-libdecnumber - -installcheck-libdecnumber: \ - configure-libdecnumber - @[ -f ./libdecnumber/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing installcheck in libdecnumber" ; \ - (cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - installcheck) \ - || exit 1 - -@endif libdecnumber - -.PHONY: maybe-mostlyclean-libdecnumber mostlyclean-libdecnumber -maybe-mostlyclean-libdecnumber: -@if libdecnumber -maybe-mostlyclean-libdecnumber: mostlyclean-libdecnumber - -mostlyclean-libdecnumber: - @[ -f ./libdecnumber/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing mostlyclean in libdecnumber" ; \ - (cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - mostlyclean) \ - || exit 1 - -@endif libdecnumber - -.PHONY: maybe-clean-libdecnumber clean-libdecnumber -maybe-clean-libdecnumber: -@if libdecnumber -maybe-clean-libdecnumber: clean-libdecnumber - -clean-libdecnumber: - @[ -f ./libdecnumber/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing clean in libdecnumber" ; \ - (cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - clean) \ - || exit 1 - -@endif libdecnumber - -.PHONY: maybe-distclean-libdecnumber distclean-libdecnumber -maybe-distclean-libdecnumber: -@if libdecnumber -maybe-distclean-libdecnumber: distclean-libdecnumber - -distclean-libdecnumber: - @[ -f ./libdecnumber/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing distclean in libdecnumber" ; \ - (cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - distclean) \ - || exit 1 - -@endif libdecnumber - -.PHONY: maybe-maintainer-clean-libdecnumber maintainer-clean-libdecnumber -maybe-maintainer-clean-libdecnumber: -@if libdecnumber -maybe-maintainer-clean-libdecnumber: maintainer-clean-libdecnumber - -maintainer-clean-libdecnumber: - @[ -f ./libdecnumber/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing maintainer-clean in libdecnumber" ; \ - (cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - maintainer-clean) \ - || exit 1 - -@endif libdecnumber - - - .PHONY: configure-libgui maybe-configure-libgui maybe-configure-libgui: @if libgui maybe-configure-libgui: configure-libgui -configure-libgui: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-libgui: + @test ! -f libgui/Makefile || exit 0; \ + [ -d libgui ] || mkdir libgui; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libgui/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/libgui; \ - cd "$(HOST_SUBDIR)/libgui" || exit 1; \ + echo Configuring in libgui; \ + cd libgui || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libgui/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/libgui"; \ + libsrcdir="$$s/libgui";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/libgui"; \ + libsrcdir="$$s/libgui";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgui"; \ - libsrcdir="$$s/libgui"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif libgui - - - - .PHONY: all-libgui maybe-all-libgui maybe-all-libgui: @if libgui -TARGET-libgui=all maybe-all-libgui: all-libgui all-libgui: configure-libgui - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/libgui && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libgui)) + (cd libgui && $(MAKE) $(FLAGS_TO_PASS) all) @endif libgui - - - .PHONY: check-libgui maybe-check-libgui maybe-check-libgui: @if libgui maybe-check-libgui: check-libgui check-libgui: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/libgui && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd libgui && $(MAKE) $(FLAGS_TO_PASS) check) @endif libgui @@ -17487,12 +12547,11 @@ maybe-install-libgui: maybe-install-libgui: install-libgui install-libgui: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/libgui && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd libgui && $(MAKE) $(FLAGS_TO_PASS) install) @endif libgui @@ -17505,16 +12564,16 @@ maybe-info-libgui: info-libgui info-libgui: \ configure-libgui - @: $(MAKE); $(unstage) @[ -f ./libgui/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in libgui" ; \ - (cd $(HOST_SUBDIR)/libgui && \ + (cd libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17531,16 +12590,16 @@ maybe-dvi-libgui: dvi-libgui dvi-libgui: \ configure-libgui - @: $(MAKE); $(unstage) @[ -f ./libgui/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in libgui" ; \ - (cd $(HOST_SUBDIR)/libgui && \ + (cd libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17550,32 +12609,6 @@ dvi-libgui: \ @endif libgui -.PHONY: maybe-html-libgui html-libgui -maybe-html-libgui: -@if libgui -maybe-html-libgui: html-libgui - -html-libgui: \ - configure-libgui - @: $(MAKE); $(unstage) - @[ -f ./libgui/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in libgui" ; \ - (cd $(HOST_SUBDIR)/libgui && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif libgui - .PHONY: maybe-TAGS-libgui TAGS-libgui maybe-TAGS-libgui: @if libgui @@ -17583,16 +12616,16 @@ maybe-TAGS-libgui: TAGS-libgui TAGS-libgui: \ configure-libgui - @: $(MAKE); $(unstage) @[ -f ./libgui/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in libgui" ; \ - (cd $(HOST_SUBDIR)/libgui && \ + (cd libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17610,16 +12643,16 @@ maybe-install-info-libgui: install-info-libgui install-info-libgui: \ configure-libgui \ info-libgui - @: $(MAKE); $(unstage) @[ -f ./libgui/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in libgui" ; \ - (cd $(HOST_SUBDIR)/libgui && \ + (cd libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17636,16 +12669,16 @@ maybe-installcheck-libgui: installcheck-libgui installcheck-libgui: \ configure-libgui - @: $(MAKE); $(unstage) @[ -f ./libgui/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in libgui" ; \ - (cd $(HOST_SUBDIR)/libgui && \ + (cd libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17661,16 +12694,16 @@ maybe-mostlyclean-libgui: maybe-mostlyclean-libgui: mostlyclean-libgui mostlyclean-libgui: - @: $(MAKE); $(unstage) @[ -f ./libgui/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in libgui" ; \ - (cd $(HOST_SUBDIR)/libgui && \ + (cd libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17686,16 +12719,16 @@ maybe-clean-libgui: maybe-clean-libgui: clean-libgui clean-libgui: - @: $(MAKE); $(unstage) @[ -f ./libgui/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in libgui" ; \ - (cd $(HOST_SUBDIR)/libgui && \ + (cd libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17711,16 +12744,16 @@ maybe-distclean-libgui: maybe-distclean-libgui: distclean-libgui distclean-libgui: - @: $(MAKE); $(unstage) @[ -f ./libgui/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in libgui" ; \ - (cd $(HOST_SUBDIR)/libgui && \ + (cd libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17736,16 +12769,16 @@ maybe-maintainer-clean-libgui: maybe-maintainer-clean-libgui: maintainer-clean-libgui maintainer-clean-libgui: - @: $(MAKE); $(unstage) @[ -f ./libgui/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in libgui" ; \ - (cd $(HOST_SUBDIR)/libgui && \ + (cd libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17756,422 +12789,59 @@ maintainer-clean-libgui: @endif libgui - .PHONY: configure-libiberty maybe-configure-libiberty maybe-configure-libiberty: @if libiberty maybe-configure-libiberty: configure-libiberty -configure-libiberty: -@endif libiberty -@if libiberty-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif libiberty-bootstrap -@if libiberty - @r=`${PWD_COMMAND}`; export r; \ +configure-libiberty: + @test -f stage_last && exit 0; \ + test ! -f libiberty/Makefile || exit 0; \ + [ -d libiberty ] || mkdir libiberty; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/libiberty; \ - cd "$(HOST_SUBDIR)/libiberty" || exit 1; \ + echo Configuring in libiberty; \ + cd libiberty || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/libiberty"; \ + libsrcdir="$$s/libiberty";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/libiberty"; \ + libsrcdir="$$s/libiberty";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libiberty"; \ - libsrcdir="$$s/libiberty"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif libiberty - - -.PHONY: configure-stage1-libiberty maybe-configure-stage1-libiberty -maybe-configure-stage1-libiberty: -@if libiberty-bootstrap -maybe-configure-stage1-libiberty: configure-stage1-libiberty -configure-stage1-libiberty: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ - cd $(HOST_SUBDIR)/libiberty || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libiberty"; \ - libsrcdir="$$s/libiberty"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" -@endif libiberty-bootstrap - -.PHONY: configure-stage2-libiberty maybe-configure-stage2-libiberty -maybe-configure-stage2-libiberty: -@if libiberty-bootstrap -maybe-configure-stage2-libiberty: configure-stage2-libiberty -configure-stage2-libiberty: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ - cd $(HOST_SUBDIR)/libiberty || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libiberty"; \ - libsrcdir="$$s/libiberty"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif libiberty-bootstrap - -.PHONY: configure-stage3-libiberty maybe-configure-stage3-libiberty -maybe-configure-stage3-libiberty: -@if libiberty-bootstrap -maybe-configure-stage3-libiberty: configure-stage3-libiberty -configure-stage3-libiberty: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ - cd $(HOST_SUBDIR)/libiberty || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libiberty"; \ - libsrcdir="$$s/libiberty"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif libiberty-bootstrap - -.PHONY: configure-stage4-libiberty maybe-configure-stage4-libiberty -maybe-configure-stage4-libiberty: -@if libiberty-bootstrap -maybe-configure-stage4-libiberty: configure-stage4-libiberty -configure-stage4-libiberty: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ - cd $(HOST_SUBDIR)/libiberty || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libiberty"; \ - libsrcdir="$$s/libiberty"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif libiberty-bootstrap - -.PHONY: configure-stageprofile-libiberty maybe-configure-stageprofile-libiberty -maybe-configure-stageprofile-libiberty: -@if libiberty-bootstrap -maybe-configure-stageprofile-libiberty: configure-stageprofile-libiberty -configure-stageprofile-libiberty: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage profile in $(HOST_SUBDIR)/libiberty ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ - cd $(HOST_SUBDIR)/libiberty || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libiberty"; \ - libsrcdir="$$s/libiberty"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif libiberty-bootstrap - -.PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty -maybe-configure-stagefeedback-libiberty: -@if libiberty-bootstrap -maybe-configure-stagefeedback-libiberty: configure-stagefeedback-libiberty -configure-stagefeedback-libiberty: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ - cd $(HOST_SUBDIR)/libiberty || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libiberty"; \ - libsrcdir="$$s/libiberty"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif libiberty-bootstrap - - - - - .PHONY: all-libiberty maybe-all-libiberty maybe-all-libiberty: @if libiberty -TARGET-libiberty=all maybe-all-libiberty: all-libiberty all-libiberty: configure-libiberty -@endif libiberty -@if libiberty-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif libiberty-bootstrap -@if libiberty - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libiberty)) + (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) all) @endif libiberty - - -.PHONY: all-stage1-libiberty maybe-all-stage1-libiberty -.PHONY: clean-stage1-libiberty maybe-clean-stage1-libiberty -maybe-all-stage1-libiberty: -maybe-clean-stage1-libiberty: -@if libiberty-bootstrap -maybe-all-stage1-libiberty: all-stage1-libiberty -all-stage1: all-stage1-libiberty -TARGET-stage1-libiberty = $(TARGET-libiberty) -all-stage1-libiberty: configure-stage1-libiberty - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ - $(TARGET-stage1-libiberty) - -maybe-clean-stage1-libiberty: clean-stage1-libiberty -clean-stage1: clean-stage1-libiberty -clean-stage1-libiberty: - @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libiberty/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ - cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" clean -@endif libiberty-bootstrap - - -.PHONY: all-stage2-libiberty maybe-all-stage2-libiberty -.PHONY: clean-stage2-libiberty maybe-clean-stage2-libiberty -maybe-all-stage2-libiberty: -maybe-clean-stage2-libiberty: -@if libiberty-bootstrap -maybe-all-stage2-libiberty: all-stage2-libiberty -all-stage2: all-stage2-libiberty -TARGET-stage2-libiberty = $(TARGET-libiberty) -all-stage2-libiberty: configure-stage2-libiberty - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage2-libiberty) - -maybe-clean-stage2-libiberty: clean-stage2-libiberty -clean-stage2: clean-stage2-libiberty -clean-stage2-libiberty: - @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libiberty/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ - cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif libiberty-bootstrap - - -.PHONY: all-stage3-libiberty maybe-all-stage3-libiberty -.PHONY: clean-stage3-libiberty maybe-clean-stage3-libiberty -maybe-all-stage3-libiberty: -maybe-clean-stage3-libiberty: -@if libiberty-bootstrap -maybe-all-stage3-libiberty: all-stage3-libiberty -all-stage3: all-stage3-libiberty -TARGET-stage3-libiberty = $(TARGET-libiberty) -all-stage3-libiberty: configure-stage3-libiberty - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage3-libiberty) - -maybe-clean-stage3-libiberty: clean-stage3-libiberty -clean-stage3: clean-stage3-libiberty -clean-stage3-libiberty: - @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libiberty/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ - cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif libiberty-bootstrap - - -.PHONY: all-stage4-libiberty maybe-all-stage4-libiberty -.PHONY: clean-stage4-libiberty maybe-clean-stage4-libiberty -maybe-all-stage4-libiberty: -maybe-clean-stage4-libiberty: -@if libiberty-bootstrap -maybe-all-stage4-libiberty: all-stage4-libiberty -all-stage4: all-stage4-libiberty -TARGET-stage4-libiberty = $(TARGET-libiberty) -all-stage4-libiberty: configure-stage4-libiberty - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage4-libiberty) - -maybe-clean-stage4-libiberty: clean-stage4-libiberty -clean-stage4: clean-stage4-libiberty -clean-stage4-libiberty: - @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libiberty/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ - cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif libiberty-bootstrap - - -.PHONY: all-stageprofile-libiberty maybe-all-stageprofile-libiberty -.PHONY: clean-stageprofile-libiberty maybe-clean-stageprofile-libiberty -maybe-all-stageprofile-libiberty: -maybe-clean-stageprofile-libiberty: -@if libiberty-bootstrap -maybe-all-stageprofile-libiberty: all-stageprofile-libiberty -all-stageprofile: all-stageprofile-libiberty -TARGET-stageprofile-libiberty = $(TARGET-libiberty) -all-stageprofile-libiberty: configure-stageprofile-libiberty - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" \ - $(TARGET-stageprofile-libiberty) - -maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty -clean-stageprofile: clean-stageprofile-libiberty -clean-stageprofile-libiberty: - @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libiberty/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ - cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean -@endif libiberty-bootstrap - - -.PHONY: all-stagefeedback-libiberty maybe-all-stagefeedback-libiberty -.PHONY: clean-stagefeedback-libiberty maybe-clean-stagefeedback-libiberty -maybe-all-stagefeedback-libiberty: -maybe-clean-stagefeedback-libiberty: -@if libiberty-bootstrap -maybe-all-stagefeedback-libiberty: all-stagefeedback-libiberty -all-stagefeedback: all-stagefeedback-libiberty -TARGET-stagefeedback-libiberty = $(TARGET-libiberty) -all-stagefeedback-libiberty: configure-stagefeedback-libiberty - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" \ - $(TARGET-stagefeedback-libiberty) - -maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty -clean-stagefeedback: clean-stagefeedback-libiberty -clean-stagefeedback-libiberty: - @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libiberty/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ - cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean -@endif libiberty-bootstrap - - - - - .PHONY: check-libiberty maybe-check-libiberty maybe-check-libiberty: @if libiberty maybe-check-libiberty: check-libiberty check-libiberty: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) check) @endif libiberty @@ -18181,12 +12851,11 @@ maybe-install-libiberty: maybe-install-libiberty: install-libiberty install-libiberty: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) install) @endif libiberty @@ -18202,12 +12871,13 @@ info-libiberty: \ @[ -f ./libiberty/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in libiberty" ; \ - (cd $(HOST_SUBDIR)/libiberty && \ + (cd libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18227,12 +12897,13 @@ dvi-libiberty: \ @[ -f ./libiberty/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in libiberty" ; \ - (cd $(HOST_SUBDIR)/libiberty && \ + (cd libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18242,31 +12913,6 @@ dvi-libiberty: \ @endif libiberty -.PHONY: maybe-html-libiberty html-libiberty -maybe-html-libiberty: -@if libiberty -maybe-html-libiberty: html-libiberty - -html-libiberty: \ - configure-libiberty - @[ -f ./libiberty/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in libiberty" ; \ - (cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif libiberty - .PHONY: maybe-TAGS-libiberty TAGS-libiberty maybe-TAGS-libiberty: @if libiberty @@ -18277,12 +12923,13 @@ TAGS-libiberty: \ @[ -f ./libiberty/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in libiberty" ; \ - (cd $(HOST_SUBDIR)/libiberty && \ + (cd libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18303,12 +12950,13 @@ install-info-libiberty: \ @[ -f ./libiberty/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in libiberty" ; \ - (cd $(HOST_SUBDIR)/libiberty && \ + (cd libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18328,12 +12976,13 @@ installcheck-libiberty: \ @[ -f ./libiberty/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in libiberty" ; \ - (cd $(HOST_SUBDIR)/libiberty && \ + (cd libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18352,12 +13001,13 @@ mostlyclean-libiberty: @[ -f ./libiberty/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in libiberty" ; \ - (cd $(HOST_SUBDIR)/libiberty && \ + (cd libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18376,12 +13026,13 @@ clean-libiberty: @[ -f ./libiberty/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in libiberty" ; \ - (cd $(HOST_SUBDIR)/libiberty && \ + (cd libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18400,12 +13051,13 @@ distclean-libiberty: @[ -f ./libiberty/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in libiberty" ; \ - (cd $(HOST_SUBDIR)/libiberty && \ + (cd libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18424,12 +13076,13 @@ maintainer-clean-libiberty: @[ -f ./libiberty/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in libiberty" ; \ - (cd $(HOST_SUBDIR)/libiberty && \ + (cd libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18440,65 +13093,57 @@ maintainer-clean-libiberty: @endif libiberty - .PHONY: configure-libtool maybe-configure-libtool maybe-configure-libtool: @if libtool maybe-configure-libtool: configure-libtool -configure-libtool: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-libtool: + @test ! -f libtool/Makefile || exit 0; \ + [ -d libtool ] || mkdir libtool; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libtool/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtool ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/libtool; \ - cd "$(HOST_SUBDIR)/libtool" || exit 1; \ + echo Configuring in libtool; \ + cd libtool || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libtool/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/libtool"; \ + libsrcdir="$$s/libtool";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/libtool"; \ + libsrcdir="$$s/libtool";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libtool"; \ - libsrcdir="$$s/libtool"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif libtool - - - - .PHONY: all-libtool maybe-all-libtool maybe-all-libtool: @if libtool -TARGET-libtool=all maybe-all-libtool: all-libtool all-libtool: configure-libtool - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/libtool && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libtool)) + (cd libtool && $(MAKE) $(FLAGS_TO_PASS) all) @endif libtool - - - .PHONY: check-libtool maybe-check-libtool maybe-check-libtool: @if libtool maybe-check-libtool: check-libtool check-libtool: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/libtool && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd libtool && $(MAKE) $(FLAGS_TO_PASS) check) @endif libtool @@ -18508,12 +13153,11 @@ maybe-install-libtool: maybe-install-libtool: install-libtool install-libtool: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/libtool && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd libtool && $(MAKE) $(FLAGS_TO_PASS) install) @endif libtool @@ -18526,16 +13170,16 @@ maybe-info-libtool: info-libtool info-libtool: \ configure-libtool - @: $(MAKE); $(unstage) @[ -f ./libtool/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in libtool" ; \ - (cd $(HOST_SUBDIR)/libtool && \ + (cd libtool && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18552,16 +13196,16 @@ maybe-dvi-libtool: dvi-libtool dvi-libtool: \ configure-libtool - @: $(MAKE); $(unstage) @[ -f ./libtool/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in libtool" ; \ - (cd $(HOST_SUBDIR)/libtool && \ + (cd libtool && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18571,32 +13215,6 @@ dvi-libtool: \ @endif libtool -.PHONY: maybe-html-libtool html-libtool -maybe-html-libtool: -@if libtool -maybe-html-libtool: html-libtool - -html-libtool: \ - configure-libtool - @: $(MAKE); $(unstage) - @[ -f ./libtool/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in libtool" ; \ - (cd $(HOST_SUBDIR)/libtool && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif libtool - .PHONY: maybe-TAGS-libtool TAGS-libtool maybe-TAGS-libtool: @if libtool @@ -18604,16 +13222,16 @@ maybe-TAGS-libtool: TAGS-libtool TAGS-libtool: \ configure-libtool - @: $(MAKE); $(unstage) @[ -f ./libtool/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in libtool" ; \ - (cd $(HOST_SUBDIR)/libtool && \ + (cd libtool && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18631,16 +13249,16 @@ maybe-install-info-libtool: install-info-libtool install-info-libtool: \ configure-libtool \ info-libtool - @: $(MAKE); $(unstage) @[ -f ./libtool/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in libtool" ; \ - (cd $(HOST_SUBDIR)/libtool && \ + (cd libtool && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18657,16 +13275,16 @@ maybe-installcheck-libtool: installcheck-libtool installcheck-libtool: \ configure-libtool - @: $(MAKE); $(unstage) @[ -f ./libtool/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in libtool" ; \ - (cd $(HOST_SUBDIR)/libtool && \ + (cd libtool && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18682,16 +13300,16 @@ maybe-mostlyclean-libtool: maybe-mostlyclean-libtool: mostlyclean-libtool mostlyclean-libtool: - @: $(MAKE); $(unstage) @[ -f ./libtool/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in libtool" ; \ - (cd $(HOST_SUBDIR)/libtool && \ + (cd libtool && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18707,16 +13325,16 @@ maybe-clean-libtool: maybe-clean-libtool: clean-libtool clean-libtool: - @: $(MAKE); $(unstage) @[ -f ./libtool/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in libtool" ; \ - (cd $(HOST_SUBDIR)/libtool && \ + (cd libtool && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18732,16 +13350,16 @@ maybe-distclean-libtool: maybe-distclean-libtool: distclean-libtool distclean-libtool: - @: $(MAKE); $(unstage) @[ -f ./libtool/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in libtool" ; \ - (cd $(HOST_SUBDIR)/libtool && \ + (cd libtool && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18757,16 +13375,16 @@ maybe-maintainer-clean-libtool: maybe-maintainer-clean-libtool: maintainer-clean-libtool maintainer-clean-libtool: - @: $(MAKE); $(unstage) @[ -f ./libtool/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in libtool" ; \ - (cd $(HOST_SUBDIR)/libtool && \ + (cd libtool && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18777,65 +13395,57 @@ maintainer-clean-libtool: @endif libtool - .PHONY: configure-m4 maybe-configure-m4 maybe-configure-m4: @if m4 maybe-configure-m4: configure-m4 -configure-m4: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-m4: + @test ! -f m4/Makefile || exit 0; \ + [ -d m4 ] || mkdir m4; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/m4/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/m4 ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/m4; \ - cd "$(HOST_SUBDIR)/m4" || exit 1; \ + echo Configuring in m4; \ + cd m4 || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/m4/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/m4"; \ + libsrcdir="$$s/m4";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/m4"; \ + libsrcdir="$$s/m4";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/m4"; \ - libsrcdir="$$s/m4"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif m4 - - - - .PHONY: all-m4 maybe-all-m4 maybe-all-m4: @if m4 -TARGET-m4=all maybe-all-m4: all-m4 all-m4: configure-m4 - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/m4 && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-m4)) + (cd m4 && $(MAKE) $(FLAGS_TO_PASS) all) @endif m4 - - - .PHONY: check-m4 maybe-check-m4 maybe-check-m4: @if m4 maybe-check-m4: check-m4 check-m4: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/m4 && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd m4 && $(MAKE) $(FLAGS_TO_PASS) check) @endif m4 @@ -18845,12 +13455,11 @@ maybe-install-m4: maybe-install-m4: install-m4 install-m4: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/m4 && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd m4 && $(MAKE) $(FLAGS_TO_PASS) install) @endif m4 @@ -18863,16 +13472,16 @@ maybe-info-m4: info-m4 info-m4: \ configure-m4 - @: $(MAKE); $(unstage) @[ -f ./m4/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in m4" ; \ - (cd $(HOST_SUBDIR)/m4 && \ + (cd m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18889,16 +13498,16 @@ maybe-dvi-m4: dvi-m4 dvi-m4: \ configure-m4 - @: $(MAKE); $(unstage) @[ -f ./m4/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in m4" ; \ - (cd $(HOST_SUBDIR)/m4 && \ + (cd m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18908,32 +13517,6 @@ dvi-m4: \ @endif m4 -.PHONY: maybe-html-m4 html-m4 -maybe-html-m4: -@if m4 -maybe-html-m4: html-m4 - -html-m4: \ - configure-m4 - @: $(MAKE); $(unstage) - @[ -f ./m4/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in m4" ; \ - (cd $(HOST_SUBDIR)/m4 && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif m4 - .PHONY: maybe-TAGS-m4 TAGS-m4 maybe-TAGS-m4: @if m4 @@ -18941,16 +13524,16 @@ maybe-TAGS-m4: TAGS-m4 TAGS-m4: \ configure-m4 - @: $(MAKE); $(unstage) @[ -f ./m4/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in m4" ; \ - (cd $(HOST_SUBDIR)/m4 && \ + (cd m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18968,16 +13551,16 @@ maybe-install-info-m4: install-info-m4 install-info-m4: \ configure-m4 \ info-m4 - @: $(MAKE); $(unstage) @[ -f ./m4/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in m4" ; \ - (cd $(HOST_SUBDIR)/m4 && \ + (cd m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18994,16 +13577,16 @@ maybe-installcheck-m4: installcheck-m4 installcheck-m4: \ configure-m4 - @: $(MAKE); $(unstage) @[ -f ./m4/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in m4" ; \ - (cd $(HOST_SUBDIR)/m4 && \ + (cd m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19019,16 +13602,16 @@ maybe-mostlyclean-m4: maybe-mostlyclean-m4: mostlyclean-m4 mostlyclean-m4: - @: $(MAKE); $(unstage) @[ -f ./m4/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in m4" ; \ - (cd $(HOST_SUBDIR)/m4 && \ + (cd m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19044,16 +13627,16 @@ maybe-clean-m4: maybe-clean-m4: clean-m4 clean-m4: - @: $(MAKE); $(unstage) @[ -f ./m4/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in m4" ; \ - (cd $(HOST_SUBDIR)/m4 && \ + (cd m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19069,16 +13652,16 @@ maybe-distclean-m4: maybe-distclean-m4: distclean-m4 distclean-m4: - @: $(MAKE); $(unstage) @[ -f ./m4/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in m4" ; \ - (cd $(HOST_SUBDIR)/m4 && \ + (cd m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19094,16 +13677,16 @@ maybe-maintainer-clean-m4: maybe-maintainer-clean-m4: maintainer-clean-m4 maintainer-clean-m4: - @: $(MAKE); $(unstage) @[ -f ./m4/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in m4" ; \ - (cd $(HOST_SUBDIR)/m4 && \ + (cd m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19114,65 +13697,57 @@ maintainer-clean-m4: @endif m4 - .PHONY: configure-make maybe-configure-make maybe-configure-make: @if make maybe-configure-make: configure-make -configure-make: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-make: + @test ! -f make/Makefile || exit 0; \ + [ -d make ] || mkdir make; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/make/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/make ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/make; \ - cd "$(HOST_SUBDIR)/make" || exit 1; \ + echo Configuring in make; \ + cd make || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/make/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/make"; \ + libsrcdir="$$s/make";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/make"; \ + libsrcdir="$$s/make";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/make"; \ - libsrcdir="$$s/make"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif make - - - - .PHONY: all-make maybe-all-make maybe-all-make: @if make -TARGET-make=all maybe-all-make: all-make all-make: configure-make - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/make && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-make)) + (cd make && $(MAKE) $(FLAGS_TO_PASS) all) @endif make - - - .PHONY: check-make maybe-check-make maybe-check-make: @if make maybe-check-make: check-make check-make: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/make && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd make && $(MAKE) $(FLAGS_TO_PASS) check) @endif make @@ -19182,12 +13757,11 @@ maybe-install-make: maybe-install-make: install-make install-make: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/make && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd make && $(MAKE) $(FLAGS_TO_PASS) install) @endif make @@ -19200,16 +13774,16 @@ maybe-info-make: info-make info-make: \ configure-make - @: $(MAKE); $(unstage) @[ -f ./make/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in make" ; \ - (cd $(HOST_SUBDIR)/make && \ + (cd make && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19226,16 +13800,16 @@ maybe-dvi-make: dvi-make dvi-make: \ configure-make - @: $(MAKE); $(unstage) @[ -f ./make/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in make" ; \ - (cd $(HOST_SUBDIR)/make && \ + (cd make && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19245,32 +13819,6 @@ dvi-make: \ @endif make -.PHONY: maybe-html-make html-make -maybe-html-make: -@if make -maybe-html-make: html-make - -html-make: \ - configure-make - @: $(MAKE); $(unstage) - @[ -f ./make/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in make" ; \ - (cd $(HOST_SUBDIR)/make && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif make - .PHONY: maybe-TAGS-make TAGS-make maybe-TAGS-make: @if make @@ -19278,16 +13826,16 @@ maybe-TAGS-make: TAGS-make TAGS-make: \ configure-make - @: $(MAKE); $(unstage) @[ -f ./make/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in make" ; \ - (cd $(HOST_SUBDIR)/make && \ + (cd make && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19305,16 +13853,16 @@ maybe-install-info-make: install-info-make install-info-make: \ configure-make \ info-make - @: $(MAKE); $(unstage) @[ -f ./make/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in make" ; \ - (cd $(HOST_SUBDIR)/make && \ + (cd make && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19331,16 +13879,16 @@ maybe-installcheck-make: installcheck-make installcheck-make: \ configure-make - @: $(MAKE); $(unstage) @[ -f ./make/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in make" ; \ - (cd $(HOST_SUBDIR)/make && \ + (cd make && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19356,16 +13904,16 @@ maybe-mostlyclean-make: maybe-mostlyclean-make: mostlyclean-make mostlyclean-make: - @: $(MAKE); $(unstage) @[ -f ./make/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in make" ; \ - (cd $(HOST_SUBDIR)/make && \ + (cd make && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19381,16 +13929,16 @@ maybe-clean-make: maybe-clean-make: clean-make clean-make: - @: $(MAKE); $(unstage) @[ -f ./make/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in make" ; \ - (cd $(HOST_SUBDIR)/make && \ + (cd make && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19406,16 +13954,16 @@ maybe-distclean-make: maybe-distclean-make: distclean-make distclean-make: - @: $(MAKE); $(unstage) @[ -f ./make/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in make" ; \ - (cd $(HOST_SUBDIR)/make && \ + (cd make && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19431,16 +13979,16 @@ maybe-maintainer-clean-make: maybe-maintainer-clean-make: maintainer-clean-make maintainer-clean-make: - @: $(MAKE); $(unstage) @[ -f ./make/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in make" ; \ - (cd $(HOST_SUBDIR)/make && \ + (cd make && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19451,53 +13999,46 @@ maintainer-clean-make: @endif make - .PHONY: configure-mmalloc maybe-configure-mmalloc maybe-configure-mmalloc: @if mmalloc maybe-configure-mmalloc: configure-mmalloc -configure-mmalloc: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-mmalloc: + @test ! -f mmalloc/Makefile || exit 0; \ + [ -d mmalloc ] || mkdir mmalloc; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/mmalloc/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mmalloc ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/mmalloc; \ - cd "$(HOST_SUBDIR)/mmalloc" || exit 1; \ + echo Configuring in mmalloc; \ + cd mmalloc || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/mmalloc/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/mmalloc"; \ + libsrcdir="$$s/mmalloc";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/mmalloc"; \ + libsrcdir="$$s/mmalloc";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/mmalloc"; \ - libsrcdir="$$s/mmalloc"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif mmalloc - - - - .PHONY: all-mmalloc maybe-all-mmalloc maybe-all-mmalloc: @if mmalloc -TARGET-mmalloc=all maybe-all-mmalloc: all-mmalloc all-mmalloc: configure-mmalloc - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/mmalloc && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-mmalloc)) + (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS) all) @endif mmalloc - - - .PHONY: check-mmalloc maybe-check-mmalloc maybe-check-mmalloc: @if mmalloc @@ -19513,12 +14054,11 @@ maybe-install-mmalloc: maybe-install-mmalloc: install-mmalloc install-mmalloc: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/mmalloc && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS) install) @endif mmalloc @@ -19531,16 +14071,16 @@ maybe-info-mmalloc: info-mmalloc info-mmalloc: \ configure-mmalloc - @: $(MAKE); $(unstage) @[ -f ./mmalloc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in mmalloc" ; \ - (cd $(HOST_SUBDIR)/mmalloc && \ + (cd mmalloc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19557,16 +14097,16 @@ maybe-dvi-mmalloc: dvi-mmalloc dvi-mmalloc: \ configure-mmalloc - @: $(MAKE); $(unstage) @[ -f ./mmalloc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in mmalloc" ; \ - (cd $(HOST_SUBDIR)/mmalloc && \ + (cd mmalloc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19576,32 +14116,6 @@ dvi-mmalloc: \ @endif mmalloc -.PHONY: maybe-html-mmalloc html-mmalloc -maybe-html-mmalloc: -@if mmalloc -maybe-html-mmalloc: html-mmalloc - -html-mmalloc: \ - configure-mmalloc - @: $(MAKE); $(unstage) - @[ -f ./mmalloc/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in mmalloc" ; \ - (cd $(HOST_SUBDIR)/mmalloc && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif mmalloc - .PHONY: maybe-TAGS-mmalloc TAGS-mmalloc maybe-TAGS-mmalloc: @if mmalloc @@ -19609,16 +14123,16 @@ maybe-TAGS-mmalloc: TAGS-mmalloc TAGS-mmalloc: \ configure-mmalloc - @: $(MAKE); $(unstage) @[ -f ./mmalloc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in mmalloc" ; \ - (cd $(HOST_SUBDIR)/mmalloc && \ + (cd mmalloc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19636,16 +14150,16 @@ maybe-install-info-mmalloc: install-info-mmalloc install-info-mmalloc: \ configure-mmalloc \ info-mmalloc - @: $(MAKE); $(unstage) @[ -f ./mmalloc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in mmalloc" ; \ - (cd $(HOST_SUBDIR)/mmalloc && \ + (cd mmalloc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19662,16 +14176,16 @@ maybe-installcheck-mmalloc: installcheck-mmalloc installcheck-mmalloc: \ configure-mmalloc - @: $(MAKE); $(unstage) @[ -f ./mmalloc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in mmalloc" ; \ - (cd $(HOST_SUBDIR)/mmalloc && \ + (cd mmalloc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19687,16 +14201,16 @@ maybe-mostlyclean-mmalloc: maybe-mostlyclean-mmalloc: mostlyclean-mmalloc mostlyclean-mmalloc: - @: $(MAKE); $(unstage) @[ -f ./mmalloc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in mmalloc" ; \ - (cd $(HOST_SUBDIR)/mmalloc && \ + (cd mmalloc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19712,16 +14226,16 @@ maybe-clean-mmalloc: maybe-clean-mmalloc: clean-mmalloc clean-mmalloc: - @: $(MAKE); $(unstage) @[ -f ./mmalloc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in mmalloc" ; \ - (cd $(HOST_SUBDIR)/mmalloc && \ + (cd mmalloc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19737,16 +14251,16 @@ maybe-distclean-mmalloc: maybe-distclean-mmalloc: distclean-mmalloc distclean-mmalloc: - @: $(MAKE); $(unstage) @[ -f ./mmalloc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in mmalloc" ; \ - (cd $(HOST_SUBDIR)/mmalloc && \ + (cd mmalloc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19762,16 +14276,16 @@ maybe-maintainer-clean-mmalloc: maybe-maintainer-clean-mmalloc: maintainer-clean-mmalloc maintainer-clean-mmalloc: - @: $(MAKE); $(unstage) @[ -f ./mmalloc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in mmalloc" ; \ - (cd $(HOST_SUBDIR)/mmalloc && \ + (cd mmalloc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19782,65 +14296,57 @@ maintainer-clean-mmalloc: @endif mmalloc - .PHONY: configure-patch maybe-configure-patch maybe-configure-patch: @if patch maybe-configure-patch: configure-patch -configure-patch: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-patch: + @test ! -f patch/Makefile || exit 0; \ + [ -d patch ] || mkdir patch; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/patch/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/patch ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/patch; \ - cd "$(HOST_SUBDIR)/patch" || exit 1; \ + echo Configuring in patch; \ + cd patch || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/patch/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/patch"; \ + libsrcdir="$$s/patch";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/patch"; \ + libsrcdir="$$s/patch";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/patch"; \ - libsrcdir="$$s/patch"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif patch - - - - .PHONY: all-patch maybe-all-patch maybe-all-patch: @if patch -TARGET-patch=all maybe-all-patch: all-patch all-patch: configure-patch - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/patch && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-patch)) + (cd patch && $(MAKE) $(FLAGS_TO_PASS) all) @endif patch - - - .PHONY: check-patch maybe-check-patch maybe-check-patch: @if patch maybe-check-patch: check-patch check-patch: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/patch && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd patch && $(MAKE) $(FLAGS_TO_PASS) check) @endif patch @@ -19850,12 +14356,11 @@ maybe-install-patch: maybe-install-patch: install-patch install-patch: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/patch && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd patch && $(MAKE) $(FLAGS_TO_PASS) install) @endif patch @@ -19868,16 +14373,16 @@ maybe-info-patch: info-patch info-patch: \ configure-patch - @: $(MAKE); $(unstage) @[ -f ./patch/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in patch" ; \ - (cd $(HOST_SUBDIR)/patch && \ + (cd patch && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19894,16 +14399,16 @@ maybe-dvi-patch: dvi-patch dvi-patch: \ configure-patch - @: $(MAKE); $(unstage) @[ -f ./patch/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in patch" ; \ - (cd $(HOST_SUBDIR)/patch && \ + (cd patch && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19913,32 +14418,6 @@ dvi-patch: \ @endif patch -.PHONY: maybe-html-patch html-patch -maybe-html-patch: -@if patch -maybe-html-patch: html-patch - -html-patch: \ - configure-patch - @: $(MAKE); $(unstage) - @[ -f ./patch/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in patch" ; \ - (cd $(HOST_SUBDIR)/patch && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif patch - .PHONY: maybe-TAGS-patch TAGS-patch maybe-TAGS-patch: @if patch @@ -19946,16 +14425,16 @@ maybe-TAGS-patch: TAGS-patch TAGS-patch: \ configure-patch - @: $(MAKE); $(unstage) @[ -f ./patch/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in patch" ; \ - (cd $(HOST_SUBDIR)/patch && \ + (cd patch && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19973,16 +14452,16 @@ maybe-install-info-patch: install-info-patch install-info-patch: \ configure-patch \ info-patch - @: $(MAKE); $(unstage) @[ -f ./patch/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in patch" ; \ - (cd $(HOST_SUBDIR)/patch && \ + (cd patch && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19999,16 +14478,16 @@ maybe-installcheck-patch: installcheck-patch installcheck-patch: \ configure-patch - @: $(MAKE); $(unstage) @[ -f ./patch/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in patch" ; \ - (cd $(HOST_SUBDIR)/patch && \ + (cd patch && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20024,16 +14503,16 @@ maybe-mostlyclean-patch: maybe-mostlyclean-patch: mostlyclean-patch mostlyclean-patch: - @: $(MAKE); $(unstage) @[ -f ./patch/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in patch" ; \ - (cd $(HOST_SUBDIR)/patch && \ + (cd patch && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20049,16 +14528,16 @@ maybe-clean-patch: maybe-clean-patch: clean-patch clean-patch: - @: $(MAKE); $(unstage) @[ -f ./patch/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in patch" ; \ - (cd $(HOST_SUBDIR)/patch && \ + (cd patch && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20074,16 +14553,16 @@ maybe-distclean-patch: maybe-distclean-patch: distclean-patch distclean-patch: - @: $(MAKE); $(unstage) @[ -f ./patch/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in patch" ; \ - (cd $(HOST_SUBDIR)/patch && \ + (cd patch && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20099,16 +14578,16 @@ maybe-maintainer-clean-patch: maybe-maintainer-clean-patch: maintainer-clean-patch maintainer-clean-patch: - @: $(MAKE); $(unstage) @[ -f ./patch/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in patch" ; \ - (cd $(HOST_SUBDIR)/patch && \ + (cd patch && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20119,65 +14598,57 @@ maintainer-clean-patch: @endif patch - .PHONY: configure-perl maybe-configure-perl maybe-configure-perl: @if perl maybe-configure-perl: configure-perl -configure-perl: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-perl: + @test ! -f perl/Makefile || exit 0; \ + [ -d perl ] || mkdir perl; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/perl/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/perl ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/perl; \ - cd "$(HOST_SUBDIR)/perl" || exit 1; \ + echo Configuring in perl; \ + cd perl || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/perl/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/perl"; \ + libsrcdir="$$s/perl";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/perl"; \ + libsrcdir="$$s/perl";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/perl"; \ - libsrcdir="$$s/perl"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif perl - - - - .PHONY: all-perl maybe-all-perl maybe-all-perl: @if perl -TARGET-perl=all maybe-all-perl: all-perl all-perl: configure-perl - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/perl && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-perl)) + (cd perl && $(MAKE) $(FLAGS_TO_PASS) all) @endif perl - - - .PHONY: check-perl maybe-check-perl maybe-check-perl: @if perl maybe-check-perl: check-perl check-perl: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/perl && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd perl && $(MAKE) $(FLAGS_TO_PASS) check) @endif perl @@ -20187,12 +14658,11 @@ maybe-install-perl: maybe-install-perl: install-perl install-perl: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/perl && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd perl && $(MAKE) $(FLAGS_TO_PASS) install) @endif perl @@ -20205,16 +14675,16 @@ maybe-info-perl: info-perl info-perl: \ configure-perl - @: $(MAKE); $(unstage) @[ -f ./perl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in perl" ; \ - (cd $(HOST_SUBDIR)/perl && \ + (cd perl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20231,16 +14701,16 @@ maybe-dvi-perl: dvi-perl dvi-perl: \ configure-perl - @: $(MAKE); $(unstage) @[ -f ./perl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in perl" ; \ - (cd $(HOST_SUBDIR)/perl && \ + (cd perl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20250,32 +14720,6 @@ dvi-perl: \ @endif perl -.PHONY: maybe-html-perl html-perl -maybe-html-perl: -@if perl -maybe-html-perl: html-perl - -html-perl: \ - configure-perl - @: $(MAKE); $(unstage) - @[ -f ./perl/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in perl" ; \ - (cd $(HOST_SUBDIR)/perl && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif perl - .PHONY: maybe-TAGS-perl TAGS-perl maybe-TAGS-perl: @if perl @@ -20283,16 +14727,16 @@ maybe-TAGS-perl: TAGS-perl TAGS-perl: \ configure-perl - @: $(MAKE); $(unstage) @[ -f ./perl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in perl" ; \ - (cd $(HOST_SUBDIR)/perl && \ + (cd perl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20310,16 +14754,16 @@ maybe-install-info-perl: install-info-perl install-info-perl: \ configure-perl \ info-perl - @: $(MAKE); $(unstage) @[ -f ./perl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in perl" ; \ - (cd $(HOST_SUBDIR)/perl && \ + (cd perl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20336,16 +14780,16 @@ maybe-installcheck-perl: installcheck-perl installcheck-perl: \ configure-perl - @: $(MAKE); $(unstage) @[ -f ./perl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in perl" ; \ - (cd $(HOST_SUBDIR)/perl && \ + (cd perl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20361,16 +14805,16 @@ maybe-mostlyclean-perl: maybe-mostlyclean-perl: mostlyclean-perl mostlyclean-perl: - @: $(MAKE); $(unstage) @[ -f ./perl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in perl" ; \ - (cd $(HOST_SUBDIR)/perl && \ + (cd perl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20386,16 +14830,16 @@ maybe-clean-perl: maybe-clean-perl: clean-perl clean-perl: - @: $(MAKE); $(unstage) @[ -f ./perl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in perl" ; \ - (cd $(HOST_SUBDIR)/perl && \ + (cd perl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20411,16 +14855,16 @@ maybe-distclean-perl: maybe-distclean-perl: distclean-perl distclean-perl: - @: $(MAKE); $(unstage) @[ -f ./perl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in perl" ; \ - (cd $(HOST_SUBDIR)/perl && \ + (cd perl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20436,16 +14880,16 @@ maybe-maintainer-clean-perl: maybe-maintainer-clean-perl: maintainer-clean-perl maintainer-clean-perl: - @: $(MAKE); $(unstage) @[ -f ./perl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in perl" ; \ - (cd $(HOST_SUBDIR)/perl && \ + (cd perl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20456,65 +14900,57 @@ maintainer-clean-perl: @endif perl - .PHONY: configure-prms maybe-configure-prms maybe-configure-prms: @if prms maybe-configure-prms: configure-prms -configure-prms: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-prms: + @test ! -f prms/Makefile || exit 0; \ + [ -d prms ] || mkdir prms; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/prms/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/prms ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/prms; \ - cd "$(HOST_SUBDIR)/prms" || exit 1; \ + echo Configuring in prms; \ + cd prms || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/prms/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/prms"; \ + libsrcdir="$$s/prms";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/prms"; \ + libsrcdir="$$s/prms";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/prms"; \ - libsrcdir="$$s/prms"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif prms - - - - .PHONY: all-prms maybe-all-prms maybe-all-prms: @if prms -TARGET-prms=all maybe-all-prms: all-prms all-prms: configure-prms - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/prms && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-prms)) + (cd prms && $(MAKE) $(FLAGS_TO_PASS) all) @endif prms - - - .PHONY: check-prms maybe-check-prms maybe-check-prms: @if prms maybe-check-prms: check-prms check-prms: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/prms && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd prms && $(MAKE) $(FLAGS_TO_PASS) check) @endif prms @@ -20524,12 +14960,11 @@ maybe-install-prms: maybe-install-prms: install-prms install-prms: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/prms && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd prms && $(MAKE) $(FLAGS_TO_PASS) install) @endif prms @@ -20542,16 +14977,16 @@ maybe-info-prms: info-prms info-prms: \ configure-prms - @: $(MAKE); $(unstage) @[ -f ./prms/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in prms" ; \ - (cd $(HOST_SUBDIR)/prms && \ + (cd prms && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20568,16 +15003,16 @@ maybe-dvi-prms: dvi-prms dvi-prms: \ configure-prms - @: $(MAKE); $(unstage) @[ -f ./prms/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in prms" ; \ - (cd $(HOST_SUBDIR)/prms && \ + (cd prms && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20587,32 +15022,6 @@ dvi-prms: \ @endif prms -.PHONY: maybe-html-prms html-prms -maybe-html-prms: -@if prms -maybe-html-prms: html-prms - -html-prms: \ - configure-prms - @: $(MAKE); $(unstage) - @[ -f ./prms/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in prms" ; \ - (cd $(HOST_SUBDIR)/prms && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif prms - .PHONY: maybe-TAGS-prms TAGS-prms maybe-TAGS-prms: @if prms @@ -20620,16 +15029,16 @@ maybe-TAGS-prms: TAGS-prms TAGS-prms: \ configure-prms - @: $(MAKE); $(unstage) @[ -f ./prms/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in prms" ; \ - (cd $(HOST_SUBDIR)/prms && \ + (cd prms && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20647,16 +15056,16 @@ maybe-install-info-prms: install-info-prms install-info-prms: \ configure-prms \ info-prms - @: $(MAKE); $(unstage) @[ -f ./prms/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in prms" ; \ - (cd $(HOST_SUBDIR)/prms && \ + (cd prms && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20673,16 +15082,16 @@ maybe-installcheck-prms: installcheck-prms installcheck-prms: \ configure-prms - @: $(MAKE); $(unstage) @[ -f ./prms/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in prms" ; \ - (cd $(HOST_SUBDIR)/prms && \ + (cd prms && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20698,16 +15107,16 @@ maybe-mostlyclean-prms: maybe-mostlyclean-prms: mostlyclean-prms mostlyclean-prms: - @: $(MAKE); $(unstage) @[ -f ./prms/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in prms" ; \ - (cd $(HOST_SUBDIR)/prms && \ + (cd prms && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20723,16 +15132,16 @@ maybe-clean-prms: maybe-clean-prms: clean-prms clean-prms: - @: $(MAKE); $(unstage) @[ -f ./prms/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in prms" ; \ - (cd $(HOST_SUBDIR)/prms && \ + (cd prms && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20748,16 +15157,16 @@ maybe-distclean-prms: maybe-distclean-prms: distclean-prms distclean-prms: - @: $(MAKE); $(unstage) @[ -f ./prms/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in prms" ; \ - (cd $(HOST_SUBDIR)/prms && \ + (cd prms && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20773,16 +15182,16 @@ maybe-maintainer-clean-prms: maybe-maintainer-clean-prms: maintainer-clean-prms maintainer-clean-prms: - @: $(MAKE); $(unstage) @[ -f ./prms/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in prms" ; \ - (cd $(HOST_SUBDIR)/prms && \ + (cd prms && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20793,65 +15202,57 @@ maintainer-clean-prms: @endif prms - .PHONY: configure-rcs maybe-configure-rcs maybe-configure-rcs: @if rcs maybe-configure-rcs: configure-rcs -configure-rcs: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-rcs: + @test ! -f rcs/Makefile || exit 0; \ + [ -d rcs ] || mkdir rcs; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/rcs/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/rcs ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/rcs; \ - cd "$(HOST_SUBDIR)/rcs" || exit 1; \ + echo Configuring in rcs; \ + cd rcs || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/rcs/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/rcs"; \ + libsrcdir="$$s/rcs";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/rcs"; \ + libsrcdir="$$s/rcs";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/rcs"; \ - libsrcdir="$$s/rcs"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif rcs - - - - .PHONY: all-rcs maybe-all-rcs maybe-all-rcs: @if rcs -TARGET-rcs=all maybe-all-rcs: all-rcs all-rcs: configure-rcs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/rcs && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-rcs)) + (cd rcs && $(MAKE) $(FLAGS_TO_PASS) all) @endif rcs - - - .PHONY: check-rcs maybe-check-rcs maybe-check-rcs: @if rcs maybe-check-rcs: check-rcs check-rcs: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/rcs && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd rcs && $(MAKE) $(FLAGS_TO_PASS) check) @endif rcs @@ -20861,12 +15262,11 @@ maybe-install-rcs: maybe-install-rcs: install-rcs install-rcs: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/rcs && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd rcs && $(MAKE) $(FLAGS_TO_PASS) install) @endif rcs @@ -20879,16 +15279,16 @@ maybe-info-rcs: info-rcs info-rcs: \ configure-rcs - @: $(MAKE); $(unstage) @[ -f ./rcs/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in rcs" ; \ - (cd $(HOST_SUBDIR)/rcs && \ + (cd rcs && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20905,16 +15305,16 @@ maybe-dvi-rcs: dvi-rcs dvi-rcs: \ configure-rcs - @: $(MAKE); $(unstage) @[ -f ./rcs/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in rcs" ; \ - (cd $(HOST_SUBDIR)/rcs && \ + (cd rcs && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20924,32 +15324,6 @@ dvi-rcs: \ @endif rcs -.PHONY: maybe-html-rcs html-rcs -maybe-html-rcs: -@if rcs -maybe-html-rcs: html-rcs - -html-rcs: \ - configure-rcs - @: $(MAKE); $(unstage) - @[ -f ./rcs/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in rcs" ; \ - (cd $(HOST_SUBDIR)/rcs && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif rcs - .PHONY: maybe-TAGS-rcs TAGS-rcs maybe-TAGS-rcs: @if rcs @@ -20957,16 +15331,16 @@ maybe-TAGS-rcs: TAGS-rcs TAGS-rcs: \ configure-rcs - @: $(MAKE); $(unstage) @[ -f ./rcs/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in rcs" ; \ - (cd $(HOST_SUBDIR)/rcs && \ + (cd rcs && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20984,16 +15358,16 @@ maybe-install-info-rcs: install-info-rcs install-info-rcs: \ configure-rcs \ info-rcs - @: $(MAKE); $(unstage) @[ -f ./rcs/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in rcs" ; \ - (cd $(HOST_SUBDIR)/rcs && \ + (cd rcs && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21010,16 +15384,16 @@ maybe-installcheck-rcs: installcheck-rcs installcheck-rcs: \ configure-rcs - @: $(MAKE); $(unstage) @[ -f ./rcs/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in rcs" ; \ - (cd $(HOST_SUBDIR)/rcs && \ + (cd rcs && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21035,16 +15409,16 @@ maybe-mostlyclean-rcs: maybe-mostlyclean-rcs: mostlyclean-rcs mostlyclean-rcs: - @: $(MAKE); $(unstage) @[ -f ./rcs/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in rcs" ; \ - (cd $(HOST_SUBDIR)/rcs && \ + (cd rcs && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21060,16 +15434,16 @@ maybe-clean-rcs: maybe-clean-rcs: clean-rcs clean-rcs: - @: $(MAKE); $(unstage) @[ -f ./rcs/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in rcs" ; \ - (cd $(HOST_SUBDIR)/rcs && \ + (cd rcs && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21085,16 +15459,16 @@ maybe-distclean-rcs: maybe-distclean-rcs: distclean-rcs distclean-rcs: - @: $(MAKE); $(unstage) @[ -f ./rcs/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in rcs" ; \ - (cd $(HOST_SUBDIR)/rcs && \ + (cd rcs && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21110,16 +15484,16 @@ maybe-maintainer-clean-rcs: maybe-maintainer-clean-rcs: maintainer-clean-rcs maintainer-clean-rcs: - @: $(MAKE); $(unstage) @[ -f ./rcs/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in rcs" ; \ - (cd $(HOST_SUBDIR)/rcs && \ + (cd rcs && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21130,65 +15504,57 @@ maintainer-clean-rcs: @endif rcs - .PHONY: configure-readline maybe-configure-readline maybe-configure-readline: @if readline maybe-configure-readline: configure-readline -configure-readline: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-readline: + @test ! -f readline/Makefile || exit 0; \ + [ -d readline ] || mkdir readline; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/readline/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/readline ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/readline; \ - cd "$(HOST_SUBDIR)/readline" || exit 1; \ + echo Configuring in readline; \ + cd readline || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/readline/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/readline"; \ + libsrcdir="$$s/readline";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/readline"; \ + libsrcdir="$$s/readline";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/readline"; \ - libsrcdir="$$s/readline"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif readline - - - - .PHONY: all-readline maybe-all-readline maybe-all-readline: @if readline -TARGET-readline=all maybe-all-readline: all-readline all-readline: configure-readline - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/readline && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-readline)) + (cd readline && $(MAKE) $(FLAGS_TO_PASS) all) @endif readline - - - .PHONY: check-readline maybe-check-readline maybe-check-readline: @if readline maybe-check-readline: check-readline check-readline: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/readline && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd readline && $(MAKE) $(FLAGS_TO_PASS) check) @endif readline @@ -21198,12 +15564,11 @@ maybe-install-readline: maybe-install-readline: install-readline install-readline: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/readline && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd readline && $(MAKE) $(FLAGS_TO_PASS) install) @endif readline @@ -21216,16 +15581,16 @@ maybe-info-readline: info-readline info-readline: \ configure-readline - @: $(MAKE); $(unstage) @[ -f ./readline/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in readline" ; \ - (cd $(HOST_SUBDIR)/readline && \ + (cd readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21242,16 +15607,16 @@ maybe-dvi-readline: dvi-readline dvi-readline: \ configure-readline - @: $(MAKE); $(unstage) @[ -f ./readline/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in readline" ; \ - (cd $(HOST_SUBDIR)/readline && \ + (cd readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21261,32 +15626,6 @@ dvi-readline: \ @endif readline -.PHONY: maybe-html-readline html-readline -maybe-html-readline: -@if readline -maybe-html-readline: html-readline - -html-readline: \ - configure-readline - @: $(MAKE); $(unstage) - @[ -f ./readline/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in readline" ; \ - (cd $(HOST_SUBDIR)/readline && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif readline - .PHONY: maybe-TAGS-readline TAGS-readline maybe-TAGS-readline: @if readline @@ -21294,16 +15633,16 @@ maybe-TAGS-readline: TAGS-readline TAGS-readline: \ configure-readline - @: $(MAKE); $(unstage) @[ -f ./readline/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in readline" ; \ - (cd $(HOST_SUBDIR)/readline && \ + (cd readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21321,16 +15660,16 @@ maybe-install-info-readline: install-info-readline install-info-readline: \ configure-readline \ info-readline - @: $(MAKE); $(unstage) @[ -f ./readline/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in readline" ; \ - (cd $(HOST_SUBDIR)/readline && \ + (cd readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21347,16 +15686,16 @@ maybe-installcheck-readline: installcheck-readline installcheck-readline: \ configure-readline - @: $(MAKE); $(unstage) @[ -f ./readline/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in readline" ; \ - (cd $(HOST_SUBDIR)/readline && \ + (cd readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21372,16 +15711,16 @@ maybe-mostlyclean-readline: maybe-mostlyclean-readline: mostlyclean-readline mostlyclean-readline: - @: $(MAKE); $(unstage) @[ -f ./readline/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in readline" ; \ - (cd $(HOST_SUBDIR)/readline && \ + (cd readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21397,16 +15736,16 @@ maybe-clean-readline: maybe-clean-readline: clean-readline clean-readline: - @: $(MAKE); $(unstage) @[ -f ./readline/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in readline" ; \ - (cd $(HOST_SUBDIR)/readline && \ + (cd readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21422,16 +15761,16 @@ maybe-distclean-readline: maybe-distclean-readline: distclean-readline distclean-readline: - @: $(MAKE); $(unstage) @[ -f ./readline/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in readline" ; \ - (cd $(HOST_SUBDIR)/readline && \ + (cd readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21447,16 +15786,16 @@ maybe-maintainer-clean-readline: maybe-maintainer-clean-readline: maintainer-clean-readline maintainer-clean-readline: - @: $(MAKE); $(unstage) @[ -f ./readline/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in readline" ; \ - (cd $(HOST_SUBDIR)/readline && \ + (cd readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21467,53 +15806,46 @@ maintainer-clean-readline: @endif readline - .PHONY: configure-release maybe-configure-release maybe-configure-release: @if release maybe-configure-release: configure-release -configure-release: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-release: + @test ! -f release/Makefile || exit 0; \ + [ -d release ] || mkdir release; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/release/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/release ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/release; \ - cd "$(HOST_SUBDIR)/release" || exit 1; \ + echo Configuring in release; \ + cd release || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/release/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/release"; \ + libsrcdir="$$s/release";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/release"; \ + libsrcdir="$$s/release";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/release"; \ - libsrcdir="$$s/release"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif release - - - - .PHONY: all-release maybe-all-release maybe-all-release: @if release -TARGET-release=all maybe-all-release: all-release all-release: configure-release - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/release && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-release)) + (cd release && $(MAKE) $(FLAGS_TO_PASS) all) @endif release - - - .PHONY: check-release maybe-check-release maybe-check-release: @if release @@ -21541,16 +15873,16 @@ maybe-info-release: info-release info-release: \ configure-release - @: $(MAKE); $(unstage) @[ -f ./release/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in release" ; \ - (cd $(HOST_SUBDIR)/release && \ + (cd release && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21567,16 +15899,16 @@ maybe-dvi-release: dvi-release dvi-release: \ configure-release - @: $(MAKE); $(unstage) @[ -f ./release/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in release" ; \ - (cd $(HOST_SUBDIR)/release && \ + (cd release && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21586,32 +15918,6 @@ dvi-release: \ @endif release -.PHONY: maybe-html-release html-release -maybe-html-release: -@if release -maybe-html-release: html-release - -html-release: \ - configure-release - @: $(MAKE); $(unstage) - @[ -f ./release/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in release" ; \ - (cd $(HOST_SUBDIR)/release && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif release - .PHONY: maybe-TAGS-release TAGS-release maybe-TAGS-release: @if release @@ -21619,16 +15925,16 @@ maybe-TAGS-release: TAGS-release TAGS-release: \ configure-release - @: $(MAKE); $(unstage) @[ -f ./release/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in release" ; \ - (cd $(HOST_SUBDIR)/release && \ + (cd release && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21646,16 +15952,16 @@ maybe-install-info-release: install-info-release install-info-release: \ configure-release \ info-release - @: $(MAKE); $(unstage) @[ -f ./release/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in release" ; \ - (cd $(HOST_SUBDIR)/release && \ + (cd release && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21672,16 +15978,16 @@ maybe-installcheck-release: installcheck-release installcheck-release: \ configure-release - @: $(MAKE); $(unstage) @[ -f ./release/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in release" ; \ - (cd $(HOST_SUBDIR)/release && \ + (cd release && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21697,16 +16003,16 @@ maybe-mostlyclean-release: maybe-mostlyclean-release: mostlyclean-release mostlyclean-release: - @: $(MAKE); $(unstage) @[ -f ./release/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in release" ; \ - (cd $(HOST_SUBDIR)/release && \ + (cd release && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21722,16 +16028,16 @@ maybe-clean-release: maybe-clean-release: clean-release clean-release: - @: $(MAKE); $(unstage) @[ -f ./release/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in release" ; \ - (cd $(HOST_SUBDIR)/release && \ + (cd release && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21747,16 +16053,16 @@ maybe-distclean-release: maybe-distclean-release: distclean-release distclean-release: - @: $(MAKE); $(unstage) @[ -f ./release/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in release" ; \ - (cd $(HOST_SUBDIR)/release && \ + (cd release && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21772,16 +16078,16 @@ maybe-maintainer-clean-release: maybe-maintainer-clean-release: maintainer-clean-release maintainer-clean-release: - @: $(MAKE); $(unstage) @[ -f ./release/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in release" ; \ - (cd $(HOST_SUBDIR)/release && \ + (cd release && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21792,65 +16098,57 @@ maintainer-clean-release: @endif release - .PHONY: configure-recode maybe-configure-recode maybe-configure-recode: @if recode maybe-configure-recode: configure-recode -configure-recode: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-recode: + @test ! -f recode/Makefile || exit 0; \ + [ -d recode ] || mkdir recode; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/recode/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/recode ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/recode; \ - cd "$(HOST_SUBDIR)/recode" || exit 1; \ + echo Configuring in recode; \ + cd recode || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/recode/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/recode"; \ + libsrcdir="$$s/recode";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/recode"; \ + libsrcdir="$$s/recode";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/recode"; \ - libsrcdir="$$s/recode"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif recode - - - - .PHONY: all-recode maybe-all-recode maybe-all-recode: @if recode -TARGET-recode=all maybe-all-recode: all-recode all-recode: configure-recode - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/recode && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-recode)) + (cd recode && $(MAKE) $(FLAGS_TO_PASS) all) @endif recode - - - .PHONY: check-recode maybe-check-recode maybe-check-recode: @if recode maybe-check-recode: check-recode check-recode: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/recode && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd recode && $(MAKE) $(FLAGS_TO_PASS) check) @endif recode @@ -21860,12 +16158,11 @@ maybe-install-recode: maybe-install-recode: install-recode install-recode: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/recode && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd recode && $(MAKE) $(FLAGS_TO_PASS) install) @endif recode @@ -21878,16 +16175,16 @@ maybe-info-recode: info-recode info-recode: \ configure-recode - @: $(MAKE); $(unstage) @[ -f ./recode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in recode" ; \ - (cd $(HOST_SUBDIR)/recode && \ + (cd recode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21904,16 +16201,16 @@ maybe-dvi-recode: dvi-recode dvi-recode: \ configure-recode - @: $(MAKE); $(unstage) @[ -f ./recode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in recode" ; \ - (cd $(HOST_SUBDIR)/recode && \ + (cd recode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21923,32 +16220,6 @@ dvi-recode: \ @endif recode -.PHONY: maybe-html-recode html-recode -maybe-html-recode: -@if recode -maybe-html-recode: html-recode - -html-recode: \ - configure-recode - @: $(MAKE); $(unstage) - @[ -f ./recode/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in recode" ; \ - (cd $(HOST_SUBDIR)/recode && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif recode - .PHONY: maybe-TAGS-recode TAGS-recode maybe-TAGS-recode: @if recode @@ -21956,16 +16227,16 @@ maybe-TAGS-recode: TAGS-recode TAGS-recode: \ configure-recode - @: $(MAKE); $(unstage) @[ -f ./recode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in recode" ; \ - (cd $(HOST_SUBDIR)/recode && \ + (cd recode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21983,16 +16254,16 @@ maybe-install-info-recode: install-info-recode install-info-recode: \ configure-recode \ info-recode - @: $(MAKE); $(unstage) @[ -f ./recode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in recode" ; \ - (cd $(HOST_SUBDIR)/recode && \ + (cd recode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22009,16 +16280,16 @@ maybe-installcheck-recode: installcheck-recode installcheck-recode: \ configure-recode - @: $(MAKE); $(unstage) @[ -f ./recode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in recode" ; \ - (cd $(HOST_SUBDIR)/recode && \ + (cd recode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22034,16 +16305,16 @@ maybe-mostlyclean-recode: maybe-mostlyclean-recode: mostlyclean-recode mostlyclean-recode: - @: $(MAKE); $(unstage) @[ -f ./recode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in recode" ; \ - (cd $(HOST_SUBDIR)/recode && \ + (cd recode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22059,16 +16330,16 @@ maybe-clean-recode: maybe-clean-recode: clean-recode clean-recode: - @: $(MAKE); $(unstage) @[ -f ./recode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in recode" ; \ - (cd $(HOST_SUBDIR)/recode && \ + (cd recode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22084,16 +16355,16 @@ maybe-distclean-recode: maybe-distclean-recode: distclean-recode distclean-recode: - @: $(MAKE); $(unstage) @[ -f ./recode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in recode" ; \ - (cd $(HOST_SUBDIR)/recode && \ + (cd recode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22109,16 +16380,16 @@ maybe-maintainer-clean-recode: maybe-maintainer-clean-recode: maintainer-clean-recode maintainer-clean-recode: - @: $(MAKE); $(unstage) @[ -f ./recode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in recode" ; \ - (cd $(HOST_SUBDIR)/recode && \ + (cd recode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22129,65 +16400,57 @@ maintainer-clean-recode: @endif recode - .PHONY: configure-sed maybe-configure-sed maybe-configure-sed: @if sed maybe-configure-sed: configure-sed -configure-sed: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-sed: + @test ! -f sed/Makefile || exit 0; \ + [ -d sed ] || mkdir sed; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/sed/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sed ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/sed; \ - cd "$(HOST_SUBDIR)/sed" || exit 1; \ + echo Configuring in sed; \ + cd sed || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/sed/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/sed"; \ + libsrcdir="$$s/sed";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/sed"; \ + libsrcdir="$$s/sed";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/sed"; \ - libsrcdir="$$s/sed"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif sed - - - - .PHONY: all-sed maybe-all-sed maybe-all-sed: @if sed -TARGET-sed=all maybe-all-sed: all-sed all-sed: configure-sed - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/sed && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-sed)) + (cd sed && $(MAKE) $(FLAGS_TO_PASS) all) @endif sed - - - .PHONY: check-sed maybe-check-sed maybe-check-sed: @if sed maybe-check-sed: check-sed check-sed: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/sed && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd sed && $(MAKE) $(FLAGS_TO_PASS) check) @endif sed @@ -22197,12 +16460,11 @@ maybe-install-sed: maybe-install-sed: install-sed install-sed: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/sed && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd sed && $(MAKE) $(FLAGS_TO_PASS) install) @endif sed @@ -22215,16 +16477,16 @@ maybe-info-sed: info-sed info-sed: \ configure-sed - @: $(MAKE); $(unstage) @[ -f ./sed/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in sed" ; \ - (cd $(HOST_SUBDIR)/sed && \ + (cd sed && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22241,16 +16503,16 @@ maybe-dvi-sed: dvi-sed dvi-sed: \ configure-sed - @: $(MAKE); $(unstage) @[ -f ./sed/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in sed" ; \ - (cd $(HOST_SUBDIR)/sed && \ + (cd sed && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22260,32 +16522,6 @@ dvi-sed: \ @endif sed -.PHONY: maybe-html-sed html-sed -maybe-html-sed: -@if sed -maybe-html-sed: html-sed - -html-sed: \ - configure-sed - @: $(MAKE); $(unstage) - @[ -f ./sed/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in sed" ; \ - (cd $(HOST_SUBDIR)/sed && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif sed - .PHONY: maybe-TAGS-sed TAGS-sed maybe-TAGS-sed: @if sed @@ -22293,16 +16529,16 @@ maybe-TAGS-sed: TAGS-sed TAGS-sed: \ configure-sed - @: $(MAKE); $(unstage) @[ -f ./sed/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in sed" ; \ - (cd $(HOST_SUBDIR)/sed && \ + (cd sed && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22320,16 +16556,16 @@ maybe-install-info-sed: install-info-sed install-info-sed: \ configure-sed \ info-sed - @: $(MAKE); $(unstage) @[ -f ./sed/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in sed" ; \ - (cd $(HOST_SUBDIR)/sed && \ + (cd sed && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22346,16 +16582,16 @@ maybe-installcheck-sed: installcheck-sed installcheck-sed: \ configure-sed - @: $(MAKE); $(unstage) @[ -f ./sed/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in sed" ; \ - (cd $(HOST_SUBDIR)/sed && \ + (cd sed && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22371,16 +16607,16 @@ maybe-mostlyclean-sed: maybe-mostlyclean-sed: mostlyclean-sed mostlyclean-sed: - @: $(MAKE); $(unstage) @[ -f ./sed/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in sed" ; \ - (cd $(HOST_SUBDIR)/sed && \ + (cd sed && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22396,16 +16632,16 @@ maybe-clean-sed: maybe-clean-sed: clean-sed clean-sed: - @: $(MAKE); $(unstage) @[ -f ./sed/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in sed" ; \ - (cd $(HOST_SUBDIR)/sed && \ + (cd sed && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22421,16 +16657,16 @@ maybe-distclean-sed: maybe-distclean-sed: distclean-sed distclean-sed: - @: $(MAKE); $(unstage) @[ -f ./sed/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in sed" ; \ - (cd $(HOST_SUBDIR)/sed && \ + (cd sed && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22446,16 +16682,16 @@ maybe-maintainer-clean-sed: maybe-maintainer-clean-sed: maintainer-clean-sed maintainer-clean-sed: - @: $(MAKE); $(unstage) @[ -f ./sed/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in sed" ; \ - (cd $(HOST_SUBDIR)/sed && \ + (cd sed && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22466,65 +16702,57 @@ maintainer-clean-sed: @endif sed - .PHONY: configure-send-pr maybe-configure-send-pr maybe-configure-send-pr: @if send-pr maybe-configure-send-pr: configure-send-pr -configure-send-pr: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-send-pr: + @test ! -f send-pr/Makefile || exit 0; \ + [ -d send-pr ] || mkdir send-pr; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/send-pr/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/send-pr ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/send-pr; \ - cd "$(HOST_SUBDIR)/send-pr" || exit 1; \ + echo Configuring in send-pr; \ + cd send-pr || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/send-pr/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/send-pr"; \ + libsrcdir="$$s/send-pr";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/send-pr"; \ + libsrcdir="$$s/send-pr";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/send-pr"; \ - libsrcdir="$$s/send-pr"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif send-pr - - - - .PHONY: all-send-pr maybe-all-send-pr maybe-all-send-pr: @if send-pr -TARGET-send-pr=all maybe-all-send-pr: all-send-pr all-send-pr: configure-send-pr - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/send-pr && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-send-pr)) + (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) all) @endif send-pr - - - .PHONY: check-send-pr maybe-check-send-pr maybe-check-send-pr: @if send-pr maybe-check-send-pr: check-send-pr check-send-pr: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/send-pr && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) check) @endif send-pr @@ -22534,12 +16762,11 @@ maybe-install-send-pr: maybe-install-send-pr: install-send-pr install-send-pr: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/send-pr && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) install) @endif send-pr @@ -22552,16 +16779,16 @@ maybe-info-send-pr: info-send-pr info-send-pr: \ configure-send-pr - @: $(MAKE); $(unstage) @[ -f ./send-pr/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in send-pr" ; \ - (cd $(HOST_SUBDIR)/send-pr && \ + (cd send-pr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22578,16 +16805,16 @@ maybe-dvi-send-pr: dvi-send-pr dvi-send-pr: \ configure-send-pr - @: $(MAKE); $(unstage) @[ -f ./send-pr/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in send-pr" ; \ - (cd $(HOST_SUBDIR)/send-pr && \ + (cd send-pr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22597,32 +16824,6 @@ dvi-send-pr: \ @endif send-pr -.PHONY: maybe-html-send-pr html-send-pr -maybe-html-send-pr: -@if send-pr -maybe-html-send-pr: html-send-pr - -html-send-pr: \ - configure-send-pr - @: $(MAKE); $(unstage) - @[ -f ./send-pr/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in send-pr" ; \ - (cd $(HOST_SUBDIR)/send-pr && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif send-pr - .PHONY: maybe-TAGS-send-pr TAGS-send-pr maybe-TAGS-send-pr: @if send-pr @@ -22630,16 +16831,16 @@ maybe-TAGS-send-pr: TAGS-send-pr TAGS-send-pr: \ configure-send-pr - @: $(MAKE); $(unstage) @[ -f ./send-pr/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in send-pr" ; \ - (cd $(HOST_SUBDIR)/send-pr && \ + (cd send-pr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22657,16 +16858,16 @@ maybe-install-info-send-pr: install-info-send-pr install-info-send-pr: \ configure-send-pr \ info-send-pr - @: $(MAKE); $(unstage) @[ -f ./send-pr/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in send-pr" ; \ - (cd $(HOST_SUBDIR)/send-pr && \ + (cd send-pr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22683,16 +16884,16 @@ maybe-installcheck-send-pr: installcheck-send-pr installcheck-send-pr: \ configure-send-pr - @: $(MAKE); $(unstage) @[ -f ./send-pr/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in send-pr" ; \ - (cd $(HOST_SUBDIR)/send-pr && \ + (cd send-pr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22708,16 +16909,16 @@ maybe-mostlyclean-send-pr: maybe-mostlyclean-send-pr: mostlyclean-send-pr mostlyclean-send-pr: - @: $(MAKE); $(unstage) @[ -f ./send-pr/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in send-pr" ; \ - (cd $(HOST_SUBDIR)/send-pr && \ + (cd send-pr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22733,16 +16934,16 @@ maybe-clean-send-pr: maybe-clean-send-pr: clean-send-pr clean-send-pr: - @: $(MAKE); $(unstage) @[ -f ./send-pr/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in send-pr" ; \ - (cd $(HOST_SUBDIR)/send-pr && \ + (cd send-pr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22758,16 +16959,16 @@ maybe-distclean-send-pr: maybe-distclean-send-pr: distclean-send-pr distclean-send-pr: - @: $(MAKE); $(unstage) @[ -f ./send-pr/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in send-pr" ; \ - (cd $(HOST_SUBDIR)/send-pr && \ + (cd send-pr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22783,16 +16984,16 @@ maybe-maintainer-clean-send-pr: maybe-maintainer-clean-send-pr: maintainer-clean-send-pr maintainer-clean-send-pr: - @: $(MAKE); $(unstage) @[ -f ./send-pr/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in send-pr" ; \ - (cd $(HOST_SUBDIR)/send-pr && \ + (cd send-pr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22803,65 +17004,57 @@ maintainer-clean-send-pr: @endif send-pr - .PHONY: configure-shellutils maybe-configure-shellutils maybe-configure-shellutils: @if shellutils maybe-configure-shellutils: configure-shellutils -configure-shellutils: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-shellutils: + @test ! -f shellutils/Makefile || exit 0; \ + [ -d shellutils ] || mkdir shellutils; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/shellutils/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/shellutils ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/shellutils; \ - cd "$(HOST_SUBDIR)/shellutils" || exit 1; \ + echo Configuring in shellutils; \ + cd shellutils || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/shellutils/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/shellutils"; \ + libsrcdir="$$s/shellutils";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/shellutils"; \ + libsrcdir="$$s/shellutils";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/shellutils"; \ - libsrcdir="$$s/shellutils"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif shellutils - - - - .PHONY: all-shellutils maybe-all-shellutils maybe-all-shellutils: @if shellutils -TARGET-shellutils=all maybe-all-shellutils: all-shellutils all-shellutils: configure-shellutils - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/shellutils && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-shellutils)) + (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) all) @endif shellutils - - - .PHONY: check-shellutils maybe-check-shellutils maybe-check-shellutils: @if shellutils maybe-check-shellutils: check-shellutils check-shellutils: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/shellutils && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) check) @endif shellutils @@ -22871,12 +17064,11 @@ maybe-install-shellutils: maybe-install-shellutils: install-shellutils install-shellutils: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/shellutils && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) install) @endif shellutils @@ -22889,16 +17081,16 @@ maybe-info-shellutils: info-shellutils info-shellutils: \ configure-shellutils - @: $(MAKE); $(unstage) @[ -f ./shellutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in shellutils" ; \ - (cd $(HOST_SUBDIR)/shellutils && \ + (cd shellutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22915,16 +17107,16 @@ maybe-dvi-shellutils: dvi-shellutils dvi-shellutils: \ configure-shellutils - @: $(MAKE); $(unstage) @[ -f ./shellutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in shellutils" ; \ - (cd $(HOST_SUBDIR)/shellutils && \ + (cd shellutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22934,32 +17126,6 @@ dvi-shellutils: \ @endif shellutils -.PHONY: maybe-html-shellutils html-shellutils -maybe-html-shellutils: -@if shellutils -maybe-html-shellutils: html-shellutils - -html-shellutils: \ - configure-shellutils - @: $(MAKE); $(unstage) - @[ -f ./shellutils/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in shellutils" ; \ - (cd $(HOST_SUBDIR)/shellutils && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif shellutils - .PHONY: maybe-TAGS-shellutils TAGS-shellutils maybe-TAGS-shellutils: @if shellutils @@ -22967,16 +17133,16 @@ maybe-TAGS-shellutils: TAGS-shellutils TAGS-shellutils: \ configure-shellutils - @: $(MAKE); $(unstage) @[ -f ./shellutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in shellutils" ; \ - (cd $(HOST_SUBDIR)/shellutils && \ + (cd shellutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22994,16 +17160,16 @@ maybe-install-info-shellutils: install-info-shellutils install-info-shellutils: \ configure-shellutils \ info-shellutils - @: $(MAKE); $(unstage) @[ -f ./shellutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in shellutils" ; \ - (cd $(HOST_SUBDIR)/shellutils && \ + (cd shellutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23020,16 +17186,16 @@ maybe-installcheck-shellutils: installcheck-shellutils installcheck-shellutils: \ configure-shellutils - @: $(MAKE); $(unstage) @[ -f ./shellutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in shellutils" ; \ - (cd $(HOST_SUBDIR)/shellutils && \ + (cd shellutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23045,16 +17211,16 @@ maybe-mostlyclean-shellutils: maybe-mostlyclean-shellutils: mostlyclean-shellutils mostlyclean-shellutils: - @: $(MAKE); $(unstage) @[ -f ./shellutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in shellutils" ; \ - (cd $(HOST_SUBDIR)/shellutils && \ + (cd shellutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23070,16 +17236,16 @@ maybe-clean-shellutils: maybe-clean-shellutils: clean-shellutils clean-shellutils: - @: $(MAKE); $(unstage) @[ -f ./shellutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in shellutils" ; \ - (cd $(HOST_SUBDIR)/shellutils && \ + (cd shellutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23095,16 +17261,16 @@ maybe-distclean-shellutils: maybe-distclean-shellutils: distclean-shellutils distclean-shellutils: - @: $(MAKE); $(unstage) @[ -f ./shellutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in shellutils" ; \ - (cd $(HOST_SUBDIR)/shellutils && \ + (cd shellutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23120,16 +17286,16 @@ maybe-maintainer-clean-shellutils: maybe-maintainer-clean-shellutils: maintainer-clean-shellutils maintainer-clean-shellutils: - @: $(MAKE); $(unstage) @[ -f ./shellutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in shellutils" ; \ - (cd $(HOST_SUBDIR)/shellutils && \ + (cd shellutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23140,65 +17306,57 @@ maintainer-clean-shellutils: @endif shellutils - .PHONY: configure-sid maybe-configure-sid maybe-configure-sid: @if sid maybe-configure-sid: configure-sid -configure-sid: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-sid: + @test ! -f sid/Makefile || exit 0; \ + [ -d sid ] || mkdir sid; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/sid/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sid ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/sid; \ - cd "$(HOST_SUBDIR)/sid" || exit 1; \ + echo Configuring in sid; \ + cd sid || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/sid/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/sid"; \ + libsrcdir="$$s/sid";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/sid"; \ + libsrcdir="$$s/sid";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/sid"; \ - libsrcdir="$$s/sid"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif sid - - - - .PHONY: all-sid maybe-all-sid maybe-all-sid: @if sid -TARGET-sid=all maybe-all-sid: all-sid all-sid: configure-sid - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/sid && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-sid)) + (cd sid && $(MAKE) $(FLAGS_TO_PASS) all) @endif sid - - - .PHONY: check-sid maybe-check-sid maybe-check-sid: @if sid maybe-check-sid: check-sid check-sid: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/sid && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd sid && $(MAKE) $(FLAGS_TO_PASS) check) @endif sid @@ -23208,12 +17366,11 @@ maybe-install-sid: maybe-install-sid: install-sid install-sid: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/sid && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd sid && $(MAKE) $(FLAGS_TO_PASS) install) @endif sid @@ -23226,16 +17383,16 @@ maybe-info-sid: info-sid info-sid: \ configure-sid - @: $(MAKE); $(unstage) @[ -f ./sid/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in sid" ; \ - (cd $(HOST_SUBDIR)/sid && \ + (cd sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23252,16 +17409,16 @@ maybe-dvi-sid: dvi-sid dvi-sid: \ configure-sid - @: $(MAKE); $(unstage) @[ -f ./sid/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in sid" ; \ - (cd $(HOST_SUBDIR)/sid && \ + (cd sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23271,32 +17428,6 @@ dvi-sid: \ @endif sid -.PHONY: maybe-html-sid html-sid -maybe-html-sid: -@if sid -maybe-html-sid: html-sid - -html-sid: \ - configure-sid - @: $(MAKE); $(unstage) - @[ -f ./sid/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in sid" ; \ - (cd $(HOST_SUBDIR)/sid && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif sid - .PHONY: maybe-TAGS-sid TAGS-sid maybe-TAGS-sid: @if sid @@ -23304,16 +17435,16 @@ maybe-TAGS-sid: TAGS-sid TAGS-sid: \ configure-sid - @: $(MAKE); $(unstage) @[ -f ./sid/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in sid" ; \ - (cd $(HOST_SUBDIR)/sid && \ + (cd sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23331,16 +17462,16 @@ maybe-install-info-sid: install-info-sid install-info-sid: \ configure-sid \ info-sid - @: $(MAKE); $(unstage) @[ -f ./sid/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in sid" ; \ - (cd $(HOST_SUBDIR)/sid && \ + (cd sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23357,16 +17488,16 @@ maybe-installcheck-sid: installcheck-sid installcheck-sid: \ configure-sid - @: $(MAKE); $(unstage) @[ -f ./sid/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in sid" ; \ - (cd $(HOST_SUBDIR)/sid && \ + (cd sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23382,16 +17513,16 @@ maybe-mostlyclean-sid: maybe-mostlyclean-sid: mostlyclean-sid mostlyclean-sid: - @: $(MAKE); $(unstage) @[ -f ./sid/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in sid" ; \ - (cd $(HOST_SUBDIR)/sid && \ + (cd sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23407,16 +17538,16 @@ maybe-clean-sid: maybe-clean-sid: clean-sid clean-sid: - @: $(MAKE); $(unstage) @[ -f ./sid/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in sid" ; \ - (cd $(HOST_SUBDIR)/sid && \ + (cd sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23432,16 +17563,16 @@ maybe-distclean-sid: maybe-distclean-sid: distclean-sid distclean-sid: - @: $(MAKE); $(unstage) @[ -f ./sid/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in sid" ; \ - (cd $(HOST_SUBDIR)/sid && \ + (cd sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23457,16 +17588,16 @@ maybe-maintainer-clean-sid: maybe-maintainer-clean-sid: maintainer-clean-sid maintainer-clean-sid: - @: $(MAKE); $(unstage) @[ -f ./sid/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in sid" ; \ - (cd $(HOST_SUBDIR)/sid && \ + (cd sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23477,65 +17608,57 @@ maintainer-clean-sid: @endif sid - .PHONY: configure-sim maybe-configure-sim maybe-configure-sim: @if sim maybe-configure-sim: configure-sim -configure-sim: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-sim: + @test ! -f sim/Makefile || exit 0; \ + [ -d sim ] || mkdir sim; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/sim/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sim ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/sim; \ - cd "$(HOST_SUBDIR)/sim" || exit 1; \ + echo Configuring in sim; \ + cd sim || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/sim/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/sim"; \ + libsrcdir="$$s/sim";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/sim"; \ + libsrcdir="$$s/sim";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/sim"; \ - libsrcdir="$$s/sim"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif sim - - - - .PHONY: all-sim maybe-all-sim maybe-all-sim: @if sim -TARGET-sim=all maybe-all-sim: all-sim all-sim: configure-sim - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/sim && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-sim)) + (cd sim && $(MAKE) $(FLAGS_TO_PASS) all) @endif sim - - - .PHONY: check-sim maybe-check-sim maybe-check-sim: @if sim maybe-check-sim: check-sim check-sim: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/sim && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd sim && $(MAKE) $(FLAGS_TO_PASS) check) @endif sim @@ -23545,12 +17668,11 @@ maybe-install-sim: maybe-install-sim: install-sim install-sim: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/sim && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd sim && $(MAKE) $(FLAGS_TO_PASS) install) @endif sim @@ -23563,16 +17685,16 @@ maybe-info-sim: info-sim info-sim: \ configure-sim - @: $(MAKE); $(unstage) @[ -f ./sim/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in sim" ; \ - (cd $(HOST_SUBDIR)/sim && \ + (cd sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23589,16 +17711,16 @@ maybe-dvi-sim: dvi-sim dvi-sim: \ configure-sim - @: $(MAKE); $(unstage) @[ -f ./sim/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in sim" ; \ - (cd $(HOST_SUBDIR)/sim && \ + (cd sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23608,32 +17730,6 @@ dvi-sim: \ @endif sim -.PHONY: maybe-html-sim html-sim -maybe-html-sim: -@if sim -maybe-html-sim: html-sim - -html-sim: \ - configure-sim - @: $(MAKE); $(unstage) - @[ -f ./sim/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in sim" ; \ - (cd $(HOST_SUBDIR)/sim && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif sim - .PHONY: maybe-TAGS-sim TAGS-sim maybe-TAGS-sim: @if sim @@ -23641,16 +17737,16 @@ maybe-TAGS-sim: TAGS-sim TAGS-sim: \ configure-sim - @: $(MAKE); $(unstage) @[ -f ./sim/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in sim" ; \ - (cd $(HOST_SUBDIR)/sim && \ + (cd sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23668,16 +17764,16 @@ maybe-install-info-sim: install-info-sim install-info-sim: \ configure-sim \ info-sim - @: $(MAKE); $(unstage) @[ -f ./sim/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in sim" ; \ - (cd $(HOST_SUBDIR)/sim && \ + (cd sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23694,16 +17790,16 @@ maybe-installcheck-sim: installcheck-sim installcheck-sim: \ configure-sim - @: $(MAKE); $(unstage) @[ -f ./sim/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in sim" ; \ - (cd $(HOST_SUBDIR)/sim && \ + (cd sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23719,16 +17815,16 @@ maybe-mostlyclean-sim: maybe-mostlyclean-sim: mostlyclean-sim mostlyclean-sim: - @: $(MAKE); $(unstage) @[ -f ./sim/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in sim" ; \ - (cd $(HOST_SUBDIR)/sim && \ + (cd sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23744,16 +17840,16 @@ maybe-clean-sim: maybe-clean-sim: clean-sim clean-sim: - @: $(MAKE); $(unstage) @[ -f ./sim/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in sim" ; \ - (cd $(HOST_SUBDIR)/sim && \ + (cd sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23769,16 +17865,16 @@ maybe-distclean-sim: maybe-distclean-sim: distclean-sim distclean-sim: - @: $(MAKE); $(unstage) @[ -f ./sim/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in sim" ; \ - (cd $(HOST_SUBDIR)/sim && \ + (cd sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23794,16 +17890,16 @@ maybe-maintainer-clean-sim: maybe-maintainer-clean-sim: maintainer-clean-sim maintainer-clean-sim: - @: $(MAKE); $(unstage) @[ -f ./sim/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in sim" ; \ - (cd $(HOST_SUBDIR)/sim && \ + (cd sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23814,65 +17910,57 @@ maintainer-clean-sim: @endif sim - .PHONY: configure-tar maybe-configure-tar maybe-configure-tar: @if tar maybe-configure-tar: configure-tar -configure-tar: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-tar: + @test ! -f tar/Makefile || exit 0; \ + [ -d tar ] || mkdir tar; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/tar/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tar ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/tar; \ - cd "$(HOST_SUBDIR)/tar" || exit 1; \ + echo Configuring in tar; \ + cd tar || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/tar/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/tar"; \ + libsrcdir="$$s/tar";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/tar"; \ + libsrcdir="$$s/tar";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/tar"; \ - libsrcdir="$$s/tar"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif tar - - - - .PHONY: all-tar maybe-all-tar maybe-all-tar: @if tar -TARGET-tar=all maybe-all-tar: all-tar all-tar: configure-tar - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/tar && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-tar)) + (cd tar && $(MAKE) $(FLAGS_TO_PASS) all) @endif tar - - - .PHONY: check-tar maybe-check-tar maybe-check-tar: @if tar maybe-check-tar: check-tar check-tar: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/tar && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd tar && $(MAKE) $(FLAGS_TO_PASS) check) @endif tar @@ -23882,12 +17970,11 @@ maybe-install-tar: maybe-install-tar: install-tar install-tar: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/tar && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd tar && $(MAKE) $(FLAGS_TO_PASS) install) @endif tar @@ -23900,16 +17987,16 @@ maybe-info-tar: info-tar info-tar: \ configure-tar - @: $(MAKE); $(unstage) @[ -f ./tar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in tar" ; \ - (cd $(HOST_SUBDIR)/tar && \ + (cd tar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23926,16 +18013,16 @@ maybe-dvi-tar: dvi-tar dvi-tar: \ configure-tar - @: $(MAKE); $(unstage) @[ -f ./tar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in tar" ; \ - (cd $(HOST_SUBDIR)/tar && \ + (cd tar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -23945,32 +18032,6 @@ dvi-tar: \ @endif tar -.PHONY: maybe-html-tar html-tar -maybe-html-tar: -@if tar -maybe-html-tar: html-tar - -html-tar: \ - configure-tar - @: $(MAKE); $(unstage) - @[ -f ./tar/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in tar" ; \ - (cd $(HOST_SUBDIR)/tar && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif tar - .PHONY: maybe-TAGS-tar TAGS-tar maybe-TAGS-tar: @if tar @@ -23978,16 +18039,16 @@ maybe-TAGS-tar: TAGS-tar TAGS-tar: \ configure-tar - @: $(MAKE); $(unstage) @[ -f ./tar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in tar" ; \ - (cd $(HOST_SUBDIR)/tar && \ + (cd tar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24005,16 +18066,16 @@ maybe-install-info-tar: install-info-tar install-info-tar: \ configure-tar \ info-tar - @: $(MAKE); $(unstage) @[ -f ./tar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in tar" ; \ - (cd $(HOST_SUBDIR)/tar && \ + (cd tar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24031,16 +18092,16 @@ maybe-installcheck-tar: installcheck-tar installcheck-tar: \ configure-tar - @: $(MAKE); $(unstage) @[ -f ./tar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in tar" ; \ - (cd $(HOST_SUBDIR)/tar && \ + (cd tar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24056,16 +18117,16 @@ maybe-mostlyclean-tar: maybe-mostlyclean-tar: mostlyclean-tar mostlyclean-tar: - @: $(MAKE); $(unstage) @[ -f ./tar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in tar" ; \ - (cd $(HOST_SUBDIR)/tar && \ + (cd tar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24081,16 +18142,16 @@ maybe-clean-tar: maybe-clean-tar: clean-tar clean-tar: - @: $(MAKE); $(unstage) @[ -f ./tar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in tar" ; \ - (cd $(HOST_SUBDIR)/tar && \ + (cd tar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24106,16 +18167,16 @@ maybe-distclean-tar: maybe-distclean-tar: distclean-tar distclean-tar: - @: $(MAKE); $(unstage) @[ -f ./tar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in tar" ; \ - (cd $(HOST_SUBDIR)/tar && \ + (cd tar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24131,16 +18192,16 @@ maybe-maintainer-clean-tar: maybe-maintainer-clean-tar: maintainer-clean-tar maintainer-clean-tar: - @: $(MAKE); $(unstage) @[ -f ./tar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in tar" ; \ - (cd $(HOST_SUBDIR)/tar && \ + (cd tar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24151,65 +18212,57 @@ maintainer-clean-tar: @endif tar - .PHONY: configure-texinfo maybe-configure-texinfo maybe-configure-texinfo: @if texinfo maybe-configure-texinfo: configure-texinfo -configure-texinfo: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-texinfo: + @test ! -f texinfo/Makefile || exit 0; \ + [ -d texinfo ] || mkdir texinfo; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/texinfo/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/texinfo ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/texinfo; \ - cd "$(HOST_SUBDIR)/texinfo" || exit 1; \ + echo Configuring in texinfo; \ + cd texinfo || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/texinfo/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/texinfo"; \ + libsrcdir="$$s/texinfo";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/texinfo"; \ + libsrcdir="$$s/texinfo";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/texinfo"; \ - libsrcdir="$$s/texinfo"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif texinfo - - - - .PHONY: all-texinfo maybe-all-texinfo maybe-all-texinfo: @if texinfo -TARGET-texinfo=all maybe-all-texinfo: all-texinfo all-texinfo: configure-texinfo - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/texinfo && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-texinfo)) + (cd texinfo && $(MAKE) $(FLAGS_TO_PASS) all) @endif texinfo - - - .PHONY: check-texinfo maybe-check-texinfo maybe-check-texinfo: @if texinfo maybe-check-texinfo: check-texinfo check-texinfo: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/texinfo && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd texinfo && $(MAKE) $(FLAGS_TO_PASS) check) @endif texinfo @@ -24231,16 +18284,16 @@ maybe-info-texinfo: info-texinfo info-texinfo: \ configure-texinfo - @: $(MAKE); $(unstage) @[ -f ./texinfo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in texinfo" ; \ - (cd $(HOST_SUBDIR)/texinfo && \ + (cd texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24257,16 +18310,16 @@ maybe-dvi-texinfo: dvi-texinfo dvi-texinfo: \ configure-texinfo - @: $(MAKE); $(unstage) @[ -f ./texinfo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in texinfo" ; \ - (cd $(HOST_SUBDIR)/texinfo && \ + (cd texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24276,32 +18329,6 @@ dvi-texinfo: \ @endif texinfo -.PHONY: maybe-html-texinfo html-texinfo -maybe-html-texinfo: -@if texinfo -maybe-html-texinfo: html-texinfo - -html-texinfo: \ - configure-texinfo - @: $(MAKE); $(unstage) - @[ -f ./texinfo/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in texinfo" ; \ - (cd $(HOST_SUBDIR)/texinfo && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif texinfo - .PHONY: maybe-TAGS-texinfo TAGS-texinfo maybe-TAGS-texinfo: @if texinfo @@ -24309,16 +18336,16 @@ maybe-TAGS-texinfo: TAGS-texinfo TAGS-texinfo: \ configure-texinfo - @: $(MAKE); $(unstage) @[ -f ./texinfo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in texinfo" ; \ - (cd $(HOST_SUBDIR)/texinfo && \ + (cd texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24336,16 +18363,16 @@ maybe-install-info-texinfo: install-info-texinfo install-info-texinfo: \ configure-texinfo \ info-texinfo - @: $(MAKE); $(unstage) @[ -f ./texinfo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in texinfo" ; \ - (cd $(HOST_SUBDIR)/texinfo && \ + (cd texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24362,16 +18389,16 @@ maybe-installcheck-texinfo: installcheck-texinfo installcheck-texinfo: \ configure-texinfo - @: $(MAKE); $(unstage) @[ -f ./texinfo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in texinfo" ; \ - (cd $(HOST_SUBDIR)/texinfo && \ + (cd texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24387,16 +18414,16 @@ maybe-mostlyclean-texinfo: maybe-mostlyclean-texinfo: mostlyclean-texinfo mostlyclean-texinfo: - @: $(MAKE); $(unstage) @[ -f ./texinfo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in texinfo" ; \ - (cd $(HOST_SUBDIR)/texinfo && \ + (cd texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24412,16 +18439,16 @@ maybe-clean-texinfo: maybe-clean-texinfo: clean-texinfo clean-texinfo: - @: $(MAKE); $(unstage) @[ -f ./texinfo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in texinfo" ; \ - (cd $(HOST_SUBDIR)/texinfo && \ + (cd texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24437,16 +18464,16 @@ maybe-distclean-texinfo: maybe-distclean-texinfo: distclean-texinfo distclean-texinfo: - @: $(MAKE); $(unstage) @[ -f ./texinfo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in texinfo" ; \ - (cd $(HOST_SUBDIR)/texinfo && \ + (cd texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24462,16 +18489,16 @@ maybe-maintainer-clean-texinfo: maybe-maintainer-clean-texinfo: maintainer-clean-texinfo maintainer-clean-texinfo: - @: $(MAKE); $(unstage) @[ -f ./texinfo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in texinfo" ; \ - (cd $(HOST_SUBDIR)/texinfo && \ + (cd texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24482,65 +18509,57 @@ maintainer-clean-texinfo: @endif texinfo - .PHONY: configure-textutils maybe-configure-textutils maybe-configure-textutils: @if textutils maybe-configure-textutils: configure-textutils -configure-textutils: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-textutils: + @test ! -f textutils/Makefile || exit 0; \ + [ -d textutils ] || mkdir textutils; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/textutils/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/textutils ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/textutils; \ - cd "$(HOST_SUBDIR)/textutils" || exit 1; \ + echo Configuring in textutils; \ + cd textutils || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/textutils/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/textutils"; \ + libsrcdir="$$s/textutils";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/textutils"; \ + libsrcdir="$$s/textutils";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/textutils"; \ - libsrcdir="$$s/textutils"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif textutils - - - - .PHONY: all-textutils maybe-all-textutils maybe-all-textutils: @if textutils -TARGET-textutils=all maybe-all-textutils: all-textutils all-textutils: configure-textutils - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/textutils && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-textutils)) + (cd textutils && $(MAKE) $(FLAGS_TO_PASS) all) @endif textutils - - - .PHONY: check-textutils maybe-check-textutils maybe-check-textutils: @if textutils maybe-check-textutils: check-textutils check-textutils: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/textutils && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd textutils && $(MAKE) $(FLAGS_TO_PASS) check) @endif textutils @@ -24550,12 +18569,11 @@ maybe-install-textutils: maybe-install-textutils: install-textutils install-textutils: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/textutils && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd textutils && $(MAKE) $(FLAGS_TO_PASS) install) @endif textutils @@ -24568,16 +18586,16 @@ maybe-info-textutils: info-textutils info-textutils: \ configure-textutils - @: $(MAKE); $(unstage) @[ -f ./textutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in textutils" ; \ - (cd $(HOST_SUBDIR)/textutils && \ + (cd textutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24594,16 +18612,16 @@ maybe-dvi-textutils: dvi-textutils dvi-textutils: \ configure-textutils - @: $(MAKE); $(unstage) @[ -f ./textutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in textutils" ; \ - (cd $(HOST_SUBDIR)/textutils && \ + (cd textutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24613,32 +18631,6 @@ dvi-textutils: \ @endif textutils -.PHONY: maybe-html-textutils html-textutils -maybe-html-textutils: -@if textutils -maybe-html-textutils: html-textutils - -html-textutils: \ - configure-textutils - @: $(MAKE); $(unstage) - @[ -f ./textutils/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in textutils" ; \ - (cd $(HOST_SUBDIR)/textutils && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif textutils - .PHONY: maybe-TAGS-textutils TAGS-textutils maybe-TAGS-textutils: @if textutils @@ -24646,16 +18638,16 @@ maybe-TAGS-textutils: TAGS-textutils TAGS-textutils: \ configure-textutils - @: $(MAKE); $(unstage) @[ -f ./textutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in textutils" ; \ - (cd $(HOST_SUBDIR)/textutils && \ + (cd textutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24673,16 +18665,16 @@ maybe-install-info-textutils: install-info-textutils install-info-textutils: \ configure-textutils \ info-textutils - @: $(MAKE); $(unstage) @[ -f ./textutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in textutils" ; \ - (cd $(HOST_SUBDIR)/textutils && \ + (cd textutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24699,16 +18691,16 @@ maybe-installcheck-textutils: installcheck-textutils installcheck-textutils: \ configure-textutils - @: $(MAKE); $(unstage) @[ -f ./textutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in textutils" ; \ - (cd $(HOST_SUBDIR)/textutils && \ + (cd textutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24724,16 +18716,16 @@ maybe-mostlyclean-textutils: maybe-mostlyclean-textutils: mostlyclean-textutils mostlyclean-textutils: - @: $(MAKE); $(unstage) @[ -f ./textutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in textutils" ; \ - (cd $(HOST_SUBDIR)/textutils && \ + (cd textutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24749,16 +18741,16 @@ maybe-clean-textutils: maybe-clean-textutils: clean-textutils clean-textutils: - @: $(MAKE); $(unstage) @[ -f ./textutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in textutils" ; \ - (cd $(HOST_SUBDIR)/textutils && \ + (cd textutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24774,16 +18766,16 @@ maybe-distclean-textutils: maybe-distclean-textutils: distclean-textutils distclean-textutils: - @: $(MAKE); $(unstage) @[ -f ./textutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in textutils" ; \ - (cd $(HOST_SUBDIR)/textutils && \ + (cd textutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24799,16 +18791,16 @@ maybe-maintainer-clean-textutils: maybe-maintainer-clean-textutils: maintainer-clean-textutils maintainer-clean-textutils: - @: $(MAKE); $(unstage) @[ -f ./textutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in textutils" ; \ - (cd $(HOST_SUBDIR)/textutils && \ + (cd textutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24819,65 +18811,57 @@ maintainer-clean-textutils: @endif textutils - .PHONY: configure-time maybe-configure-time maybe-configure-time: @if time maybe-configure-time: configure-time -configure-time: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-time: + @test ! -f time/Makefile || exit 0; \ + [ -d time ] || mkdir time; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/time/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/time ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/time; \ - cd "$(HOST_SUBDIR)/time" || exit 1; \ + echo Configuring in time; \ + cd time || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/time/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/time"; \ + libsrcdir="$$s/time";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/time"; \ + libsrcdir="$$s/time";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/time"; \ - libsrcdir="$$s/time"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif time - - - - .PHONY: all-time maybe-all-time maybe-all-time: @if time -TARGET-time=all maybe-all-time: all-time all-time: configure-time - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/time && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-time)) + (cd time && $(MAKE) $(FLAGS_TO_PASS) all) @endif time - - - .PHONY: check-time maybe-check-time maybe-check-time: @if time maybe-check-time: check-time check-time: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/time && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd time && $(MAKE) $(FLAGS_TO_PASS) check) @endif time @@ -24887,12 +18871,11 @@ maybe-install-time: maybe-install-time: install-time install-time: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/time && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd time && $(MAKE) $(FLAGS_TO_PASS) install) @endif time @@ -24905,16 +18888,16 @@ maybe-info-time: info-time info-time: \ configure-time - @: $(MAKE); $(unstage) @[ -f ./time/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in time" ; \ - (cd $(HOST_SUBDIR)/time && \ + (cd time && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24931,16 +18914,16 @@ maybe-dvi-time: dvi-time dvi-time: \ configure-time - @: $(MAKE); $(unstage) @[ -f ./time/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in time" ; \ - (cd $(HOST_SUBDIR)/time && \ + (cd time && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -24950,32 +18933,6 @@ dvi-time: \ @endif time -.PHONY: maybe-html-time html-time -maybe-html-time: -@if time -maybe-html-time: html-time - -html-time: \ - configure-time - @: $(MAKE); $(unstage) - @[ -f ./time/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in time" ; \ - (cd $(HOST_SUBDIR)/time && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif time - .PHONY: maybe-TAGS-time TAGS-time maybe-TAGS-time: @if time @@ -24983,16 +18940,16 @@ maybe-TAGS-time: TAGS-time TAGS-time: \ configure-time - @: $(MAKE); $(unstage) @[ -f ./time/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in time" ; \ - (cd $(HOST_SUBDIR)/time && \ + (cd time && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25010,16 +18967,16 @@ maybe-install-info-time: install-info-time install-info-time: \ configure-time \ info-time - @: $(MAKE); $(unstage) @[ -f ./time/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in time" ; \ - (cd $(HOST_SUBDIR)/time && \ + (cd time && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25036,16 +18993,16 @@ maybe-installcheck-time: installcheck-time installcheck-time: \ configure-time - @: $(MAKE); $(unstage) @[ -f ./time/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in time" ; \ - (cd $(HOST_SUBDIR)/time && \ + (cd time && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25061,16 +19018,16 @@ maybe-mostlyclean-time: maybe-mostlyclean-time: mostlyclean-time mostlyclean-time: - @: $(MAKE); $(unstage) @[ -f ./time/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in time" ; \ - (cd $(HOST_SUBDIR)/time && \ + (cd time && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25086,16 +19043,16 @@ maybe-clean-time: maybe-clean-time: clean-time clean-time: - @: $(MAKE); $(unstage) @[ -f ./time/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in time" ; \ - (cd $(HOST_SUBDIR)/time && \ + (cd time && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25111,16 +19068,16 @@ maybe-distclean-time: maybe-distclean-time: distclean-time distclean-time: - @: $(MAKE); $(unstage) @[ -f ./time/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in time" ; \ - (cd $(HOST_SUBDIR)/time && \ + (cd time && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25136,16 +19093,16 @@ maybe-maintainer-clean-time: maybe-maintainer-clean-time: maintainer-clean-time maintainer-clean-time: - @: $(MAKE); $(unstage) @[ -f ./time/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in time" ; \ - (cd $(HOST_SUBDIR)/time && \ + (cd time && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25156,65 +19113,57 @@ maintainer-clean-time: @endif time - .PHONY: configure-uudecode maybe-configure-uudecode maybe-configure-uudecode: @if uudecode maybe-configure-uudecode: configure-uudecode -configure-uudecode: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-uudecode: + @test ! -f uudecode/Makefile || exit 0; \ + [ -d uudecode ] || mkdir uudecode; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/uudecode/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/uudecode ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/uudecode; \ - cd "$(HOST_SUBDIR)/uudecode" || exit 1; \ + echo Configuring in uudecode; \ + cd uudecode || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/uudecode/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/uudecode"; \ + libsrcdir="$$s/uudecode";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/uudecode"; \ + libsrcdir="$$s/uudecode";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/uudecode"; \ - libsrcdir="$$s/uudecode"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif uudecode - - - - .PHONY: all-uudecode maybe-all-uudecode maybe-all-uudecode: @if uudecode -TARGET-uudecode=all maybe-all-uudecode: all-uudecode all-uudecode: configure-uudecode - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/uudecode && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-uudecode)) + (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) all) @endif uudecode - - - .PHONY: check-uudecode maybe-check-uudecode maybe-check-uudecode: @if uudecode maybe-check-uudecode: check-uudecode check-uudecode: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/uudecode && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) check) @endif uudecode @@ -25224,12 +19173,11 @@ maybe-install-uudecode: maybe-install-uudecode: install-uudecode install-uudecode: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/uudecode && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) install) @endif uudecode @@ -25242,16 +19190,16 @@ maybe-info-uudecode: info-uudecode info-uudecode: \ configure-uudecode - @: $(MAKE); $(unstage) @[ -f ./uudecode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in uudecode" ; \ - (cd $(HOST_SUBDIR)/uudecode && \ + (cd uudecode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25268,16 +19216,16 @@ maybe-dvi-uudecode: dvi-uudecode dvi-uudecode: \ configure-uudecode - @: $(MAKE); $(unstage) @[ -f ./uudecode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in uudecode" ; \ - (cd $(HOST_SUBDIR)/uudecode && \ + (cd uudecode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25287,32 +19235,6 @@ dvi-uudecode: \ @endif uudecode -.PHONY: maybe-html-uudecode html-uudecode -maybe-html-uudecode: -@if uudecode -maybe-html-uudecode: html-uudecode - -html-uudecode: \ - configure-uudecode - @: $(MAKE); $(unstage) - @[ -f ./uudecode/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in uudecode" ; \ - (cd $(HOST_SUBDIR)/uudecode && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif uudecode - .PHONY: maybe-TAGS-uudecode TAGS-uudecode maybe-TAGS-uudecode: @if uudecode @@ -25320,16 +19242,16 @@ maybe-TAGS-uudecode: TAGS-uudecode TAGS-uudecode: \ configure-uudecode - @: $(MAKE); $(unstage) @[ -f ./uudecode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in uudecode" ; \ - (cd $(HOST_SUBDIR)/uudecode && \ + (cd uudecode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25347,16 +19269,16 @@ maybe-install-info-uudecode: install-info-uudecode install-info-uudecode: \ configure-uudecode \ info-uudecode - @: $(MAKE); $(unstage) @[ -f ./uudecode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in uudecode" ; \ - (cd $(HOST_SUBDIR)/uudecode && \ + (cd uudecode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25373,16 +19295,16 @@ maybe-installcheck-uudecode: installcheck-uudecode installcheck-uudecode: \ configure-uudecode - @: $(MAKE); $(unstage) @[ -f ./uudecode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in uudecode" ; \ - (cd $(HOST_SUBDIR)/uudecode && \ + (cd uudecode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25398,16 +19320,16 @@ maybe-mostlyclean-uudecode: maybe-mostlyclean-uudecode: mostlyclean-uudecode mostlyclean-uudecode: - @: $(MAKE); $(unstage) @[ -f ./uudecode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in uudecode" ; \ - (cd $(HOST_SUBDIR)/uudecode && \ + (cd uudecode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25423,16 +19345,16 @@ maybe-clean-uudecode: maybe-clean-uudecode: clean-uudecode clean-uudecode: - @: $(MAKE); $(unstage) @[ -f ./uudecode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in uudecode" ; \ - (cd $(HOST_SUBDIR)/uudecode && \ + (cd uudecode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25448,16 +19370,16 @@ maybe-distclean-uudecode: maybe-distclean-uudecode: distclean-uudecode distclean-uudecode: - @: $(MAKE); $(unstage) @[ -f ./uudecode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in uudecode" ; \ - (cd $(HOST_SUBDIR)/uudecode && \ + (cd uudecode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25473,16 +19395,16 @@ maybe-maintainer-clean-uudecode: maybe-maintainer-clean-uudecode: maintainer-clean-uudecode maintainer-clean-uudecode: - @: $(MAKE); $(unstage) @[ -f ./uudecode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in uudecode" ; \ - (cd $(HOST_SUBDIR)/uudecode && \ + (cd uudecode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25493,65 +19415,57 @@ maintainer-clean-uudecode: @endif uudecode - .PHONY: configure-wdiff maybe-configure-wdiff maybe-configure-wdiff: @if wdiff maybe-configure-wdiff: configure-wdiff -configure-wdiff: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-wdiff: + @test ! -f wdiff/Makefile || exit 0; \ + [ -d wdiff ] || mkdir wdiff; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/wdiff/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/wdiff ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/wdiff; \ - cd "$(HOST_SUBDIR)/wdiff" || exit 1; \ + echo Configuring in wdiff; \ + cd wdiff || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/wdiff/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/wdiff"; \ + libsrcdir="$$s/wdiff";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/wdiff"; \ + libsrcdir="$$s/wdiff";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/wdiff"; \ - libsrcdir="$$s/wdiff"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif wdiff - - - - .PHONY: all-wdiff maybe-all-wdiff maybe-all-wdiff: @if wdiff -TARGET-wdiff=all maybe-all-wdiff: all-wdiff all-wdiff: configure-wdiff - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/wdiff && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-wdiff)) + (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) all) @endif wdiff - - - .PHONY: check-wdiff maybe-check-wdiff maybe-check-wdiff: @if wdiff maybe-check-wdiff: check-wdiff check-wdiff: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/wdiff && \ - $(MAKE) $(FLAGS_TO_PASS) check) + (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) check) @endif wdiff @@ -25561,12 +19475,11 @@ maybe-install-wdiff: maybe-install-wdiff: install-wdiff install-wdiff: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/wdiff && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) install) @endif wdiff @@ -25579,16 +19492,16 @@ maybe-info-wdiff: info-wdiff info-wdiff: \ configure-wdiff - @: $(MAKE); $(unstage) @[ -f ./wdiff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in wdiff" ; \ - (cd $(HOST_SUBDIR)/wdiff && \ + (cd wdiff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25605,16 +19518,16 @@ maybe-dvi-wdiff: dvi-wdiff dvi-wdiff: \ configure-wdiff - @: $(MAKE); $(unstage) @[ -f ./wdiff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in wdiff" ; \ - (cd $(HOST_SUBDIR)/wdiff && \ + (cd wdiff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25624,32 +19537,6 @@ dvi-wdiff: \ @endif wdiff -.PHONY: maybe-html-wdiff html-wdiff -maybe-html-wdiff: -@if wdiff -maybe-html-wdiff: html-wdiff - -html-wdiff: \ - configure-wdiff - @: $(MAKE); $(unstage) - @[ -f ./wdiff/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in wdiff" ; \ - (cd $(HOST_SUBDIR)/wdiff && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif wdiff - .PHONY: maybe-TAGS-wdiff TAGS-wdiff maybe-TAGS-wdiff: @if wdiff @@ -25657,16 +19544,16 @@ maybe-TAGS-wdiff: TAGS-wdiff TAGS-wdiff: \ configure-wdiff - @: $(MAKE); $(unstage) @[ -f ./wdiff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in wdiff" ; \ - (cd $(HOST_SUBDIR)/wdiff && \ + (cd wdiff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25684,16 +19571,16 @@ maybe-install-info-wdiff: install-info-wdiff install-info-wdiff: \ configure-wdiff \ info-wdiff - @: $(MAKE); $(unstage) @[ -f ./wdiff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in wdiff" ; \ - (cd $(HOST_SUBDIR)/wdiff && \ + (cd wdiff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25710,16 +19597,16 @@ maybe-installcheck-wdiff: installcheck-wdiff installcheck-wdiff: \ configure-wdiff - @: $(MAKE); $(unstage) @[ -f ./wdiff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in wdiff" ; \ - (cd $(HOST_SUBDIR)/wdiff && \ + (cd wdiff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25735,16 +19622,16 @@ maybe-mostlyclean-wdiff: maybe-mostlyclean-wdiff: mostlyclean-wdiff mostlyclean-wdiff: - @: $(MAKE); $(unstage) @[ -f ./wdiff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in wdiff" ; \ - (cd $(HOST_SUBDIR)/wdiff && \ + (cd wdiff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25760,16 +19647,16 @@ maybe-clean-wdiff: maybe-clean-wdiff: clean-wdiff clean-wdiff: - @: $(MAKE); $(unstage) @[ -f ./wdiff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in wdiff" ; \ - (cd $(HOST_SUBDIR)/wdiff && \ + (cd wdiff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25785,16 +19672,16 @@ maybe-distclean-wdiff: maybe-distclean-wdiff: distclean-wdiff distclean-wdiff: - @: $(MAKE); $(unstage) @[ -f ./wdiff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in wdiff" ; \ - (cd $(HOST_SUBDIR)/wdiff && \ + (cd wdiff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25810,16 +19697,16 @@ maybe-maintainer-clean-wdiff: maybe-maintainer-clean-wdiff: maintainer-clean-wdiff maintainer-clean-wdiff: - @: $(MAKE); $(unstage) @[ -f ./wdiff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in wdiff" ; \ - (cd $(HOST_SUBDIR)/wdiff && \ + (cd wdiff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25830,53 +19717,46 @@ maintainer-clean-wdiff: @endif wdiff - .PHONY: configure-zip maybe-configure-zip maybe-configure-zip: @if zip maybe-configure-zip: configure-zip -configure-zip: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-zip: + @test ! -f zip/Makefile || exit 0; \ + [ -d zip ] || mkdir zip; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/zip/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zip ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/zip; \ - cd "$(HOST_SUBDIR)/zip" || exit 1; \ + echo Configuring in zip; \ + cd zip || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/zip/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/zip"; \ + libsrcdir="$$s/zip";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/zip"; \ + libsrcdir="$$s/zip";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/zip"; \ - libsrcdir="$$s/zip"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif zip - - - - .PHONY: all-zip maybe-all-zip maybe-all-zip: @if zip -TARGET-zip=all maybe-all-zip: all-zip all-zip: configure-zip - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/zip && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-zip)) + (cd zip && $(MAKE) $(FLAGS_TO_PASS) all) @endif zip - - - .PHONY: check-zip maybe-check-zip maybe-check-zip: @if zip @@ -25884,13 +19764,12 @@ maybe-check-zip: check-zip # This module is only tested in a native toolchain. check-zip: - @: $(MAKE); $(unstage) @if [ '$(host)' = '$(target)' ] ; then \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/zip && \ - $(MAKE) $(FLAGS_TO_PASS) check); \ + (cd zip && $(MAKE) $(FLAGS_TO_PASS) check); \ fi @endif zip @@ -25901,12 +19780,11 @@ maybe-install-zip: maybe-install-zip: install-zip install-zip: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/zip && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd zip && $(MAKE) $(FLAGS_TO_PASS) install) @endif zip @@ -25919,16 +19797,16 @@ maybe-info-zip: info-zip info-zip: \ configure-zip - @: $(MAKE); $(unstage) @[ -f ./zip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in zip" ; \ - (cd $(HOST_SUBDIR)/zip && \ + (cd zip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25945,16 +19823,16 @@ maybe-dvi-zip: dvi-zip dvi-zip: \ configure-zip - @: $(MAKE); $(unstage) @[ -f ./zip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in zip" ; \ - (cd $(HOST_SUBDIR)/zip && \ + (cd zip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -25964,32 +19842,6 @@ dvi-zip: \ @endif zip -.PHONY: maybe-html-zip html-zip -maybe-html-zip: -@if zip -maybe-html-zip: html-zip - -html-zip: \ - configure-zip - @: $(MAKE); $(unstage) - @[ -f ./zip/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in zip" ; \ - (cd $(HOST_SUBDIR)/zip && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif zip - .PHONY: maybe-TAGS-zip TAGS-zip maybe-TAGS-zip: @if zip @@ -25997,16 +19849,16 @@ maybe-TAGS-zip: TAGS-zip TAGS-zip: \ configure-zip - @: $(MAKE); $(unstage) @[ -f ./zip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in zip" ; \ - (cd $(HOST_SUBDIR)/zip && \ + (cd zip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -26024,16 +19876,16 @@ maybe-install-info-zip: install-info-zip install-info-zip: \ configure-zip \ info-zip - @: $(MAKE); $(unstage) @[ -f ./zip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in zip" ; \ - (cd $(HOST_SUBDIR)/zip && \ + (cd zip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -26050,16 +19902,16 @@ maybe-installcheck-zip: installcheck-zip installcheck-zip: \ configure-zip - @: $(MAKE); $(unstage) @[ -f ./zip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in zip" ; \ - (cd $(HOST_SUBDIR)/zip && \ + (cd zip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -26075,16 +19927,16 @@ maybe-mostlyclean-zip: maybe-mostlyclean-zip: mostlyclean-zip mostlyclean-zip: - @: $(MAKE); $(unstage) @[ -f ./zip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in zip" ; \ - (cd $(HOST_SUBDIR)/zip && \ + (cd zip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -26100,16 +19952,16 @@ maybe-clean-zip: maybe-clean-zip: clean-zip clean-zip: - @: $(MAKE); $(unstage) @[ -f ./zip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in zip" ; \ - (cd $(HOST_SUBDIR)/zip && \ + (cd zip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -26125,16 +19977,16 @@ maybe-distclean-zip: maybe-distclean-zip: distclean-zip distclean-zip: - @: $(MAKE); $(unstage) @[ -f ./zip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in zip" ; \ - (cd $(HOST_SUBDIR)/zip && \ + (cd zip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -26150,16 +20002,16 @@ maybe-maintainer-clean-zip: maybe-maintainer-clean-zip: maintainer-clean-zip maintainer-clean-zip: - @: $(MAKE); $(unstage) @[ -f ./zip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in zip" ; \ - (cd $(HOST_SUBDIR)/zip && \ + (cd zip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -26170,410 +20022,48 @@ maintainer-clean-zip: @endif zip - .PHONY: configure-zlib maybe-configure-zlib maybe-configure-zlib: @if zlib maybe-configure-zlib: configure-zlib -configure-zlib: -@endif zlib -@if zlib-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif zlib-bootstrap -@if zlib - @r=`${PWD_COMMAND}`; export r; \ +configure-zlib: + @test -f stage_last && exit 0; \ + test ! -f zlib/Makefile || exit 0; \ + [ -d zlib ] || mkdir zlib; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/zlib; \ - cd "$(HOST_SUBDIR)/zlib" || exit 1; \ + echo Configuring in zlib; \ + cd zlib || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/zlib"; \ + libsrcdir="$$s/zlib";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/zlib"; \ + libsrcdir="$$s/zlib";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/zlib"; \ - libsrcdir="$$s/zlib"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif zlib - - -.PHONY: configure-stage1-zlib maybe-configure-stage1-zlib -maybe-configure-stage1-zlib: -@if zlib-bootstrap -maybe-configure-stage1-zlib: configure-stage1-zlib -configure-stage1-zlib: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - echo Configuring stage 1 in $(HOST_SUBDIR)/zlib ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ - cd $(HOST_SUBDIR)/zlib || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/zlib"; \ - libsrcdir="$$s/zlib"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" -@endif zlib-bootstrap - -.PHONY: configure-stage2-zlib maybe-configure-stage2-zlib -maybe-configure-stage2-zlib: -@if zlib-bootstrap -maybe-configure-stage2-zlib: configure-stage2-zlib -configure-stage2-zlib: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 2 in $(HOST_SUBDIR)/zlib ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ - cd $(HOST_SUBDIR)/zlib || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/zlib"; \ - libsrcdir="$$s/zlib"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif zlib-bootstrap - -.PHONY: configure-stage3-zlib maybe-configure-stage3-zlib -maybe-configure-stage3-zlib: -@if zlib-bootstrap -maybe-configure-stage3-zlib: configure-stage3-zlib -configure-stage3-zlib: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 3 in $(HOST_SUBDIR)/zlib ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ - cd $(HOST_SUBDIR)/zlib || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/zlib"; \ - libsrcdir="$$s/zlib"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif zlib-bootstrap - -.PHONY: configure-stage4-zlib maybe-configure-stage4-zlib -maybe-configure-stage4-zlib: -@if zlib-bootstrap -maybe-configure-stage4-zlib: configure-stage4-zlib -configure-stage4-zlib: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage 4 in $(HOST_SUBDIR)/zlib ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ - cd $(HOST_SUBDIR)/zlib || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/zlib"; \ - libsrcdir="$$s/zlib"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif zlib-bootstrap - -.PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib -maybe-configure-stageprofile-zlib: -@if zlib-bootstrap -maybe-configure-stageprofile-zlib: configure-stageprofile-zlib -configure-stageprofile-zlib: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage profile in $(HOST_SUBDIR)/zlib ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ - cd $(HOST_SUBDIR)/zlib || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/zlib"; \ - libsrcdir="$$s/zlib"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif zlib-bootstrap - -.PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib -maybe-configure-stagefeedback-zlib: -@if zlib-bootstrap -maybe-configure-stagefeedback-zlib: configure-stagefeedback-zlib -configure-stagefeedback-zlib: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - echo Configuring stage feedback in $(HOST_SUBDIR)/zlib ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ - cd $(HOST_SUBDIR)/zlib || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/zlib"; \ - libsrcdir="$$s/zlib"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ -@endif zlib-bootstrap - - - - - .PHONY: all-zlib maybe-all-zlib maybe-all-zlib: @if zlib -TARGET-zlib=all maybe-all-zlib: all-zlib all-zlib: configure-zlib -@endif zlib -@if zlib-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif zlib-bootstrap -@if zlib - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-zlib)) + (cd zlib && $(MAKE) $(FLAGS_TO_PASS) all) @endif zlib - - -.PHONY: all-stage1-zlib maybe-all-stage1-zlib -.PHONY: clean-stage1-zlib maybe-clean-stage1-zlib -maybe-all-stage1-zlib: -maybe-clean-stage1-zlib: -@if zlib-bootstrap -maybe-all-stage1-zlib: all-stage1-zlib -all-stage1: all-stage1-zlib -TARGET-stage1-zlib = $(TARGET-zlib) -all-stage1-zlib: configure-stage1-zlib - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ - $(TARGET-stage1-zlib) - -maybe-clean-stage1-zlib: clean-stage1-zlib -clean-stage1: clean-stage1-zlib -clean-stage1-zlib: - @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-zlib/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \ - cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" clean -@endif zlib-bootstrap - - -.PHONY: all-stage2-zlib maybe-all-stage2-zlib -.PHONY: clean-stage2-zlib maybe-clean-stage2-zlib -maybe-all-stage2-zlib: -maybe-clean-stage2-zlib: -@if zlib-bootstrap -maybe-all-stage2-zlib: all-stage2-zlib -all-stage2: all-stage2-zlib -TARGET-stage2-zlib = $(TARGET-zlib) -all-stage2-zlib: configure-stage2-zlib - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage2-zlib) - -maybe-clean-stage2-zlib: clean-stage2-zlib -clean-stage2: clean-stage2-zlib -clean-stage2-zlib: - @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-zlib/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \ - cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif zlib-bootstrap - - -.PHONY: all-stage3-zlib maybe-all-stage3-zlib -.PHONY: clean-stage3-zlib maybe-clean-stage3-zlib -maybe-all-stage3-zlib: -maybe-clean-stage3-zlib: -@if zlib-bootstrap -maybe-all-stage3-zlib: all-stage3-zlib -all-stage3: all-stage3-zlib -TARGET-stage3-zlib = $(TARGET-zlib) -all-stage3-zlib: configure-stage3-zlib - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage3-zlib) - -maybe-clean-stage3-zlib: clean-stage3-zlib -clean-stage3: clean-stage3-zlib -clean-stage3-zlib: - @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-zlib/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \ - cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif zlib-bootstrap - - -.PHONY: all-stage4-zlib maybe-all-stage4-zlib -.PHONY: clean-stage4-zlib maybe-clean-stage4-zlib -maybe-all-stage4-zlib: -maybe-clean-stage4-zlib: -@if zlib-bootstrap -maybe-all-stage4-zlib: all-stage4-zlib -all-stage4: all-stage4-zlib -TARGET-stage4-zlib = $(TARGET-zlib) -all-stage4-zlib: configure-stage4-zlib - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - $(TARGET-stage4-zlib) - -maybe-clean-stage4-zlib: clean-stage4-zlib -clean-stage4: clean-stage4-zlib -clean-stage4-zlib: - @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-zlib/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \ - cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - clean -@endif zlib-bootstrap - - -.PHONY: all-stageprofile-zlib maybe-all-stageprofile-zlib -.PHONY: clean-stageprofile-zlib maybe-clean-stageprofile-zlib -maybe-all-stageprofile-zlib: -maybe-clean-stageprofile-zlib: -@if zlib-bootstrap -maybe-all-stageprofile-zlib: all-stageprofile-zlib -all-stageprofile: all-stageprofile-zlib -TARGET-stageprofile-zlib = $(TARGET-zlib) -all-stageprofile-zlib: configure-stageprofile-zlib - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" \ - $(TARGET-stageprofile-zlib) - -maybe-clean-stageprofile-zlib: clean-stageprofile-zlib -clean-stageprofile: clean-stageprofile-zlib -clean-stageprofile-zlib: - @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-zlib/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \ - cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean -@endif zlib-bootstrap - - -.PHONY: all-stagefeedback-zlib maybe-all-stagefeedback-zlib -.PHONY: clean-stagefeedback-zlib maybe-clean-stagefeedback-zlib -maybe-all-stagefeedback-zlib: -maybe-clean-stagefeedback-zlib: -@if zlib-bootstrap -maybe-all-stagefeedback-zlib: all-stagefeedback-zlib -all-stagefeedback: all-stagefeedback-zlib -TARGET-stagefeedback-zlib = $(TARGET-zlib) -all-stagefeedback-zlib: configure-stagefeedback-zlib - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" \ - $(TARGET-stagefeedback-zlib) - -maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib -clean-stagefeedback: clean-stagefeedback-zlib -clean-stagefeedback-zlib: - @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-zlib/Makefile ] \ - || exit 0 ; \ - [ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \ - cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean -@endif zlib-bootstrap - - - - - .PHONY: check-zlib maybe-check-zlib maybe-check-zlib: @if zlib @@ -26604,12 +20094,13 @@ info-zlib: \ @[ -f ./zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in zlib" ; \ - (cd $(HOST_SUBDIR)/zlib && \ + (cd zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -26629,12 +20120,13 @@ dvi-zlib: \ @[ -f ./zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in zlib" ; \ - (cd $(HOST_SUBDIR)/zlib && \ + (cd zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -26644,31 +20136,6 @@ dvi-zlib: \ @endif zlib -.PHONY: maybe-html-zlib html-zlib -maybe-html-zlib: -@if zlib -maybe-html-zlib: html-zlib - -html-zlib: \ - configure-zlib - @[ -f ./zlib/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in zlib" ; \ - (cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif zlib - .PHONY: maybe-TAGS-zlib TAGS-zlib maybe-TAGS-zlib: @if zlib @@ -26679,12 +20146,13 @@ TAGS-zlib: \ @[ -f ./zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in zlib" ; \ - (cd $(HOST_SUBDIR)/zlib && \ + (cd zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -26705,12 +20173,13 @@ install-info-zlib: \ @[ -f ./zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in zlib" ; \ - (cd $(HOST_SUBDIR)/zlib && \ + (cd zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -26730,12 +20199,13 @@ installcheck-zlib: \ @[ -f ./zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in zlib" ; \ - (cd $(HOST_SUBDIR)/zlib && \ + (cd zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -26754,12 +20224,13 @@ mostlyclean-zlib: @[ -f ./zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in zlib" ; \ - (cd $(HOST_SUBDIR)/zlib && \ + (cd zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -26778,12 +20249,13 @@ clean-zlib: @[ -f ./zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in zlib" ; \ - (cd $(HOST_SUBDIR)/zlib && \ + (cd zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -26802,12 +20274,13 @@ distclean-zlib: @[ -f ./zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in zlib" ; \ - (cd $(HOST_SUBDIR)/zlib && \ + (cd zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -26826,12 +20299,13 @@ maintainer-clean-zlib: @[ -f ./zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in zlib" ; \ - (cd $(HOST_SUBDIR)/zlib && \ + (cd zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -26842,65 +20316,57 @@ maintainer-clean-zlib: @endif zlib - .PHONY: configure-gdb maybe-configure-gdb maybe-configure-gdb: @if gdb maybe-configure-gdb: configure-gdb -configure-gdb: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-gdb: + @test ! -f gdb/Makefile || exit 0; \ + [ -d gdb ] || mkdir gdb; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gdb/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdb ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/gdb; \ - cd "$(HOST_SUBDIR)/gdb" || exit 1; \ + echo Configuring in gdb; \ + cd gdb || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gdb/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gdb"; \ + libsrcdir="$$s/gdb";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gdb"; \ + libsrcdir="$$s/gdb";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gdb"; \ - libsrcdir="$$s/gdb"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif gdb - - - - .PHONY: all-gdb maybe-all-gdb maybe-all-gdb: @if gdb -TARGET-gdb=all maybe-all-gdb: all-gdb all-gdb: configure-gdb - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gdb && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-gdb)) + (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all) @endif gdb - - - .PHONY: check-gdb maybe-check-gdb maybe-check-gdb: @if gdb maybe-check-gdb: check-gdb check-gdb: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gdb && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check) + (cd gdb && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) check) @endif gdb @@ -26910,12 +20376,11 @@ maybe-install-gdb: maybe-install-gdb: install-gdb install-gdb: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gdb && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) + (cd gdb && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) install) @endif gdb @@ -26928,16 +20393,16 @@ maybe-info-gdb: info-gdb info-gdb: \ configure-gdb - @: $(MAKE); $(unstage) @[ -f ./gdb/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in gdb" ; \ - (cd $(HOST_SUBDIR)/gdb && \ + (cd gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -26954,16 +20419,16 @@ maybe-dvi-gdb: dvi-gdb dvi-gdb: \ configure-gdb - @: $(MAKE); $(unstage) @[ -f ./gdb/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in gdb" ; \ - (cd $(HOST_SUBDIR)/gdb && \ + (cd gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -26973,32 +20438,6 @@ dvi-gdb: \ @endif gdb -.PHONY: maybe-html-gdb html-gdb -maybe-html-gdb: -@if gdb -maybe-html-gdb: html-gdb - -html-gdb: \ - configure-gdb - @: $(MAKE); $(unstage) - @[ -f ./gdb/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in gdb" ; \ - (cd $(HOST_SUBDIR)/gdb && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif gdb - .PHONY: maybe-TAGS-gdb TAGS-gdb maybe-TAGS-gdb: @if gdb @@ -27006,16 +20445,16 @@ maybe-TAGS-gdb: TAGS-gdb TAGS-gdb: \ configure-gdb - @: $(MAKE); $(unstage) @[ -f ./gdb/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in gdb" ; \ - (cd $(HOST_SUBDIR)/gdb && \ + (cd gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27033,16 +20472,16 @@ maybe-install-info-gdb: install-info-gdb install-info-gdb: \ configure-gdb \ info-gdb - @: $(MAKE); $(unstage) @[ -f ./gdb/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in gdb" ; \ - (cd $(HOST_SUBDIR)/gdb && \ + (cd gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27059,16 +20498,16 @@ maybe-installcheck-gdb: installcheck-gdb installcheck-gdb: \ configure-gdb - @: $(MAKE); $(unstage) @[ -f ./gdb/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in gdb" ; \ - (cd $(HOST_SUBDIR)/gdb && \ + (cd gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27084,16 +20523,16 @@ maybe-mostlyclean-gdb: maybe-mostlyclean-gdb: mostlyclean-gdb mostlyclean-gdb: - @: $(MAKE); $(unstage) @[ -f ./gdb/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in gdb" ; \ - (cd $(HOST_SUBDIR)/gdb && \ + (cd gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27109,16 +20548,16 @@ maybe-clean-gdb: maybe-clean-gdb: clean-gdb clean-gdb: - @: $(MAKE); $(unstage) @[ -f ./gdb/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in gdb" ; \ - (cd $(HOST_SUBDIR)/gdb && \ + (cd gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27134,16 +20573,16 @@ maybe-distclean-gdb: maybe-distclean-gdb: distclean-gdb distclean-gdb: - @: $(MAKE); $(unstage) @[ -f ./gdb/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in gdb" ; \ - (cd $(HOST_SUBDIR)/gdb && \ + (cd gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27159,16 +20598,16 @@ maybe-maintainer-clean-gdb: maybe-maintainer-clean-gdb: maintainer-clean-gdb maintainer-clean-gdb: - @: $(MAKE); $(unstage) @[ -f ./gdb/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in gdb" ; \ - (cd $(HOST_SUBDIR)/gdb && \ + (cd gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27179,65 +20618,57 @@ maintainer-clean-gdb: @endif gdb - .PHONY: configure-expect maybe-configure-expect maybe-configure-expect: @if expect maybe-configure-expect: configure-expect -configure-expect: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-expect: + @test ! -f expect/Makefile || exit 0; \ + [ -d expect ] || mkdir expect; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/expect/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/expect ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/expect; \ - cd "$(HOST_SUBDIR)/expect" || exit 1; \ + echo Configuring in expect; \ + cd expect || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/expect/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/expect"; \ + libsrcdir="$$s/expect";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/expect"; \ + libsrcdir="$$s/expect";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/expect"; \ - libsrcdir="$$s/expect"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif expect - - - - .PHONY: all-expect maybe-all-expect maybe-all-expect: @if expect -TARGET-expect=all maybe-all-expect: all-expect all-expect: configure-expect - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/expect && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-expect)) + (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all) @endif expect - - - .PHONY: check-expect maybe-check-expect maybe-check-expect: @if expect maybe-check-expect: check-expect check-expect: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/expect && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check) + (cd expect && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) check) @endif expect @@ -27247,12 +20678,11 @@ maybe-install-expect: maybe-install-expect: install-expect install-expect: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/expect && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) + (cd expect && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) install) @endif expect @@ -27265,16 +20695,16 @@ maybe-info-expect: info-expect info-expect: \ configure-expect - @: $(MAKE); $(unstage) @[ -f ./expect/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in expect" ; \ - (cd $(HOST_SUBDIR)/expect && \ + (cd expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27291,16 +20721,16 @@ maybe-dvi-expect: dvi-expect dvi-expect: \ configure-expect - @: $(MAKE); $(unstage) @[ -f ./expect/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in expect" ; \ - (cd $(HOST_SUBDIR)/expect && \ + (cd expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27310,32 +20740,6 @@ dvi-expect: \ @endif expect -.PHONY: maybe-html-expect html-expect -maybe-html-expect: -@if expect -maybe-html-expect: html-expect - -html-expect: \ - configure-expect - @: $(MAKE); $(unstage) - @[ -f ./expect/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in expect" ; \ - (cd $(HOST_SUBDIR)/expect && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif expect - .PHONY: maybe-TAGS-expect TAGS-expect maybe-TAGS-expect: @if expect @@ -27343,16 +20747,16 @@ maybe-TAGS-expect: TAGS-expect TAGS-expect: \ configure-expect - @: $(MAKE); $(unstage) @[ -f ./expect/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in expect" ; \ - (cd $(HOST_SUBDIR)/expect && \ + (cd expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27370,16 +20774,16 @@ maybe-install-info-expect: install-info-expect install-info-expect: \ configure-expect \ info-expect - @: $(MAKE); $(unstage) @[ -f ./expect/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in expect" ; \ - (cd $(HOST_SUBDIR)/expect && \ + (cd expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27396,16 +20800,16 @@ maybe-installcheck-expect: installcheck-expect installcheck-expect: \ configure-expect - @: $(MAKE); $(unstage) @[ -f ./expect/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in expect" ; \ - (cd $(HOST_SUBDIR)/expect && \ + (cd expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27421,16 +20825,16 @@ maybe-mostlyclean-expect: maybe-mostlyclean-expect: mostlyclean-expect mostlyclean-expect: - @: $(MAKE); $(unstage) @[ -f ./expect/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in expect" ; \ - (cd $(HOST_SUBDIR)/expect && \ + (cd expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27446,16 +20850,16 @@ maybe-clean-expect: maybe-clean-expect: clean-expect clean-expect: - @: $(MAKE); $(unstage) @[ -f ./expect/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in expect" ; \ - (cd $(HOST_SUBDIR)/expect && \ + (cd expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27471,16 +20875,16 @@ maybe-distclean-expect: maybe-distclean-expect: distclean-expect distclean-expect: - @: $(MAKE); $(unstage) @[ -f ./expect/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in expect" ; \ - (cd $(HOST_SUBDIR)/expect && \ + (cd expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27496,16 +20900,16 @@ maybe-maintainer-clean-expect: maybe-maintainer-clean-expect: maintainer-clean-expect maintainer-clean-expect: - @: $(MAKE); $(unstage) @[ -f ./expect/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in expect" ; \ - (cd $(HOST_SUBDIR)/expect && \ + (cd expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27516,65 +20920,57 @@ maintainer-clean-expect: @endif expect - .PHONY: configure-guile maybe-configure-guile maybe-configure-guile: @if guile maybe-configure-guile: configure-guile -configure-guile: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-guile: + @test ! -f guile/Makefile || exit 0; \ + [ -d guile ] || mkdir guile; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/guile/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/guile ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/guile; \ - cd "$(HOST_SUBDIR)/guile" || exit 1; \ + echo Configuring in guile; \ + cd guile || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/guile/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/guile"; \ + libsrcdir="$$s/guile";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/guile"; \ + libsrcdir="$$s/guile";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/guile"; \ - libsrcdir="$$s/guile"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif guile - - - - .PHONY: all-guile maybe-all-guile maybe-all-guile: @if guile -TARGET-guile=all maybe-all-guile: all-guile all-guile: configure-guile - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/guile && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-guile)) + (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all) @endif guile - - - .PHONY: check-guile maybe-check-guile maybe-check-guile: @if guile maybe-check-guile: check-guile check-guile: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/guile && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check) + (cd guile && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) check) @endif guile @@ -27584,12 +20980,11 @@ maybe-install-guile: maybe-install-guile: install-guile install-guile: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/guile && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) + (cd guile && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) install) @endif guile @@ -27602,16 +20997,16 @@ maybe-info-guile: info-guile info-guile: \ configure-guile - @: $(MAKE); $(unstage) @[ -f ./guile/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in guile" ; \ - (cd $(HOST_SUBDIR)/guile && \ + (cd guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27628,16 +21023,16 @@ maybe-dvi-guile: dvi-guile dvi-guile: \ configure-guile - @: $(MAKE); $(unstage) @[ -f ./guile/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in guile" ; \ - (cd $(HOST_SUBDIR)/guile && \ + (cd guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27647,32 +21042,6 @@ dvi-guile: \ @endif guile -.PHONY: maybe-html-guile html-guile -maybe-html-guile: -@if guile -maybe-html-guile: html-guile - -html-guile: \ - configure-guile - @: $(MAKE); $(unstage) - @[ -f ./guile/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in guile" ; \ - (cd $(HOST_SUBDIR)/guile && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif guile - .PHONY: maybe-TAGS-guile TAGS-guile maybe-TAGS-guile: @if guile @@ -27680,16 +21049,16 @@ maybe-TAGS-guile: TAGS-guile TAGS-guile: \ configure-guile - @: $(MAKE); $(unstage) @[ -f ./guile/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in guile" ; \ - (cd $(HOST_SUBDIR)/guile && \ + (cd guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27707,16 +21076,16 @@ maybe-install-info-guile: install-info-guile install-info-guile: \ configure-guile \ info-guile - @: $(MAKE); $(unstage) @[ -f ./guile/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in guile" ; \ - (cd $(HOST_SUBDIR)/guile && \ + (cd guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27733,16 +21102,16 @@ maybe-installcheck-guile: installcheck-guile installcheck-guile: \ configure-guile - @: $(MAKE); $(unstage) @[ -f ./guile/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in guile" ; \ - (cd $(HOST_SUBDIR)/guile && \ + (cd guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27758,16 +21127,16 @@ maybe-mostlyclean-guile: maybe-mostlyclean-guile: mostlyclean-guile mostlyclean-guile: - @: $(MAKE); $(unstage) @[ -f ./guile/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in guile" ; \ - (cd $(HOST_SUBDIR)/guile && \ + (cd guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27783,16 +21152,16 @@ maybe-clean-guile: maybe-clean-guile: clean-guile clean-guile: - @: $(MAKE); $(unstage) @[ -f ./guile/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in guile" ; \ - (cd $(HOST_SUBDIR)/guile && \ + (cd guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27808,16 +21177,16 @@ maybe-distclean-guile: maybe-distclean-guile: distclean-guile distclean-guile: - @: $(MAKE); $(unstage) @[ -f ./guile/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in guile" ; \ - (cd $(HOST_SUBDIR)/guile && \ + (cd guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27833,16 +21202,16 @@ maybe-maintainer-clean-guile: maybe-maintainer-clean-guile: maintainer-clean-guile maintainer-clean-guile: - @: $(MAKE); $(unstage) @[ -f ./guile/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in guile" ; \ - (cd $(HOST_SUBDIR)/guile && \ + (cd guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27853,65 +21222,57 @@ maintainer-clean-guile: @endif guile - .PHONY: configure-tk maybe-configure-tk maybe-configure-tk: @if tk maybe-configure-tk: configure-tk -configure-tk: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-tk: + @test ! -f tk/Makefile || exit 0; \ + [ -d tk ] || mkdir tk; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/tk/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tk ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/tk; \ - cd "$(HOST_SUBDIR)/tk" || exit 1; \ + echo Configuring in tk; \ + cd tk || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/tk/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/tk"; \ + libsrcdir="$$s/tk";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/tk"; \ + libsrcdir="$$s/tk";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/tk"; \ - libsrcdir="$$s/tk"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif tk - - - - .PHONY: all-tk maybe-all-tk maybe-all-tk: @if tk -TARGET-tk=all maybe-all-tk: all-tk all-tk: configure-tk - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/tk && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-tk)) + (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all) @endif tk - - - .PHONY: check-tk maybe-check-tk maybe-check-tk: @if tk maybe-check-tk: check-tk check-tk: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/tk && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check) + (cd tk && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) check) @endif tk @@ -27921,12 +21282,11 @@ maybe-install-tk: maybe-install-tk: install-tk install-tk: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/tk && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) + (cd tk && $(MAKE) $(FLAGS_TO_PASS)$(X11_FLAGS_TO_PASS) install) @endif tk @@ -27939,16 +21299,16 @@ maybe-info-tk: info-tk info-tk: \ configure-tk - @: $(MAKE); $(unstage) @[ -f ./tk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in tk" ; \ - (cd $(HOST_SUBDIR)/tk && \ + (cd tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27965,16 +21325,16 @@ maybe-dvi-tk: dvi-tk dvi-tk: \ configure-tk - @: $(MAKE); $(unstage) @[ -f ./tk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in tk" ; \ - (cd $(HOST_SUBDIR)/tk && \ + (cd tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -27984,32 +21344,6 @@ dvi-tk: \ @endif tk -.PHONY: maybe-html-tk html-tk -maybe-html-tk: -@if tk -maybe-html-tk: html-tk - -html-tk: \ - configure-tk - @: $(MAKE); $(unstage) - @[ -f ./tk/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in tk" ; \ - (cd $(HOST_SUBDIR)/tk && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif tk - .PHONY: maybe-TAGS-tk TAGS-tk maybe-TAGS-tk: @if tk @@ -28017,16 +21351,16 @@ maybe-TAGS-tk: TAGS-tk TAGS-tk: \ configure-tk - @: $(MAKE); $(unstage) @[ -f ./tk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in tk" ; \ - (cd $(HOST_SUBDIR)/tk && \ + (cd tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -28044,16 +21378,16 @@ maybe-install-info-tk: install-info-tk install-info-tk: \ configure-tk \ info-tk - @: $(MAKE); $(unstage) @[ -f ./tk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in tk" ; \ - (cd $(HOST_SUBDIR)/tk && \ + (cd tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -28070,16 +21404,16 @@ maybe-installcheck-tk: installcheck-tk installcheck-tk: \ configure-tk - @: $(MAKE); $(unstage) @[ -f ./tk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in tk" ; \ - (cd $(HOST_SUBDIR)/tk && \ + (cd tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -28095,16 +21429,16 @@ maybe-mostlyclean-tk: maybe-mostlyclean-tk: mostlyclean-tk mostlyclean-tk: - @: $(MAKE); $(unstage) @[ -f ./tk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in tk" ; \ - (cd $(HOST_SUBDIR)/tk && \ + (cd tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -28120,16 +21454,16 @@ maybe-clean-tk: maybe-clean-tk: clean-tk clean-tk: - @: $(MAKE); $(unstage) @[ -f ./tk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in tk" ; \ - (cd $(HOST_SUBDIR)/tk && \ + (cd tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -28145,16 +21479,16 @@ maybe-distclean-tk: maybe-distclean-tk: distclean-tk distclean-tk: - @: $(MAKE); $(unstage) @[ -f ./tk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in tk" ; \ - (cd $(HOST_SUBDIR)/tk && \ + (cd tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -28170,16 +21504,16 @@ maybe-maintainer-clean-tk: maybe-maintainer-clean-tk: maintainer-clean-tk maintainer-clean-tk: - @: $(MAKE); $(unstage) @[ -f ./tk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in tk" ; \ - (cd $(HOST_SUBDIR)/tk && \ + (cd tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -28190,53 +21524,46 @@ maintainer-clean-tk: @endif tk - .PHONY: configure-libtermcap maybe-configure-libtermcap maybe-configure-libtermcap: @if libtermcap maybe-configure-libtermcap: configure-libtermcap -configure-libtermcap: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-libtermcap: + @test ! -f libtermcap/Makefile || exit 0; \ + [ -d libtermcap ] || mkdir libtermcap; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/libtermcap/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtermcap ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/libtermcap; \ - cd "$(HOST_SUBDIR)/libtermcap" || exit 1; \ + echo Configuring in libtermcap; \ + cd libtermcap || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libtermcap/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/libtermcap"; \ + libsrcdir="$$s/libtermcap";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/libtermcap"; \ + libsrcdir="$$s/libtermcap";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libtermcap"; \ - libsrcdir="$$s/libtermcap"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif libtermcap - - - - .PHONY: all-libtermcap maybe-all-libtermcap maybe-all-libtermcap: @if libtermcap -TARGET-libtermcap=all maybe-all-libtermcap: all-libtermcap all-libtermcap: configure-libtermcap - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/libtermcap && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libtermcap)) + (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS) all) @endif libtermcap - - - .PHONY: check-libtermcap maybe-check-libtermcap maybe-check-libtermcap: @if libtermcap @@ -28252,12 +21579,11 @@ maybe-install-libtermcap: maybe-install-libtermcap: install-libtermcap install-libtermcap: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/libtermcap && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS) install) @endif libtermcap @@ -28270,16 +21596,16 @@ maybe-info-libtermcap: info-libtermcap info-libtermcap: \ configure-libtermcap - @: $(MAKE); $(unstage) @[ -f ./libtermcap/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in libtermcap" ; \ - (cd $(HOST_SUBDIR)/libtermcap && \ + (cd libtermcap && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -28296,16 +21622,16 @@ maybe-dvi-libtermcap: dvi-libtermcap dvi-libtermcap: \ configure-libtermcap - @: $(MAKE); $(unstage) @[ -f ./libtermcap/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in libtermcap" ; \ - (cd $(HOST_SUBDIR)/libtermcap && \ + (cd libtermcap && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -28315,32 +21641,6 @@ dvi-libtermcap: \ @endif libtermcap -.PHONY: maybe-html-libtermcap html-libtermcap -maybe-html-libtermcap: -@if libtermcap -maybe-html-libtermcap: html-libtermcap - -html-libtermcap: \ - configure-libtermcap - @: $(MAKE); $(unstage) - @[ -f ./libtermcap/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in libtermcap" ; \ - (cd $(HOST_SUBDIR)/libtermcap && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif libtermcap - .PHONY: maybe-TAGS-libtermcap TAGS-libtermcap maybe-TAGS-libtermcap: @if libtermcap @@ -28348,16 +21648,16 @@ maybe-TAGS-libtermcap: TAGS-libtermcap TAGS-libtermcap: \ configure-libtermcap - @: $(MAKE); $(unstage) @[ -f ./libtermcap/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in libtermcap" ; \ - (cd $(HOST_SUBDIR)/libtermcap && \ + (cd libtermcap && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -28375,16 +21675,16 @@ maybe-install-info-libtermcap: install-info-libtermcap install-info-libtermcap: \ configure-libtermcap \ info-libtermcap - @: $(MAKE); $(unstage) @[ -f ./libtermcap/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in libtermcap" ; \ - (cd $(HOST_SUBDIR)/libtermcap && \ + (cd libtermcap && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -28401,16 +21701,16 @@ maybe-installcheck-libtermcap: installcheck-libtermcap installcheck-libtermcap: \ configure-libtermcap - @: $(MAKE); $(unstage) @[ -f ./libtermcap/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in libtermcap" ; \ - (cd $(HOST_SUBDIR)/libtermcap && \ + (cd libtermcap && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -28461,53 +21761,46 @@ maintainer-clean-libtermcap: @endif libtermcap - .PHONY: configure-utils maybe-configure-utils maybe-configure-utils: @if utils maybe-configure-utils: configure-utils -configure-utils: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ +configure-utils: + @test ! -f utils/Makefile || exit 0; \ + [ -d utils ] || mkdir utils; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/utils/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/utils ; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/utils; \ - cd "$(HOST_SUBDIR)/utils" || exit 1; \ + echo Configuring in utils; \ + cd utils || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/utils/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/utils"; \ + libsrcdir="$$s/utils";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/utils"; \ + libsrcdir="$$s/utils";; \ esac; \ - srcdiroption="--srcdir=$${topdir}/utils"; \ - libsrcdir="$$s/utils"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif utils - - - - .PHONY: all-utils maybe-all-utils maybe-all-utils: @if utils -TARGET-utils=all maybe-all-utils: all-utils all-utils: configure-utils - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/utils && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-utils)) + (cd utils && $(MAKE) $(FLAGS_TO_PASS) all) @endif utils - - - .PHONY: check-utils maybe-check-utils maybe-check-utils: @if utils @@ -28523,12 +21816,11 @@ maybe-install-utils: maybe-install-utils: install-utils install-utils: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/utils && \ - $(MAKE) $(FLAGS_TO_PASS) install) + (cd utils && $(MAKE) $(FLAGS_TO_PASS) install) @endif utils @@ -28541,16 +21833,16 @@ maybe-info-utils: info-utils info-utils: \ configure-utils - @: $(MAKE); $(unstage) @[ -f ./utils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + (cd utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -28567,16 +21859,16 @@ maybe-dvi-utils: dvi-utils dvi-utils: \ configure-utils - @: $(MAKE); $(unstage) @[ -f ./utils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + (cd utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -28586,32 +21878,6 @@ dvi-utils: \ @endif utils -.PHONY: maybe-html-utils html-utils -maybe-html-utils: -@if utils -maybe-html-utils: html-utils - -html-utils: \ - configure-utils - @: $(MAKE); $(unstage) - @[ -f ./utils/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif utils - .PHONY: maybe-TAGS-utils TAGS-utils maybe-TAGS-utils: @if utils @@ -28619,16 +21885,16 @@ maybe-TAGS-utils: TAGS-utils TAGS-utils: \ configure-utils - @: $(MAKE); $(unstage) @[ -f ./utils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + (cd utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -28646,16 +21912,16 @@ maybe-install-info-utils: install-info-utils install-info-utils: \ configure-utils \ info-utils - @: $(MAKE); $(unstage) @[ -f ./utils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + (cd utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -28672,16 +21938,16 @@ maybe-installcheck-utils: installcheck-utils installcheck-utils: \ configure-utils - @: $(MAKE); $(unstage) @[ -f ./utils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + (cd utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -28697,16 +21963,16 @@ maybe-mostlyclean-utils: maybe-mostlyclean-utils: mostlyclean-utils mostlyclean-utils: - @: $(MAKE); $(unstage) @[ -f ./utils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + (cd utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -28722,16 +21988,16 @@ maybe-clean-utils: maybe-clean-utils: clean-utils clean-utils: - @: $(MAKE); $(unstage) @[ -f ./utils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + (cd utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -28747,16 +22013,16 @@ maybe-distclean-utils: maybe-distclean-utils: distclean-utils distclean-utils: - @: $(MAKE); $(unstage) @[ -f ./utils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + (cd utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -28772,16 +22038,16 @@ maybe-maintainer-clean-utils: maybe-maintainer-clean-utils: maintainer-clean-utils maintainer-clean-utils: - @: $(MAKE); $(unstage) @[ -f ./utils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + (cd utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -28793,420 +22059,71 @@ maintainer-clean-utils: -.PHONY: configure-gnattools maybe-configure-gnattools -maybe-configure-gnattools: -@if gnattools -maybe-configure-gnattools: configure-gnattools -configure-gnattools: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools ; \ - $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/gnattools; \ - cd "$(HOST_SUBDIR)/gnattools" || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gnattools/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/gnattools"; \ - libsrcdir="$$s/gnattools"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - || exit 1 -@endif gnattools - - - - - -.PHONY: all-gnattools maybe-all-gnattools -maybe-all-gnattools: -@if gnattools -TARGET-gnattools=all -maybe-all-gnattools: all-gnattools -all-gnattools: configure-gnattools - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gnattools && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gnattools)) -@endif gnattools - - - - -.PHONY: check-gnattools maybe-check-gnattools -maybe-check-gnattools: -@if gnattools -maybe-check-gnattools: check-gnattools - -check-gnattools: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gnattools && \ - $(MAKE) $(FLAGS_TO_PASS) check) - -@endif gnattools - -.PHONY: install-gnattools maybe-install-gnattools -maybe-install-gnattools: -@if gnattools -maybe-install-gnattools: install-gnattools - -install-gnattools: installdirs - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gnattools && \ - $(MAKE) $(FLAGS_TO_PASS) install) - -@endif gnattools - -# Other targets (info, dvi, etc.) - -.PHONY: maybe-info-gnattools info-gnattools -maybe-info-gnattools: -@if gnattools -maybe-info-gnattools: info-gnattools - -info-gnattools: \ - configure-gnattools - @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing info in gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - info) \ - || exit 1 - -@endif gnattools - -.PHONY: maybe-dvi-gnattools dvi-gnattools -maybe-dvi-gnattools: -@if gnattools -maybe-dvi-gnattools: dvi-gnattools - -dvi-gnattools: \ - configure-gnattools - @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing dvi in gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - dvi) \ - || exit 1 - -@endif gnattools - -.PHONY: maybe-html-gnattools html-gnattools -maybe-html-gnattools: -@if gnattools -maybe-html-gnattools: html-gnattools - -html-gnattools: \ - configure-gnattools - @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif gnattools - -.PHONY: maybe-TAGS-gnattools TAGS-gnattools -maybe-TAGS-gnattools: -@if gnattools -maybe-TAGS-gnattools: TAGS-gnattools - -TAGS-gnattools: \ - configure-gnattools - @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing TAGS in gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - TAGS) \ - || exit 1 - -@endif gnattools - -.PHONY: maybe-install-info-gnattools install-info-gnattools -maybe-install-info-gnattools: -@if gnattools -maybe-install-info-gnattools: install-info-gnattools - -install-info-gnattools: \ - configure-gnattools \ - info-gnattools - @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing install-info in gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - install-info) \ - || exit 1 - -@endif gnattools - -.PHONY: maybe-installcheck-gnattools installcheck-gnattools -maybe-installcheck-gnattools: -@if gnattools -maybe-installcheck-gnattools: installcheck-gnattools - -installcheck-gnattools: \ - configure-gnattools - @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing installcheck in gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - installcheck) \ - || exit 1 - -@endif gnattools - -.PHONY: maybe-mostlyclean-gnattools mostlyclean-gnattools -maybe-mostlyclean-gnattools: -@if gnattools -maybe-mostlyclean-gnattools: mostlyclean-gnattools - -mostlyclean-gnattools: - @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing mostlyclean in gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - mostlyclean) \ - || exit 1 - -@endif gnattools - -.PHONY: maybe-clean-gnattools clean-gnattools -maybe-clean-gnattools: -@if gnattools -maybe-clean-gnattools: clean-gnattools - -clean-gnattools: - @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing clean in gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - clean) \ - || exit 1 - -@endif gnattools - -.PHONY: maybe-distclean-gnattools distclean-gnattools -maybe-distclean-gnattools: -@if gnattools -maybe-distclean-gnattools: distclean-gnattools - -distclean-gnattools: - @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing distclean in gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - distclean) \ - || exit 1 - -@endif gnattools - -.PHONY: maybe-maintainer-clean-gnattools maintainer-clean-gnattools -maybe-maintainer-clean-gnattools: -@if gnattools -maybe-maintainer-clean-gnattools: maintainer-clean-gnattools - -maintainer-clean-gnattools: - @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing maintainer-clean in gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - maintainer-clean) \ - || exit 1 - -@endif gnattools - - - # --------------------------------------- # Modules which run on the target machine # --------------------------------------- - - - .PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3: @if target-libstdc++-v3 maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3 -configure-target-libstdc++-v3: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for libstdc++-v3..."; \ + +# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +$(TARGET_SUBDIR)/libstdc++-v3/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ + rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || : ; \ + cp multilib.out $(TARGET_SUBDIR)/libstdc++-v3/multilib.out + +configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out + @test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \ cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(TARGET_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \ - libsrcdir="$$s/libstdc++-v3"; \ + srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \ + libsrcdir="$$s/libstdc++-v3"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)" \ || exit 1 @endif target-libstdc++-v3 - - - - .PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3 maybe-all-target-libstdc++-v3: @if target-libstdc++-v3 TARGET-target-libstdc++-v3=all maybe-all-target-libstdc++-v3: all-target-libstdc++-v3 all-target-libstdc++-v3: configure-target-libstdc++-v3 - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' $(TARGET-target-libstdc++-v3)) + $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' $(TARGET-target-libstdc++-v3)) @endif target-libstdc++-v3 - - - - .PHONY: check-target-libstdc++-v3 maybe-check-target-libstdc++-v3 maybe-check-target-libstdc++-v3: @if target-libstdc++-v3 maybe-check-target-libstdc++-v3: check-target-libstdc++-v3 check-target-libstdc++-v3: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' check) @@ -29219,9 +22136,9 @@ maybe-install-target-libstdc++-v3: maybe-install-target-libstdc++-v3: install-target-libstdc++-v3 install-target-libstdc++-v3: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -29237,10 +22154,10 @@ maybe-info-target-libstdc++-v3: info-target-libstdc++-v3 info-target-libstdc++-v3: \ configure-target-libstdc++-v3 - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/libstdc++-v3" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -29263,10 +22180,10 @@ maybe-dvi-target-libstdc++-v3: dvi-target-libstdc++-v3 dvi-target-libstdc++-v3: \ configure-target-libstdc++-v3 - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/libstdc++-v3" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -29282,32 +22199,6 @@ dvi-target-libstdc++-v3: \ @endif target-libstdc++-v3 -.PHONY: maybe-html-target-libstdc++-v3 html-target-libstdc++-v3 -maybe-html-target-libstdc++-v3: -@if target-libstdc++-v3 -maybe-html-target-libstdc++-v3: html-target-libstdc++-v3 - -html-target-libstdc++-v3: \ - configure-target-libstdc++-v3 - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libstdc++-v3" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-libstdc++-v3 - .PHONY: maybe-TAGS-target-libstdc++-v3 TAGS-target-libstdc++-v3 maybe-TAGS-target-libstdc++-v3: @if target-libstdc++-v3 @@ -29315,10 +22206,10 @@ maybe-TAGS-target-libstdc++-v3: TAGS-target-libstdc++-v3 TAGS-target-libstdc++-v3: \ configure-target-libstdc++-v3 - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/libstdc++-v3" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -29342,10 +22233,10 @@ maybe-install-info-target-libstdc++-v3: install-info-target-libstdc++-v3 install-info-target-libstdc++-v3: \ configure-target-libstdc++-v3 \ info-target-libstdc++-v3 - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/libstdc++-v3" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -29368,10 +22259,10 @@ maybe-installcheck-target-libstdc++-v3: installcheck-target-libstdc++-v3 installcheck-target-libstdc++-v3: \ configure-target-libstdc++-v3 - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/libstdc++-v3" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -29393,10 +22284,10 @@ maybe-mostlyclean-target-libstdc++-v3: maybe-mostlyclean-target-libstdc++-v3: mostlyclean-target-libstdc++-v3 mostlyclean-target-libstdc++-v3: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -29418,10 +22309,10 @@ maybe-clean-target-libstdc++-v3: maybe-clean-target-libstdc++-v3: clean-target-libstdc++-v3 clean-target-libstdc++-v3: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -29443,10 +22334,10 @@ maybe-distclean-target-libstdc++-v3: maybe-distclean-target-libstdc++-v3: distclean-target-libstdc++-v3 distclean-target-libstdc++-v3: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -29468,10 +22359,10 @@ maybe-maintainer-clean-target-libstdc++-v3: maybe-maintainer-clean-target-libstdc++-v3: maintainer-clean-target-libstdc++-v3 maintainer-clean-target-libstdc++-v3: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -29488,79 +22379,67 @@ maintainer-clean-target-libstdc++-v3: @endif target-libstdc++-v3 - - - .PHONY: configure-target-libmudflap maybe-configure-target-libmudflap maybe-configure-target-libmudflap: @if target-libmudflap maybe-configure-target-libmudflap: configure-target-libmudflap -configure-target-libmudflap: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for libmudflap..."; \ + +# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +$(TARGET_SUBDIR)/libmudflap/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmudflap/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libmudflap/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libmudflap/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libmudflap/Makefile; \ - mv $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libmudflap/Makefile || exit 0; \ + rm -f $(TARGET_SUBDIR)/libmudflap/Makefile || : ; \ + cp multilib.out $(TARGET_SUBDIR)/libmudflap/multilib.out + +configure-target-libmudflap: $(TARGET_SUBDIR)/libmudflap/multilib.out + @test ! -f $(TARGET_SUBDIR)/libmudflap/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libmudflap; \ cd "$(TARGET_SUBDIR)/libmudflap" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libmudflap/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(TARGET_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libmudflap"; \ - libsrcdir="$$s/libmudflap"; \ + srcdiroption="--srcdir=$${topdir}/libmudflap"; \ + libsrcdir="$$s/libmudflap"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)" \ || exit 1 @endif target-libmudflap - - - - .PHONY: all-target-libmudflap maybe-all-target-libmudflap maybe-all-target-libmudflap: @if target-libmudflap TARGET-target-libmudflap=all maybe-all-target-libmudflap: all-target-libmudflap all-target-libmudflap: configure-target-libmudflap - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libmudflap && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libmudflap)) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libmudflap)) @endif target-libmudflap - - - - .PHONY: check-target-libmudflap maybe-check-target-libmudflap maybe-check-target-libmudflap: @if target-libmudflap maybe-check-target-libmudflap: check-target-libmudflap check-target-libmudflap: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libmudflap && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -29573,9 +22452,9 @@ maybe-install-target-libmudflap: maybe-install-target-libmudflap: install-target-libmudflap install-target-libmudflap: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libmudflap && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -29591,10 +22470,10 @@ maybe-info-target-libmudflap: info-target-libmudflap info-target-libmudflap: \ configure-target-libmudflap - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/libmudflap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -29617,10 +22496,10 @@ maybe-dvi-target-libmudflap: dvi-target-libmudflap dvi-target-libmudflap: \ configure-target-libmudflap - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/libmudflap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -29636,32 +22515,6 @@ dvi-target-libmudflap: \ @endif target-libmudflap -.PHONY: maybe-html-target-libmudflap html-target-libmudflap -maybe-html-target-libmudflap: -@if target-libmudflap -maybe-html-target-libmudflap: html-target-libmudflap - -html-target-libmudflap: \ - configure-target-libmudflap - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libmudflap" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libmudflap && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-libmudflap - .PHONY: maybe-TAGS-target-libmudflap TAGS-target-libmudflap maybe-TAGS-target-libmudflap: @if target-libmudflap @@ -29669,10 +22522,10 @@ maybe-TAGS-target-libmudflap: TAGS-target-libmudflap TAGS-target-libmudflap: \ configure-target-libmudflap - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/libmudflap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -29696,10 +22549,10 @@ maybe-install-info-target-libmudflap: install-info-target-libmudflap install-info-target-libmudflap: \ configure-target-libmudflap \ info-target-libmudflap - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/libmudflap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -29722,10 +22575,10 @@ maybe-installcheck-target-libmudflap: installcheck-target-libmudflap installcheck-target-libmudflap: \ configure-target-libmudflap - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/libmudflap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -29747,10 +22600,10 @@ maybe-mostlyclean-target-libmudflap: maybe-mostlyclean-target-libmudflap: mostlyclean-target-libmudflap mostlyclean-target-libmudflap: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libmudflap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -29772,10 +22625,10 @@ maybe-clean-target-libmudflap: maybe-clean-target-libmudflap: clean-target-libmudflap clean-target-libmudflap: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/libmudflap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -29797,10 +22650,10 @@ maybe-distclean-target-libmudflap: maybe-distclean-target-libmudflap: distclean-target-libmudflap distclean-target-libmudflap: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/libmudflap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -29822,10 +22675,10 @@ maybe-maintainer-clean-target-libmudflap: maybe-maintainer-clean-target-libmudflap: maintainer-clean-target-libmudflap maintainer-clean-target-libmudflap: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libmudflap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -29842,787 +22695,67 @@ maintainer-clean-target-libmudflap: @endif target-libmudflap - - - -.PHONY: configure-target-libssp maybe-configure-target-libssp -maybe-configure-target-libssp: -@if target-libssp -maybe-configure-target-libssp: configure-target-libssp -configure-target-libssp: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for libssp..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libssp/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libssp/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libssp/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libssp/Makefile; \ - mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libssp/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \ - $(NORMAL_TARGET_EXPORTS) \ - echo Configuring in $(TARGET_SUBDIR)/libssp; \ - cd "$(TARGET_SUBDIR)/libssp" || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libssp/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libssp"; \ - libsrcdir="$$s/libssp"; \ - rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - || exit 1 -@endif target-libssp - - - - - -.PHONY: all-target-libssp maybe-all-target-libssp -maybe-all-target-libssp: -@if target-libssp -TARGET-target-libssp=all -maybe-all-target-libssp: all-target-libssp -all-target-libssp: configure-target-libssp - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libssp && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libssp)) -@endif target-libssp - - - - - -.PHONY: check-target-libssp maybe-check-target-libssp -maybe-check-target-libssp: -@if target-libssp -maybe-check-target-libssp: check-target-libssp - -check-target-libssp: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libssp && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) check) - -@endif target-libssp - -.PHONY: install-target-libssp maybe-install-target-libssp -maybe-install-target-libssp: -@if target-libssp -maybe-install-target-libssp: install-target-libssp - -install-target-libssp: installdirs - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libssp && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) install) - -@endif target-libssp - -# Other targets (info, dvi, etc.) - -.PHONY: maybe-info-target-libssp info-target-libssp -maybe-info-target-libssp: -@if target-libssp -maybe-info-target-libssp: info-target-libssp - -info-target-libssp: \ - configure-target-libssp - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libssp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libssp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - info) \ - || exit 1 - -@endif target-libssp - -.PHONY: maybe-dvi-target-libssp dvi-target-libssp -maybe-dvi-target-libssp: -@if target-libssp -maybe-dvi-target-libssp: dvi-target-libssp - -dvi-target-libssp: \ - configure-target-libssp - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libssp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libssp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - dvi) \ - || exit 1 - -@endif target-libssp - -.PHONY: maybe-html-target-libssp html-target-libssp -maybe-html-target-libssp: -@if target-libssp -maybe-html-target-libssp: html-target-libssp - -html-target-libssp: \ - configure-target-libssp - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libssp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libssp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-libssp - -.PHONY: maybe-TAGS-target-libssp TAGS-target-libssp -maybe-TAGS-target-libssp: -@if target-libssp -maybe-TAGS-target-libssp: TAGS-target-libssp - -TAGS-target-libssp: \ - configure-target-libssp - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libssp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libssp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - TAGS) \ - || exit 1 - -@endif target-libssp - -.PHONY: maybe-install-info-target-libssp install-info-target-libssp -maybe-install-info-target-libssp: -@if target-libssp -maybe-install-info-target-libssp: install-info-target-libssp - -install-info-target-libssp: \ - configure-target-libssp \ - info-target-libssp - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libssp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libssp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - install-info) \ - || exit 1 - -@endif target-libssp - -.PHONY: maybe-installcheck-target-libssp installcheck-target-libssp -maybe-installcheck-target-libssp: -@if target-libssp -maybe-installcheck-target-libssp: installcheck-target-libssp - -installcheck-target-libssp: \ - configure-target-libssp - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libssp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libssp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - installcheck) \ - || exit 1 - -@endif target-libssp - -.PHONY: maybe-mostlyclean-target-libssp mostlyclean-target-libssp -maybe-mostlyclean-target-libssp: -@if target-libssp -maybe-mostlyclean-target-libssp: mostlyclean-target-libssp - -mostlyclean-target-libssp: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libssp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libssp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - mostlyclean) \ - || exit 1 - -@endif target-libssp - -.PHONY: maybe-clean-target-libssp clean-target-libssp -maybe-clean-target-libssp: -@if target-libssp -maybe-clean-target-libssp: clean-target-libssp - -clean-target-libssp: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libssp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libssp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - clean) \ - || exit 1 - -@endif target-libssp - -.PHONY: maybe-distclean-target-libssp distclean-target-libssp -maybe-distclean-target-libssp: -@if target-libssp -maybe-distclean-target-libssp: distclean-target-libssp - -distclean-target-libssp: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libssp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libssp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - distclean) \ - || exit 1 - -@endif target-libssp - -.PHONY: maybe-maintainer-clean-target-libssp maintainer-clean-target-libssp -maybe-maintainer-clean-target-libssp: -@if target-libssp -maybe-maintainer-clean-target-libssp: maintainer-clean-target-libssp - -maintainer-clean-target-libssp: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libssp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libssp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - maintainer-clean) \ - || exit 1 - -@endif target-libssp - - - - - -.PHONY: configure-target-libgcc-math maybe-configure-target-libgcc-math -maybe-configure-target-libgcc-math: -@if target-libgcc-math -maybe-configure-target-libgcc-math: configure-target-libgcc-math -configure-target-libgcc-math: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for libgcc-math..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc-math ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc-math/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libgcc-math/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libgcc-math/multilib.tmp $(TARGET_SUBDIR)/libgcc-math/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libgcc-math/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libgcc-math/Makefile; \ - mv $(TARGET_SUBDIR)/libgcc-math/multilib.tmp $(TARGET_SUBDIR)/libgcc-math/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libgcc-math/multilib.tmp $(TARGET_SUBDIR)/libgcc-math/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libgcc-math/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc-math ; \ - $(NORMAL_TARGET_EXPORTS) \ - echo Configuring in $(TARGET_SUBDIR)/libgcc-math; \ - cd "$(TARGET_SUBDIR)/libgcc-math" || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libgcc-math/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libgcc-math"; \ - libsrcdir="$$s/libgcc-math"; \ - rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - || exit 1 -@endif target-libgcc-math - - - - - -.PHONY: all-target-libgcc-math maybe-all-target-libgcc-math -maybe-all-target-libgcc-math: -@if target-libgcc-math -TARGET-target-libgcc-math=all -maybe-all-target-libgcc-math: all-target-libgcc-math -all-target-libgcc-math: configure-target-libgcc-math - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgcc-math)) -@endif target-libgcc-math - - - - - -.PHONY: check-target-libgcc-math maybe-check-target-libgcc-math -maybe-check-target-libgcc-math: -@if target-libgcc-math -maybe-check-target-libgcc-math: check-target-libgcc-math - -check-target-libgcc-math: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) check) - -@endif target-libgcc-math - -.PHONY: install-target-libgcc-math maybe-install-target-libgcc-math -maybe-install-target-libgcc-math: -@if target-libgcc-math -maybe-install-target-libgcc-math: install-target-libgcc-math - -install-target-libgcc-math: installdirs - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) install) - -@endif target-libgcc-math - -# Other targets (info, dvi, etc.) - -.PHONY: maybe-info-target-libgcc-math info-target-libgcc-math -maybe-info-target-libgcc-math: -@if target-libgcc-math -maybe-info-target-libgcc-math: info-target-libgcc-math - -info-target-libgcc-math: \ - configure-target-libgcc-math - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libgcc-math" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - info) \ - || exit 1 - -@endif target-libgcc-math - -.PHONY: maybe-dvi-target-libgcc-math dvi-target-libgcc-math -maybe-dvi-target-libgcc-math: -@if target-libgcc-math -maybe-dvi-target-libgcc-math: dvi-target-libgcc-math - -dvi-target-libgcc-math: \ - configure-target-libgcc-math - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libgcc-math" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - dvi) \ - || exit 1 - -@endif target-libgcc-math - -.PHONY: maybe-html-target-libgcc-math html-target-libgcc-math -maybe-html-target-libgcc-math: -@if target-libgcc-math -maybe-html-target-libgcc-math: html-target-libgcc-math - -html-target-libgcc-math: \ - configure-target-libgcc-math - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libgcc-math" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-libgcc-math - -.PHONY: maybe-TAGS-target-libgcc-math TAGS-target-libgcc-math -maybe-TAGS-target-libgcc-math: -@if target-libgcc-math -maybe-TAGS-target-libgcc-math: TAGS-target-libgcc-math - -TAGS-target-libgcc-math: \ - configure-target-libgcc-math - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libgcc-math" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - TAGS) \ - || exit 1 - -@endif target-libgcc-math - -.PHONY: maybe-install-info-target-libgcc-math install-info-target-libgcc-math -maybe-install-info-target-libgcc-math: -@if target-libgcc-math -maybe-install-info-target-libgcc-math: install-info-target-libgcc-math - -install-info-target-libgcc-math: \ - configure-target-libgcc-math \ - info-target-libgcc-math - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libgcc-math" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - install-info) \ - || exit 1 - -@endif target-libgcc-math - -.PHONY: maybe-installcheck-target-libgcc-math installcheck-target-libgcc-math -maybe-installcheck-target-libgcc-math: -@if target-libgcc-math -maybe-installcheck-target-libgcc-math: installcheck-target-libgcc-math - -installcheck-target-libgcc-math: \ - configure-target-libgcc-math - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libgcc-math" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - installcheck) \ - || exit 1 - -@endif target-libgcc-math - -.PHONY: maybe-mostlyclean-target-libgcc-math mostlyclean-target-libgcc-math -maybe-mostlyclean-target-libgcc-math: -@if target-libgcc-math -maybe-mostlyclean-target-libgcc-math: mostlyclean-target-libgcc-math - -mostlyclean-target-libgcc-math: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgcc-math" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - mostlyclean) \ - || exit 1 - -@endif target-libgcc-math - -.PHONY: maybe-clean-target-libgcc-math clean-target-libgcc-math -maybe-clean-target-libgcc-math: -@if target-libgcc-math -maybe-clean-target-libgcc-math: clean-target-libgcc-math - -clean-target-libgcc-math: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libgcc-math" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - clean) \ - || exit 1 - -@endif target-libgcc-math - -.PHONY: maybe-distclean-target-libgcc-math distclean-target-libgcc-math -maybe-distclean-target-libgcc-math: -@if target-libgcc-math -maybe-distclean-target-libgcc-math: distclean-target-libgcc-math - -distclean-target-libgcc-math: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libgcc-math" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - distclean) \ - || exit 1 - -@endif target-libgcc-math - -.PHONY: maybe-maintainer-clean-target-libgcc-math maintainer-clean-target-libgcc-math -maybe-maintainer-clean-target-libgcc-math: -@if target-libgcc-math -maybe-maintainer-clean-target-libgcc-math: maintainer-clean-target-libgcc-math - -maintainer-clean-target-libgcc-math: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgcc-math" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgcc-math && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - maintainer-clean) \ - || exit 1 - -@endif target-libgcc-math - - - - - .PHONY: configure-target-newlib maybe-configure-target-newlib maybe-configure-target-newlib: @if target-newlib maybe-configure-target-newlib: configure-target-newlib -configure-target-newlib: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for newlib..."; \ + +# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +$(TARGET_SUBDIR)/newlib/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/newlib/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/newlib/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/newlib/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/newlib/Makefile; \ - mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \ + rm -f $(TARGET_SUBDIR)/newlib/Makefile || : ; \ + cp multilib.out $(TARGET_SUBDIR)/newlib/multilib.out + +configure-target-newlib: $(TARGET_SUBDIR)/newlib/multilib.out + @test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/newlib; \ cd "$(TARGET_SUBDIR)/newlib" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/newlib/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(TARGET_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/newlib"; \ - libsrcdir="$$s/newlib"; \ + srcdiroption="--srcdir=$${topdir}/newlib"; \ + libsrcdir="$$s/newlib"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)" \ || exit 1 @endif target-newlib - - - - .PHONY: all-target-newlib maybe-all-target-newlib maybe-all-target-newlib: @if target-newlib TARGET-target-newlib=all maybe-all-target-newlib: all-target-newlib all-target-newlib: configure-target-newlib - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/newlib && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-newlib)) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-newlib)) @endif target-newlib - - - - .PHONY: check-target-newlib maybe-check-target-newlib maybe-check-target-newlib: @if target-newlib maybe-check-target-newlib: check-target-newlib check-target-newlib: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/newlib && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -30635,9 +22768,9 @@ maybe-install-target-newlib: maybe-install-target-newlib: install-target-newlib install-target-newlib: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/newlib && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -30653,10 +22786,10 @@ maybe-info-target-newlib: info-target-newlib info-target-newlib: \ configure-target-newlib - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/newlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -30679,10 +22812,10 @@ maybe-dvi-target-newlib: dvi-target-newlib dvi-target-newlib: \ configure-target-newlib - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/newlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -30698,32 +22831,6 @@ dvi-target-newlib: \ @endif target-newlib -.PHONY: maybe-html-target-newlib html-target-newlib -maybe-html-target-newlib: -@if target-newlib -maybe-html-target-newlib: html-target-newlib - -html-target-newlib: \ - configure-target-newlib - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/newlib" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/newlib && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-newlib - .PHONY: maybe-TAGS-target-newlib TAGS-target-newlib maybe-TAGS-target-newlib: @if target-newlib @@ -30731,10 +22838,10 @@ maybe-TAGS-target-newlib: TAGS-target-newlib TAGS-target-newlib: \ configure-target-newlib - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/newlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -30758,10 +22865,10 @@ maybe-install-info-target-newlib: install-info-target-newlib install-info-target-newlib: \ configure-target-newlib \ info-target-newlib - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/newlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -30784,10 +22891,10 @@ maybe-installcheck-target-newlib: installcheck-target-newlib installcheck-target-newlib: \ configure-target-newlib - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/newlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -30809,10 +22916,10 @@ maybe-mostlyclean-target-newlib: maybe-mostlyclean-target-newlib: mostlyclean-target-newlib mostlyclean-target-newlib: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/newlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -30834,10 +22941,10 @@ maybe-clean-target-newlib: maybe-clean-target-newlib: clean-target-newlib clean-target-newlib: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/newlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -30859,10 +22966,10 @@ maybe-distclean-target-newlib: maybe-distclean-target-newlib: distclean-target-newlib distclean-target-newlib: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/newlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -30884,10 +22991,10 @@ maybe-maintainer-clean-target-newlib: maybe-maintainer-clean-target-newlib: maintainer-clean-target-newlib maintainer-clean-target-newlib: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/newlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -30904,79 +23011,67 @@ maintainer-clean-target-newlib: @endif target-newlib - - - .PHONY: configure-target-libgfortran maybe-configure-target-libgfortran maybe-configure-target-libgfortran: @if target-libgfortran maybe-configure-target-libgfortran: configure-target-libgfortran -configure-target-libgfortran: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for libgfortran..."; \ + +# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +$(TARGET_SUBDIR)/libgfortran/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgfortran/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libgfortran/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libgfortran/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libgfortran/Makefile; \ - mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \ + rm -f $(TARGET_SUBDIR)/libgfortran/Makefile || : ; \ + cp multilib.out $(TARGET_SUBDIR)/libgfortran/multilib.out + +configure-target-libgfortran: $(TARGET_SUBDIR)/libgfortran/multilib.out + @test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libgfortran; \ cd "$(TARGET_SUBDIR)/libgfortran" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libgfortran/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(TARGET_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgfortran"; \ - libsrcdir="$$s/libgfortran"; \ + srcdiroption="--srcdir=$${topdir}/libgfortran"; \ + libsrcdir="$$s/libgfortran"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)" \ || exit 1 @endif target-libgfortran - - - - .PHONY: all-target-libgfortran maybe-all-target-libgfortran maybe-all-target-libgfortran: @if target-libgfortran TARGET-target-libgfortran=all maybe-all-target-libgfortran: all-target-libgfortran all-target-libgfortran: configure-target-libgfortran - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgfortran && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgfortran)) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgfortran)) @endif target-libgfortran - - - - .PHONY: check-target-libgfortran maybe-check-target-libgfortran maybe-check-target-libgfortran: @if target-libgfortran maybe-check-target-libgfortran: check-target-libgfortran check-target-libgfortran: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgfortran && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -30989,9 +23084,9 @@ maybe-install-target-libgfortran: maybe-install-target-libgfortran: install-target-libgfortran install-target-libgfortran: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgfortran && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -31007,10 +23102,10 @@ maybe-info-target-libgfortran: info-target-libgfortran info-target-libgfortran: \ configure-target-libgfortran - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/libgfortran" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31033,10 +23128,10 @@ maybe-dvi-target-libgfortran: dvi-target-libgfortran dvi-target-libgfortran: \ configure-target-libgfortran - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/libgfortran" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31052,32 +23147,6 @@ dvi-target-libgfortran: \ @endif target-libgfortran -.PHONY: maybe-html-target-libgfortran html-target-libgfortran -maybe-html-target-libgfortran: -@if target-libgfortran -maybe-html-target-libgfortran: html-target-libgfortran - -html-target-libgfortran: \ - configure-target-libgfortran - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libgfortran" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgfortran && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-libgfortran - .PHONY: maybe-TAGS-target-libgfortran TAGS-target-libgfortran maybe-TAGS-target-libgfortran: @if target-libgfortran @@ -31085,10 +23154,10 @@ maybe-TAGS-target-libgfortran: TAGS-target-libgfortran TAGS-target-libgfortran: \ configure-target-libgfortran - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/libgfortran" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31112,10 +23181,10 @@ maybe-install-info-target-libgfortran: install-info-target-libgfortran install-info-target-libgfortran: \ configure-target-libgfortran \ info-target-libgfortran - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/libgfortran" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31138,10 +23207,10 @@ maybe-installcheck-target-libgfortran: installcheck-target-libgfortran installcheck-target-libgfortran: \ configure-target-libgfortran - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/libgfortran" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31163,10 +23232,10 @@ maybe-mostlyclean-target-libgfortran: maybe-mostlyclean-target-libgfortran: mostlyclean-target-libgfortran mostlyclean-target-libgfortran: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgfortran" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31188,10 +23257,10 @@ maybe-clean-target-libgfortran: maybe-clean-target-libgfortran: clean-target-libgfortran clean-target-libgfortran: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/libgfortran" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31213,10 +23282,10 @@ maybe-distclean-target-libgfortran: maybe-distclean-target-libgfortran: distclean-target-libgfortran distclean-target-libgfortran: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/libgfortran" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31238,10 +23307,10 @@ maybe-maintainer-clean-target-libgfortran: maybe-maintainer-clean-target-libgfortran: maintainer-clean-target-libgfortran maintainer-clean-target-libgfortran: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgfortran" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31258,79 +23327,67 @@ maintainer-clean-target-libgfortran: @endif target-libgfortran - - - .PHONY: configure-target-libobjc maybe-configure-target-libobjc maybe-configure-target-libobjc: @if target-libobjc maybe-configure-target-libobjc: configure-target-libobjc -configure-target-libobjc: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for libobjc..."; \ + +# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +$(TARGET_SUBDIR)/libobjc/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libobjc/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libobjc/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libobjc/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libobjc/Makefile; \ - mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \ + rm -f $(TARGET_SUBDIR)/libobjc/Makefile || : ; \ + cp multilib.out $(TARGET_SUBDIR)/libobjc/multilib.out + +configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/multilib.out + @test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libobjc; \ cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libobjc/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(TARGET_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libobjc"; \ - libsrcdir="$$s/libobjc"; \ + srcdiroption="--srcdir=$${topdir}/libobjc"; \ + libsrcdir="$$s/libobjc"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)" \ || exit 1 @endif target-libobjc - - - - .PHONY: all-target-libobjc maybe-all-target-libobjc maybe-all-target-libobjc: @if target-libobjc TARGET-target-libobjc=all maybe-all-target-libobjc: all-target-libobjc all-target-libobjc: configure-target-libobjc - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libobjc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libobjc)) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libobjc)) @endif target-libobjc - - - - .PHONY: check-target-libobjc maybe-check-target-libobjc maybe-check-target-libobjc: @if target-libobjc maybe-check-target-libobjc: check-target-libobjc check-target-libobjc: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libobjc && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -31343,9 +23400,9 @@ maybe-install-target-libobjc: maybe-install-target-libobjc: install-target-libobjc install-target-libobjc: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libobjc && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -31361,10 +23418,10 @@ maybe-info-target-libobjc: info-target-libobjc info-target-libobjc: \ configure-target-libobjc - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/libobjc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31387,10 +23444,10 @@ maybe-dvi-target-libobjc: dvi-target-libobjc dvi-target-libobjc: \ configure-target-libobjc - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/libobjc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31406,32 +23463,6 @@ dvi-target-libobjc: \ @endif target-libobjc -.PHONY: maybe-html-target-libobjc html-target-libobjc -maybe-html-target-libobjc: -@if target-libobjc -maybe-html-target-libobjc: html-target-libobjc - -html-target-libobjc: \ - configure-target-libobjc - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libobjc" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libobjc && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-libobjc - .PHONY: maybe-TAGS-target-libobjc TAGS-target-libobjc maybe-TAGS-target-libobjc: @if target-libobjc @@ -31439,10 +23470,10 @@ maybe-TAGS-target-libobjc: TAGS-target-libobjc TAGS-target-libobjc: \ configure-target-libobjc - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/libobjc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31466,10 +23497,10 @@ maybe-install-info-target-libobjc: install-info-target-libobjc install-info-target-libobjc: \ configure-target-libobjc \ info-target-libobjc - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/libobjc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31492,10 +23523,10 @@ maybe-installcheck-target-libobjc: installcheck-target-libobjc installcheck-target-libobjc: \ configure-target-libobjc - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/libobjc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31517,10 +23548,10 @@ maybe-mostlyclean-target-libobjc: maybe-mostlyclean-target-libobjc: mostlyclean-target-libobjc mostlyclean-target-libobjc: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libobjc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31542,10 +23573,10 @@ maybe-clean-target-libobjc: maybe-clean-target-libobjc: clean-target-libobjc clean-target-libobjc: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/libobjc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31567,10 +23598,10 @@ maybe-distclean-target-libobjc: maybe-distclean-target-libobjc: distclean-target-libobjc distclean-target-libobjc: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/libobjc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31592,10 +23623,10 @@ maybe-maintainer-clean-target-libobjc: maybe-maintainer-clean-target-libobjc: maintainer-clean-target-libobjc maintainer-clean-target-libobjc: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libobjc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31612,70 +23643,80 @@ maintainer-clean-target-libobjc: @endif target-libobjc - - - .PHONY: configure-target-libtermcap maybe-configure-target-libtermcap maybe-configure-target-libtermcap: @if target-libtermcap maybe-configure-target-libtermcap: configure-target-libtermcap -configure-target-libtermcap: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for libtermcap..."; \ + +# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +$(TARGET_SUBDIR)/libtermcap/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libtermcap/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libtermcap/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libtermcap/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libtermcap/Makefile; \ - mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \ + rm -f $(TARGET_SUBDIR)/libtermcap/Makefile || : ; \ + cp multilib.out $(TARGET_SUBDIR)/libtermcap/multilib.out + +configure-target-libtermcap: $(TARGET_SUBDIR)/libtermcap/multilib.out + @test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libtermcap; \ cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libtermcap/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(TARGET_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libtermcap"; \ - libsrcdir="$$s/libtermcap"; \ + 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 \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ + srcdiroption="--srcdir=$${topdir}/libtermcap"; \ + libsrcdir="$$s/libtermcap"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)" \ || exit 1 @endif target-libtermcap - - - - .PHONY: all-target-libtermcap maybe-all-target-libtermcap maybe-all-target-libtermcap: @if target-libtermcap TARGET-target-libtermcap=all maybe-all-target-libtermcap: all-target-libtermcap all-target-libtermcap: configure-target-libtermcap - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libtermcap && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libtermcap)) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libtermcap)) @endif target-libtermcap - - - - .PHONY: check-target-libtermcap maybe-check-target-libtermcap maybe-check-target-libtermcap: @if target-libtermcap @@ -31692,9 +23733,9 @@ maybe-install-target-libtermcap: maybe-install-target-libtermcap: install-target-libtermcap install-target-libtermcap: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libtermcap && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -31710,10 +23751,10 @@ maybe-info-target-libtermcap: info-target-libtermcap info-target-libtermcap: \ configure-target-libtermcap - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/libtermcap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31736,10 +23777,10 @@ maybe-dvi-target-libtermcap: dvi-target-libtermcap dvi-target-libtermcap: \ configure-target-libtermcap - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/libtermcap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31755,32 +23796,6 @@ dvi-target-libtermcap: \ @endif target-libtermcap -.PHONY: maybe-html-target-libtermcap html-target-libtermcap -maybe-html-target-libtermcap: -@if target-libtermcap -maybe-html-target-libtermcap: html-target-libtermcap - -html-target-libtermcap: \ - configure-target-libtermcap - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libtermcap" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libtermcap && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-libtermcap - .PHONY: maybe-TAGS-target-libtermcap TAGS-target-libtermcap maybe-TAGS-target-libtermcap: @if target-libtermcap @@ -31788,10 +23803,10 @@ maybe-TAGS-target-libtermcap: TAGS-target-libtermcap TAGS-target-libtermcap: \ configure-target-libtermcap - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/libtermcap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31815,10 +23830,10 @@ maybe-install-info-target-libtermcap: install-info-target-libtermcap install-info-target-libtermcap: \ configure-target-libtermcap \ info-target-libtermcap - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/libtermcap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31841,10 +23856,10 @@ maybe-installcheck-target-libtermcap: installcheck-target-libtermcap installcheck-target-libtermcap: \ configure-target-libtermcap - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/libtermcap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -31901,79 +23916,67 @@ maintainer-clean-target-libtermcap: @endif target-libtermcap - - - .PHONY: configure-target-winsup maybe-configure-target-winsup maybe-configure-target-winsup: @if target-winsup maybe-configure-target-winsup: configure-target-winsup -configure-target-winsup: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for winsup..."; \ + +# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +$(TARGET_SUBDIR)/winsup/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/winsup/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/winsup/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/winsup/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/winsup/Makefile; \ - mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \ + rm -f $(TARGET_SUBDIR)/winsup/Makefile || : ; \ + cp multilib.out $(TARGET_SUBDIR)/winsup/multilib.out + +configure-target-winsup: $(TARGET_SUBDIR)/winsup/multilib.out + @test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/winsup; \ cd "$(TARGET_SUBDIR)/winsup" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/winsup/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(TARGET_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/winsup"; \ - libsrcdir="$$s/winsup"; \ + srcdiroption="--srcdir=$${topdir}/winsup"; \ + libsrcdir="$$s/winsup"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)" \ || exit 1 @endif target-winsup - - - - .PHONY: all-target-winsup maybe-all-target-winsup maybe-all-target-winsup: @if target-winsup TARGET-target-winsup=all maybe-all-target-winsup: all-target-winsup all-target-winsup: configure-target-winsup - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/winsup && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-winsup)) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-winsup)) @endif target-winsup - - - - .PHONY: check-target-winsup maybe-check-target-winsup maybe-check-target-winsup: @if target-winsup maybe-check-target-winsup: check-target-winsup check-target-winsup: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/winsup && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -31986,9 +23989,9 @@ maybe-install-target-winsup: maybe-install-target-winsup: install-target-winsup install-target-winsup: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/winsup && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -32004,10 +24007,10 @@ maybe-info-target-winsup: info-target-winsup info-target-winsup: \ configure-target-winsup - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/winsup" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32030,10 +24033,10 @@ maybe-dvi-target-winsup: dvi-target-winsup dvi-target-winsup: \ configure-target-winsup - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/winsup" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32049,32 +24052,6 @@ dvi-target-winsup: \ @endif target-winsup -.PHONY: maybe-html-target-winsup html-target-winsup -maybe-html-target-winsup: -@if target-winsup -maybe-html-target-winsup: html-target-winsup - -html-target-winsup: \ - configure-target-winsup - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/winsup" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/winsup && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-winsup - .PHONY: maybe-TAGS-target-winsup TAGS-target-winsup maybe-TAGS-target-winsup: @if target-winsup @@ -32082,10 +24059,10 @@ maybe-TAGS-target-winsup: TAGS-target-winsup TAGS-target-winsup: \ configure-target-winsup - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/winsup" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32109,10 +24086,10 @@ maybe-install-info-target-winsup: install-info-target-winsup install-info-target-winsup: \ configure-target-winsup \ info-target-winsup - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/winsup" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32135,10 +24112,10 @@ maybe-installcheck-target-winsup: installcheck-target-winsup installcheck-target-winsup: \ configure-target-winsup - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/winsup" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32160,10 +24137,10 @@ maybe-mostlyclean-target-winsup: maybe-mostlyclean-target-winsup: mostlyclean-target-winsup mostlyclean-target-winsup: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/winsup" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32185,10 +24162,10 @@ maybe-clean-target-winsup: maybe-clean-target-winsup: clean-target-winsup clean-target-winsup: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/winsup" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32210,10 +24187,10 @@ maybe-distclean-target-winsup: maybe-distclean-target-winsup: distclean-target-winsup distclean-target-winsup: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/winsup" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32235,10 +24212,10 @@ maybe-maintainer-clean-target-winsup: maybe-maintainer-clean-target-winsup: maintainer-clean-target-winsup maintainer-clean-target-winsup: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/winsup" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32255,70 +24232,58 @@ maintainer-clean-target-winsup: @endif target-winsup - - - .PHONY: configure-target-libgloss maybe-configure-target-libgloss maybe-configure-target-libgloss: @if target-libgloss maybe-configure-target-libgloss: configure-target-libgloss -configure-target-libgloss: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for libgloss..."; \ + +# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +$(TARGET_SUBDIR)/libgloss/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgloss/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libgloss/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libgloss/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libgloss/Makefile; \ - mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \ + rm -f $(TARGET_SUBDIR)/libgloss/Makefile || : ; \ + cp multilib.out $(TARGET_SUBDIR)/libgloss/multilib.out + +configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/multilib.out + @test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libgloss; \ cd "$(TARGET_SUBDIR)/libgloss" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libgloss/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(TARGET_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgloss"; \ - libsrcdir="$$s/libgloss"; \ + srcdiroption="--srcdir=$${topdir}/libgloss"; \ + libsrcdir="$$s/libgloss"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)" \ || exit 1 @endif target-libgloss - - - - .PHONY: all-target-libgloss maybe-all-target-libgloss maybe-all-target-libgloss: @if target-libgloss TARGET-target-libgloss=all maybe-all-target-libgloss: all-target-libgloss all-target-libgloss: configure-target-libgloss - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgloss && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgloss)) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgloss)) @endif target-libgloss - - - - .PHONY: check-target-libgloss maybe-check-target-libgloss maybe-check-target-libgloss: @if target-libgloss @@ -32335,9 +24300,9 @@ maybe-install-target-libgloss: maybe-install-target-libgloss: install-target-libgloss install-target-libgloss: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgloss && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -32353,10 +24318,10 @@ maybe-info-target-libgloss: info-target-libgloss info-target-libgloss: \ configure-target-libgloss - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/libgloss" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32379,10 +24344,10 @@ maybe-dvi-target-libgloss: dvi-target-libgloss dvi-target-libgloss: \ configure-target-libgloss - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/libgloss" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32398,32 +24363,6 @@ dvi-target-libgloss: \ @endif target-libgloss -.PHONY: maybe-html-target-libgloss html-target-libgloss -maybe-html-target-libgloss: -@if target-libgloss -maybe-html-target-libgloss: html-target-libgloss - -html-target-libgloss: \ - configure-target-libgloss - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libgloss" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgloss && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-libgloss - .PHONY: maybe-TAGS-target-libgloss TAGS-target-libgloss maybe-TAGS-target-libgloss: @if target-libgloss @@ -32431,10 +24370,10 @@ maybe-TAGS-target-libgloss: TAGS-target-libgloss TAGS-target-libgloss: \ configure-target-libgloss - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/libgloss" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32458,10 +24397,10 @@ maybe-install-info-target-libgloss: install-info-target-libgloss install-info-target-libgloss: \ configure-target-libgloss \ info-target-libgloss - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/libgloss" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32484,10 +24423,10 @@ maybe-installcheck-target-libgloss: installcheck-target-libgloss installcheck-target-libgloss: \ configure-target-libgloss - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/libgloss" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32509,10 +24448,10 @@ maybe-mostlyclean-target-libgloss: maybe-mostlyclean-target-libgloss: mostlyclean-target-libgloss mostlyclean-target-libgloss: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgloss" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32534,10 +24473,10 @@ maybe-clean-target-libgloss: maybe-clean-target-libgloss: clean-target-libgloss clean-target-libgloss: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/libgloss" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32559,10 +24498,10 @@ maybe-distclean-target-libgloss: maybe-distclean-target-libgloss: distclean-target-libgloss distclean-target-libgloss: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/libgloss" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32584,10 +24523,10 @@ maybe-maintainer-clean-target-libgloss: maybe-maintainer-clean-target-libgloss: maintainer-clean-target-libgloss maintainer-clean-target-libgloss: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgloss" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32604,79 +24543,67 @@ maintainer-clean-target-libgloss: @endif target-libgloss - - - .PHONY: configure-target-libiberty maybe-configure-target-libiberty maybe-configure-target-libiberty: @if target-libiberty maybe-configure-target-libiberty: configure-target-libiberty -configure-target-libiberty: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for libiberty..."; \ + +# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +$(TARGET_SUBDIR)/libiberty/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libiberty/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libiberty/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libiberty/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libiberty/Makefile; \ - mv $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \ + rm -f $(TARGET_SUBDIR)/libiberty/Makefile || : ; \ + cp multilib.out $(TARGET_SUBDIR)/libiberty/multilib.out + +configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/multilib.out + @test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libiberty; \ cd "$(TARGET_SUBDIR)/libiberty" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libiberty/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(TARGET_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libiberty"; \ - libsrcdir="$$s/libiberty"; \ + srcdiroption="--srcdir=$${topdir}/libiberty"; \ + libsrcdir="$$s/libiberty"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)" \ || exit 1 @endif target-libiberty - - - - .PHONY: all-target-libiberty maybe-all-target-libiberty maybe-all-target-libiberty: @if target-libiberty TARGET-target-libiberty=all maybe-all-target-libiberty: all-target-libiberty all-target-libiberty: configure-target-libiberty - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libiberty && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libiberty)) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libiberty)) @endif target-libiberty - - - - .PHONY: check-target-libiberty maybe-check-target-libiberty maybe-check-target-libiberty: @if target-libiberty maybe-check-target-libiberty: check-target-libiberty check-target-libiberty: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libiberty && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -32689,9 +24616,9 @@ maybe-install-target-libiberty: maybe-install-target-libiberty: install-target-libiberty install-target-libiberty: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libiberty && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -32707,10 +24634,10 @@ maybe-info-target-libiberty: info-target-libiberty info-target-libiberty: \ configure-target-libiberty - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/libiberty" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32733,10 +24660,10 @@ maybe-dvi-target-libiberty: dvi-target-libiberty dvi-target-libiberty: \ configure-target-libiberty - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/libiberty" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32752,32 +24679,6 @@ dvi-target-libiberty: \ @endif target-libiberty -.PHONY: maybe-html-target-libiberty html-target-libiberty -maybe-html-target-libiberty: -@if target-libiberty -maybe-html-target-libiberty: html-target-libiberty - -html-target-libiberty: \ - configure-target-libiberty - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libiberty" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libiberty && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-libiberty - .PHONY: maybe-TAGS-target-libiberty TAGS-target-libiberty maybe-TAGS-target-libiberty: @if target-libiberty @@ -32785,10 +24686,10 @@ maybe-TAGS-target-libiberty: TAGS-target-libiberty TAGS-target-libiberty: \ configure-target-libiberty - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/libiberty" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32812,10 +24713,10 @@ maybe-install-info-target-libiberty: install-info-target-libiberty install-info-target-libiberty: \ configure-target-libiberty \ info-target-libiberty - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/libiberty" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32838,10 +24739,10 @@ maybe-installcheck-target-libiberty: installcheck-target-libiberty installcheck-target-libiberty: \ configure-target-libiberty - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/libiberty" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32863,10 +24764,10 @@ maybe-mostlyclean-target-libiberty: maybe-mostlyclean-target-libiberty: mostlyclean-target-libiberty mostlyclean-target-libiberty: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libiberty" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32888,10 +24789,10 @@ maybe-clean-target-libiberty: maybe-clean-target-libiberty: clean-target-libiberty clean-target-libiberty: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/libiberty" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32913,10 +24814,10 @@ maybe-distclean-target-libiberty: maybe-distclean-target-libiberty: distclean-target-libiberty distclean-target-libiberty: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/libiberty" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32938,10 +24839,10 @@ maybe-maintainer-clean-target-libiberty: maybe-maintainer-clean-target-libiberty: maintainer-clean-target-libiberty maintainer-clean-target-libiberty: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libiberty" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -32958,79 +24859,67 @@ maintainer-clean-target-libiberty: @endif target-libiberty - - - .PHONY: configure-target-gperf maybe-configure-target-gperf maybe-configure-target-gperf: @if target-gperf maybe-configure-target-gperf: configure-target-gperf -configure-target-gperf: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for gperf..."; \ + +# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +$(TARGET_SUBDIR)/gperf/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/gperf/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/gperf/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/gperf/multilib.tmp $(TARGET_SUBDIR)/gperf/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/gperf/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/gperf/Makefile; \ - mv $(TARGET_SUBDIR)/gperf/multilib.tmp $(TARGET_SUBDIR)/gperf/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/gperf/multilib.tmp $(TARGET_SUBDIR)/gperf/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/gperf/Makefile || exit 0; \ + rm -f $(TARGET_SUBDIR)/gperf/Makefile || : ; \ + cp multilib.out $(TARGET_SUBDIR)/gperf/multilib.out + +configure-target-gperf: $(TARGET_SUBDIR)/gperf/multilib.out + @test ! -f $(TARGET_SUBDIR)/gperf/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/gperf; \ cd "$(TARGET_SUBDIR)/gperf" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/gperf/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(TARGET_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gperf"; \ - libsrcdir="$$s/gperf"; \ + srcdiroption="--srcdir=$${topdir}/gperf"; \ + libsrcdir="$$s/gperf"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)" \ || exit 1 @endif target-gperf - - - - .PHONY: all-target-gperf maybe-all-target-gperf maybe-all-target-gperf: @if target-gperf TARGET-target-gperf=all maybe-all-target-gperf: all-target-gperf all-target-gperf: configure-target-gperf - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/gperf && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-gperf)) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-gperf)) @endif target-gperf - - - - .PHONY: check-target-gperf maybe-check-target-gperf maybe-check-target-gperf: @if target-gperf maybe-check-target-gperf: check-target-gperf check-target-gperf: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/gperf && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -33043,9 +24932,9 @@ maybe-install-target-gperf: maybe-install-target-gperf: install-target-gperf install-target-gperf: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/gperf && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -33061,10 +24950,10 @@ maybe-info-target-gperf: info-target-gperf info-target-gperf: \ configure-target-gperf - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/gperf" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33087,10 +24976,10 @@ maybe-dvi-target-gperf: dvi-target-gperf dvi-target-gperf: \ configure-target-gperf - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/gperf" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33106,32 +24995,6 @@ dvi-target-gperf: \ @endif target-gperf -.PHONY: maybe-html-target-gperf html-target-gperf -maybe-html-target-gperf: -@if target-gperf -maybe-html-target-gperf: html-target-gperf - -html-target-gperf: \ - configure-target-gperf - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/gperf" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/gperf && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-gperf - .PHONY: maybe-TAGS-target-gperf TAGS-target-gperf maybe-TAGS-target-gperf: @if target-gperf @@ -33139,10 +25002,10 @@ maybe-TAGS-target-gperf: TAGS-target-gperf TAGS-target-gperf: \ configure-target-gperf - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/gperf" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33166,10 +25029,10 @@ maybe-install-info-target-gperf: install-info-target-gperf install-info-target-gperf: \ configure-target-gperf \ info-target-gperf - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/gperf" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33192,10 +25055,10 @@ maybe-installcheck-target-gperf: installcheck-target-gperf installcheck-target-gperf: \ configure-target-gperf - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/gperf" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33217,10 +25080,10 @@ maybe-mostlyclean-target-gperf: maybe-mostlyclean-target-gperf: mostlyclean-target-gperf mostlyclean-target-gperf: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/gperf" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33242,10 +25105,10 @@ maybe-clean-target-gperf: maybe-clean-target-gperf: clean-target-gperf clean-target-gperf: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/gperf" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33267,10 +25130,10 @@ maybe-distclean-target-gperf: maybe-distclean-target-gperf: distclean-target-gperf distclean-target-gperf: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/gperf" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33292,10 +25155,10 @@ maybe-maintainer-clean-target-gperf: maybe-maintainer-clean-target-gperf: maintainer-clean-target-gperf maintainer-clean-target-gperf: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/gperf" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33312,70 +25175,58 @@ maintainer-clean-target-gperf: @endif target-gperf - - - .PHONY: configure-target-examples maybe-configure-target-examples maybe-configure-target-examples: @if target-examples maybe-configure-target-examples: configure-target-examples -configure-target-examples: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for examples..."; \ + +# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +$(TARGET_SUBDIR)/examples/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/examples/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/examples/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/examples/multilib.tmp $(TARGET_SUBDIR)/examples/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/examples/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/examples/Makefile; \ - mv $(TARGET_SUBDIR)/examples/multilib.tmp $(TARGET_SUBDIR)/examples/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/examples/multilib.tmp $(TARGET_SUBDIR)/examples/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/examples/Makefile || exit 0; \ + rm -f $(TARGET_SUBDIR)/examples/Makefile || : ; \ + cp multilib.out $(TARGET_SUBDIR)/examples/multilib.out + +configure-target-examples: $(TARGET_SUBDIR)/examples/multilib.out + @test ! -f $(TARGET_SUBDIR)/examples/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/examples; \ cd "$(TARGET_SUBDIR)/examples" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/examples/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(TARGET_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/examples"; \ - libsrcdir="$$s/examples"; \ + srcdiroption="--srcdir=$${topdir}/examples"; \ + libsrcdir="$$s/examples"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)" \ || exit 1 @endif target-examples - - - - .PHONY: all-target-examples maybe-all-target-examples maybe-all-target-examples: @if target-examples TARGET-target-examples=all maybe-all-target-examples: all-target-examples all-target-examples: configure-target-examples - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/examples && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-examples)) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-examples)) @endif target-examples - - - - .PHONY: check-target-examples maybe-check-target-examples maybe-check-target-examples: @if target-examples @@ -33405,10 +25256,10 @@ maybe-info-target-examples: info-target-examples info-target-examples: \ configure-target-examples - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/examples" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33431,10 +25282,10 @@ maybe-dvi-target-examples: dvi-target-examples dvi-target-examples: \ configure-target-examples - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/examples" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33450,32 +25301,6 @@ dvi-target-examples: \ @endif target-examples -.PHONY: maybe-html-target-examples html-target-examples -maybe-html-target-examples: -@if target-examples -maybe-html-target-examples: html-target-examples - -html-target-examples: \ - configure-target-examples - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/examples" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/examples && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-examples - .PHONY: maybe-TAGS-target-examples TAGS-target-examples maybe-TAGS-target-examples: @if target-examples @@ -33483,10 +25308,10 @@ maybe-TAGS-target-examples: TAGS-target-examples TAGS-target-examples: \ configure-target-examples - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/examples" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33510,10 +25335,10 @@ maybe-install-info-target-examples: install-info-target-examples install-info-target-examples: \ configure-target-examples \ info-target-examples - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/examples" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33536,10 +25361,10 @@ maybe-installcheck-target-examples: installcheck-target-examples installcheck-target-examples: \ configure-target-examples - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/examples" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33561,10 +25386,10 @@ maybe-mostlyclean-target-examples: maybe-mostlyclean-target-examples: mostlyclean-target-examples mostlyclean-target-examples: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/examples" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33586,10 +25411,10 @@ maybe-clean-target-examples: maybe-clean-target-examples: clean-target-examples clean-target-examples: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/examples" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33611,10 +25436,10 @@ maybe-distclean-target-examples: maybe-distclean-target-examples: distclean-target-examples distclean-target-examples: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/examples" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33636,10 +25461,10 @@ maybe-maintainer-clean-target-examples: maybe-maintainer-clean-target-examples: maintainer-clean-target-examples maintainer-clean-target-examples: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/examples" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33656,79 +25481,67 @@ maintainer-clean-target-examples: @endif target-examples - - - .PHONY: configure-target-libffi maybe-configure-target-libffi maybe-configure-target-libffi: @if target-libffi maybe-configure-target-libffi: configure-target-libffi -configure-target-libffi: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for libffi..."; \ + +# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +$(TARGET_SUBDIR)/libffi/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libffi/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libffi/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libffi/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libffi/Makefile; \ - mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \ + rm -f $(TARGET_SUBDIR)/libffi/Makefile || : ; \ + cp multilib.out $(TARGET_SUBDIR)/libffi/multilib.out + +configure-target-libffi: $(TARGET_SUBDIR)/libffi/multilib.out + @test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libffi; \ cd "$(TARGET_SUBDIR)/libffi" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libffi/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(TARGET_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libffi"; \ - libsrcdir="$$s/libffi"; \ + srcdiroption="--srcdir=$${topdir}/libffi"; \ + libsrcdir="$$s/libffi"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)" \ || exit 1 @endif target-libffi - - - - .PHONY: all-target-libffi maybe-all-target-libffi maybe-all-target-libffi: @if target-libffi TARGET-target-libffi=all maybe-all-target-libffi: all-target-libffi all-target-libffi: configure-target-libffi - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libffi && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libffi)) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libffi)) @endif target-libffi - - - - .PHONY: check-target-libffi maybe-check-target-libffi maybe-check-target-libffi: @if target-libffi maybe-check-target-libffi: check-target-libffi check-target-libffi: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libffi && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -33741,9 +25554,9 @@ maybe-install-target-libffi: maybe-install-target-libffi: install-target-libffi install-target-libffi: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libffi && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -33759,10 +25572,10 @@ maybe-info-target-libffi: info-target-libffi info-target-libffi: \ configure-target-libffi - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/libffi" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33785,10 +25598,10 @@ maybe-dvi-target-libffi: dvi-target-libffi dvi-target-libffi: \ configure-target-libffi - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/libffi" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33804,32 +25617,6 @@ dvi-target-libffi: \ @endif target-libffi -.PHONY: maybe-html-target-libffi html-target-libffi -maybe-html-target-libffi: -@if target-libffi -maybe-html-target-libffi: html-target-libffi - -html-target-libffi: \ - configure-target-libffi - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libffi" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libffi && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-libffi - .PHONY: maybe-TAGS-target-libffi TAGS-target-libffi maybe-TAGS-target-libffi: @if target-libffi @@ -33837,10 +25624,10 @@ maybe-TAGS-target-libffi: TAGS-target-libffi TAGS-target-libffi: \ configure-target-libffi - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/libffi" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33864,10 +25651,10 @@ maybe-install-info-target-libffi: install-info-target-libffi install-info-target-libffi: \ configure-target-libffi \ info-target-libffi - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/libffi" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33890,10 +25677,10 @@ maybe-installcheck-target-libffi: installcheck-target-libffi installcheck-target-libffi: \ configure-target-libffi - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/libffi" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33915,10 +25702,10 @@ maybe-mostlyclean-target-libffi: maybe-mostlyclean-target-libffi: mostlyclean-target-libffi mostlyclean-target-libffi: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libffi" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33940,10 +25727,10 @@ maybe-clean-target-libffi: maybe-clean-target-libffi: clean-target-libffi clean-target-libffi: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/libffi" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33965,10 +25752,10 @@ maybe-distclean-target-libffi: maybe-distclean-target-libffi: distclean-target-libffi distclean-target-libffi: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/libffi" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -33990,10 +25777,10 @@ maybe-maintainer-clean-target-libffi: maybe-maintainer-clean-target-libffi: maintainer-clean-target-libffi maintainer-clean-target-libffi: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libffi" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34010,79 +25797,67 @@ maintainer-clean-target-libffi: @endif target-libffi - - - .PHONY: configure-target-libjava maybe-configure-target-libjava maybe-configure-target-libjava: @if target-libjava maybe-configure-target-libjava: configure-target-libjava -configure-target-libjava: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for libjava..."; \ + +# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +$(TARGET_SUBDIR)/libjava/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libjava/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libjava/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libjava/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libjava/Makefile; \ - mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \ + rm -f $(TARGET_SUBDIR)/libjava/Makefile || : ; \ + cp multilib.out $(TARGET_SUBDIR)/libjava/multilib.out + +configure-target-libjava: $(TARGET_SUBDIR)/libjava/multilib.out + @test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libjava; \ cd "$(TARGET_SUBDIR)/libjava" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libjava/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(TARGET_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libjava"; \ - libsrcdir="$$s/libjava"; \ + srcdiroption="--srcdir=$${topdir}/libjava"; \ + libsrcdir="$$s/libjava"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)" \ || exit 1 @endif target-libjava - - - - .PHONY: all-target-libjava maybe-all-target-libjava maybe-all-target-libjava: @if target-libjava TARGET-target-libjava=all maybe-all-target-libjava: all-target-libjava all-target-libjava: configure-target-libjava - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libjava && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' $(TARGET-target-libjava)) + $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' $(TARGET-target-libjava)) @endif target-libjava - - - - .PHONY: check-target-libjava maybe-check-target-libjava maybe-check-target-libjava: @if target-libjava maybe-check-target-libjava: check-target-libjava check-target-libjava: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libjava && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' check) @@ -34095,9 +25870,9 @@ maybe-install-target-libjava: maybe-install-target-libjava: install-target-libjava install-target-libjava: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libjava && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -34113,10 +25888,10 @@ maybe-info-target-libjava: info-target-libjava info-target-libjava: \ configure-target-libjava - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/libjava" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34139,10 +25914,10 @@ maybe-dvi-target-libjava: dvi-target-libjava dvi-target-libjava: \ configure-target-libjava - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/libjava" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34158,32 +25933,6 @@ dvi-target-libjava: \ @endif target-libjava -.PHONY: maybe-html-target-libjava html-target-libjava -maybe-html-target-libjava: -@if target-libjava -maybe-html-target-libjava: html-target-libjava - -html-target-libjava: \ - configure-target-libjava - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libjava" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libjava && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-libjava - .PHONY: maybe-TAGS-target-libjava TAGS-target-libjava maybe-TAGS-target-libjava: @if target-libjava @@ -34191,10 +25940,10 @@ maybe-TAGS-target-libjava: TAGS-target-libjava TAGS-target-libjava: \ configure-target-libjava - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/libjava" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34218,10 +25967,10 @@ maybe-install-info-target-libjava: install-info-target-libjava install-info-target-libjava: \ configure-target-libjava \ info-target-libjava - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/libjava" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34244,10 +25993,10 @@ maybe-installcheck-target-libjava: installcheck-target-libjava installcheck-target-libjava: \ configure-target-libjava - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/libjava" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34269,10 +26018,10 @@ maybe-mostlyclean-target-libjava: maybe-mostlyclean-target-libjava: mostlyclean-target-libjava mostlyclean-target-libjava: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libjava" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34294,10 +26043,10 @@ maybe-clean-target-libjava: maybe-clean-target-libjava: clean-target-libjava clean-target-libjava: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/libjava" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34319,10 +26068,10 @@ maybe-distclean-target-libjava: maybe-distclean-target-libjava: distclean-target-libjava distclean-target-libjava: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/libjava" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34344,10 +26093,10 @@ maybe-maintainer-clean-target-libjava: maybe-maintainer-clean-target-libjava: maintainer-clean-target-libjava maintainer-clean-target-libjava: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libjava" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34364,79 +26113,89 @@ maintainer-clean-target-libjava: @endif target-libjava - - - .PHONY: configure-target-zlib maybe-configure-target-zlib maybe-configure-target-zlib: @if target-zlib maybe-configure-target-zlib: configure-target-zlib -configure-target-zlib: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for zlib..."; \ + +# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +$(TARGET_SUBDIR)/zlib/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/zlib/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/zlib/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/zlib/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/zlib/Makefile; \ - mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \ + rm -f $(TARGET_SUBDIR)/zlib/Makefile || : ; \ + cp multilib.out $(TARGET_SUBDIR)/zlib/multilib.out + +configure-target-zlib: $(TARGET_SUBDIR)/zlib/multilib.out + @test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/zlib; \ cd "$(TARGET_SUBDIR)/zlib" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/zlib/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(TARGET_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/zlib"; \ - libsrcdir="$$s/zlib"; \ + 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 \ + true; \ + fi; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ + srcdiroption="--srcdir=$${topdir}/zlib"; \ + libsrcdir="$$s/zlib"; \ + fi; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)" \ || exit 1 @endif target-zlib - - - - .PHONY: all-target-zlib maybe-all-target-zlib maybe-all-target-zlib: @if target-zlib TARGET-target-zlib=all maybe-all-target-zlib: all-target-zlib all-target-zlib: configure-target-zlib - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/zlib && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-zlib)) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-zlib)) @endif target-zlib - - - - .PHONY: check-target-zlib maybe-check-target-zlib maybe-check-target-zlib: @if target-zlib maybe-check-target-zlib: check-target-zlib check-target-zlib: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/zlib && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -34449,9 +26208,9 @@ maybe-install-target-zlib: maybe-install-target-zlib: install-target-zlib install-target-zlib: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/zlib && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -34467,10 +26226,10 @@ maybe-info-target-zlib: info-target-zlib info-target-zlib: \ configure-target-zlib - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/zlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34493,10 +26252,10 @@ maybe-dvi-target-zlib: dvi-target-zlib dvi-target-zlib: \ configure-target-zlib - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/zlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34512,32 +26271,6 @@ dvi-target-zlib: \ @endif target-zlib -.PHONY: maybe-html-target-zlib html-target-zlib -maybe-html-target-zlib: -@if target-zlib -maybe-html-target-zlib: html-target-zlib - -html-target-zlib: \ - configure-target-zlib - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/zlib" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/zlib && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-zlib - .PHONY: maybe-TAGS-target-zlib TAGS-target-zlib maybe-TAGS-target-zlib: @if target-zlib @@ -34545,10 +26278,10 @@ maybe-TAGS-target-zlib: TAGS-target-zlib TAGS-target-zlib: \ configure-target-zlib - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/zlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34572,10 +26305,10 @@ maybe-install-info-target-zlib: install-info-target-zlib install-info-target-zlib: \ configure-target-zlib \ info-target-zlib - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/zlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34598,10 +26331,10 @@ maybe-installcheck-target-zlib: installcheck-target-zlib installcheck-target-zlib: \ configure-target-zlib - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/zlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34623,10 +26356,10 @@ maybe-mostlyclean-target-zlib: maybe-mostlyclean-target-zlib: mostlyclean-target-zlib mostlyclean-target-zlib: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/zlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34648,10 +26381,10 @@ maybe-clean-target-zlib: maybe-clean-target-zlib: clean-target-zlib clean-target-zlib: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/zlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34673,10 +26406,10 @@ maybe-distclean-target-zlib: maybe-distclean-target-zlib: distclean-target-zlib distclean-target-zlib: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/zlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34698,10 +26431,10 @@ maybe-maintainer-clean-target-zlib: maybe-maintainer-clean-target-zlib: maintainer-clean-target-zlib maintainer-clean-target-zlib: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/zlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34718,79 +26451,67 @@ maintainer-clean-target-zlib: @endif target-zlib - - - .PHONY: configure-target-boehm-gc maybe-configure-target-boehm-gc maybe-configure-target-boehm-gc: @if target-boehm-gc maybe-configure-target-boehm-gc: configure-target-boehm-gc -configure-target-boehm-gc: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for boehm-gc..."; \ + +# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +$(TARGET_SUBDIR)/boehm-gc/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/boehm-gc/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/boehm-gc/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/boehm-gc/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/boehm-gc/Makefile; \ - mv $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \ + rm -f $(TARGET_SUBDIR)/boehm-gc/Makefile || : ; \ + cp multilib.out $(TARGET_SUBDIR)/boehm-gc/multilib.out + +configure-target-boehm-gc: $(TARGET_SUBDIR)/boehm-gc/multilib.out + @test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/boehm-gc; \ cd "$(TARGET_SUBDIR)/boehm-gc" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/boehm-gc/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(TARGET_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/boehm-gc"; \ - libsrcdir="$$s/boehm-gc"; \ + srcdiroption="--srcdir=$${topdir}/boehm-gc"; \ + libsrcdir="$$s/boehm-gc"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)" \ || exit 1 @endif target-boehm-gc - - - - .PHONY: all-target-boehm-gc maybe-all-target-boehm-gc maybe-all-target-boehm-gc: @if target-boehm-gc TARGET-target-boehm-gc=all maybe-all-target-boehm-gc: all-target-boehm-gc all-target-boehm-gc: configure-target-boehm-gc - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/boehm-gc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-boehm-gc)) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-boehm-gc)) @endif target-boehm-gc - - - - .PHONY: check-target-boehm-gc maybe-check-target-boehm-gc maybe-check-target-boehm-gc: @if target-boehm-gc maybe-check-target-boehm-gc: check-target-boehm-gc check-target-boehm-gc: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/boehm-gc && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -34803,9 +26524,9 @@ maybe-install-target-boehm-gc: maybe-install-target-boehm-gc: install-target-boehm-gc install-target-boehm-gc: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/boehm-gc && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -34821,10 +26542,10 @@ maybe-info-target-boehm-gc: info-target-boehm-gc info-target-boehm-gc: \ configure-target-boehm-gc - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/boehm-gc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34847,10 +26568,10 @@ maybe-dvi-target-boehm-gc: dvi-target-boehm-gc dvi-target-boehm-gc: \ configure-target-boehm-gc - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/boehm-gc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34866,32 +26587,6 @@ dvi-target-boehm-gc: \ @endif target-boehm-gc -.PHONY: maybe-html-target-boehm-gc html-target-boehm-gc -maybe-html-target-boehm-gc: -@if target-boehm-gc -maybe-html-target-boehm-gc: html-target-boehm-gc - -html-target-boehm-gc: \ - configure-target-boehm-gc - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/boehm-gc" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/boehm-gc && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-boehm-gc - .PHONY: maybe-TAGS-target-boehm-gc TAGS-target-boehm-gc maybe-TAGS-target-boehm-gc: @if target-boehm-gc @@ -34899,10 +26594,10 @@ maybe-TAGS-target-boehm-gc: TAGS-target-boehm-gc TAGS-target-boehm-gc: \ configure-target-boehm-gc - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/boehm-gc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34926,10 +26621,10 @@ maybe-install-info-target-boehm-gc: install-info-target-boehm-gc install-info-target-boehm-gc: \ configure-target-boehm-gc \ info-target-boehm-gc - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/boehm-gc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34952,10 +26647,10 @@ maybe-installcheck-target-boehm-gc: installcheck-target-boehm-gc installcheck-target-boehm-gc: \ configure-target-boehm-gc - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/boehm-gc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -34977,10 +26672,10 @@ maybe-mostlyclean-target-boehm-gc: maybe-mostlyclean-target-boehm-gc: mostlyclean-target-boehm-gc mostlyclean-target-boehm-gc: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/boehm-gc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35002,10 +26697,10 @@ maybe-clean-target-boehm-gc: maybe-clean-target-boehm-gc: clean-target-boehm-gc clean-target-boehm-gc: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/boehm-gc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35027,10 +26722,10 @@ maybe-distclean-target-boehm-gc: maybe-distclean-target-boehm-gc: distclean-target-boehm-gc distclean-target-boehm-gc: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/boehm-gc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35052,10 +26747,10 @@ maybe-maintainer-clean-target-boehm-gc: maybe-maintainer-clean-target-boehm-gc: maintainer-clean-target-boehm-gc maintainer-clean-target-boehm-gc: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/boehm-gc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35072,79 +26767,67 @@ maintainer-clean-target-boehm-gc: @endif target-boehm-gc - - - .PHONY: configure-target-qthreads maybe-configure-target-qthreads maybe-configure-target-qthreads: @if target-qthreads maybe-configure-target-qthreads: configure-target-qthreads -configure-target-qthreads: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for qthreads..."; \ + +# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +$(TARGET_SUBDIR)/qthreads/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/qthreads/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/qthreads/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/qthreads/multilib.tmp $(TARGET_SUBDIR)/qthreads/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/qthreads/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/qthreads/Makefile; \ - mv $(TARGET_SUBDIR)/qthreads/multilib.tmp $(TARGET_SUBDIR)/qthreads/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/qthreads/multilib.tmp $(TARGET_SUBDIR)/qthreads/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/qthreads/Makefile || exit 0; \ + rm -f $(TARGET_SUBDIR)/qthreads/Makefile || : ; \ + cp multilib.out $(TARGET_SUBDIR)/qthreads/multilib.out + +configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/multilib.out + @test ! -f $(TARGET_SUBDIR)/qthreads/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/qthreads; \ cd "$(TARGET_SUBDIR)/qthreads" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/qthreads/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(TARGET_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/qthreads"; \ - libsrcdir="$$s/qthreads"; \ + srcdiroption="--srcdir=$${topdir}/qthreads"; \ + libsrcdir="$$s/qthreads"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)" \ || exit 1 @endif target-qthreads - - - - .PHONY: all-target-qthreads maybe-all-target-qthreads maybe-all-target-qthreads: @if target-qthreads TARGET-target-qthreads=all maybe-all-target-qthreads: all-target-qthreads all-target-qthreads: configure-target-qthreads - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/qthreads && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-qthreads)) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-qthreads)) @endif target-qthreads - - - - .PHONY: check-target-qthreads maybe-check-target-qthreads maybe-check-target-qthreads: @if target-qthreads maybe-check-target-qthreads: check-target-qthreads check-target-qthreads: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/qthreads && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -35157,9 +26840,9 @@ maybe-install-target-qthreads: maybe-install-target-qthreads: install-target-qthreads install-target-qthreads: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/qthreads && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -35175,10 +26858,10 @@ maybe-info-target-qthreads: info-target-qthreads info-target-qthreads: \ configure-target-qthreads - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/qthreads" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35201,10 +26884,10 @@ maybe-dvi-target-qthreads: dvi-target-qthreads dvi-target-qthreads: \ configure-target-qthreads - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/qthreads" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35220,32 +26903,6 @@ dvi-target-qthreads: \ @endif target-qthreads -.PHONY: maybe-html-target-qthreads html-target-qthreads -maybe-html-target-qthreads: -@if target-qthreads -maybe-html-target-qthreads: html-target-qthreads - -html-target-qthreads: \ - configure-target-qthreads - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/qthreads" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/qthreads && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-qthreads - .PHONY: maybe-TAGS-target-qthreads TAGS-target-qthreads maybe-TAGS-target-qthreads: @if target-qthreads @@ -35253,10 +26910,10 @@ maybe-TAGS-target-qthreads: TAGS-target-qthreads TAGS-target-qthreads: \ configure-target-qthreads - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/qthreads" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35280,10 +26937,10 @@ maybe-install-info-target-qthreads: install-info-target-qthreads install-info-target-qthreads: \ configure-target-qthreads \ info-target-qthreads - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/qthreads" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35306,10 +26963,10 @@ maybe-installcheck-target-qthreads: installcheck-target-qthreads installcheck-target-qthreads: \ configure-target-qthreads - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/qthreads" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35331,10 +26988,10 @@ maybe-mostlyclean-target-qthreads: maybe-mostlyclean-target-qthreads: mostlyclean-target-qthreads mostlyclean-target-qthreads: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/qthreads" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35356,10 +27013,10 @@ maybe-clean-target-qthreads: maybe-clean-target-qthreads: clean-target-qthreads clean-target-qthreads: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/qthreads" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35381,10 +27038,10 @@ maybe-distclean-target-qthreads: maybe-distclean-target-qthreads: distclean-target-qthreads distclean-target-qthreads: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/qthreads" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35406,10 +27063,10 @@ maybe-maintainer-clean-target-qthreads: maybe-maintainer-clean-target-qthreads: maintainer-clean-target-qthreads maintainer-clean-target-qthreads: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/qthreads" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35426,79 +27083,67 @@ maintainer-clean-target-qthreads: @endif target-qthreads - - - .PHONY: configure-target-rda maybe-configure-target-rda maybe-configure-target-rda: @if target-rda maybe-configure-target-rda: configure-target-rda -configure-target-rda: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for rda..."; \ + +# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +$(TARGET_SUBDIR)/rda/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/rda/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/rda/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/rda/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/rda/Makefile; \ - mv $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \ + rm -f $(TARGET_SUBDIR)/rda/Makefile || : ; \ + cp multilib.out $(TARGET_SUBDIR)/rda/multilib.out + +configure-target-rda: $(TARGET_SUBDIR)/rda/multilib.out + @test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/rda; \ cd "$(TARGET_SUBDIR)/rda" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/rda/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(TARGET_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/rda"; \ - libsrcdir="$$s/rda"; \ + srcdiroption="--srcdir=$${topdir}/rda"; \ + libsrcdir="$$s/rda"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)" \ || exit 1 @endif target-rda - - - - .PHONY: all-target-rda maybe-all-target-rda maybe-all-target-rda: @if target-rda TARGET-target-rda=all maybe-all-target-rda: all-target-rda all-target-rda: configure-target-rda - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/rda && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-rda)) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-rda)) @endif target-rda - - - - .PHONY: check-target-rda maybe-check-target-rda maybe-check-target-rda: @if target-rda maybe-check-target-rda: check-target-rda check-target-rda: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/rda && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -35511,9 +27156,9 @@ maybe-install-target-rda: maybe-install-target-rda: install-target-rda install-target-rda: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/rda && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -35529,10 +27174,10 @@ maybe-info-target-rda: info-target-rda info-target-rda: \ configure-target-rda - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/rda" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35555,10 +27200,10 @@ maybe-dvi-target-rda: dvi-target-rda dvi-target-rda: \ configure-target-rda - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/rda" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35574,32 +27219,6 @@ dvi-target-rda: \ @endif target-rda -.PHONY: maybe-html-target-rda html-target-rda -maybe-html-target-rda: -@if target-rda -maybe-html-target-rda: html-target-rda - -html-target-rda: \ - configure-target-rda - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/rda" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/rda && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-rda - .PHONY: maybe-TAGS-target-rda TAGS-target-rda maybe-TAGS-target-rda: @if target-rda @@ -35607,10 +27226,10 @@ maybe-TAGS-target-rda: TAGS-target-rda TAGS-target-rda: \ configure-target-rda - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/rda" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35634,10 +27253,10 @@ maybe-install-info-target-rda: install-info-target-rda install-info-target-rda: \ configure-target-rda \ info-target-rda - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/rda" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35660,10 +27279,10 @@ maybe-installcheck-target-rda: installcheck-target-rda installcheck-target-rda: \ configure-target-rda - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/rda" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35685,10 +27304,10 @@ maybe-mostlyclean-target-rda: maybe-mostlyclean-target-rda: mostlyclean-target-rda mostlyclean-target-rda: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/rda" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35710,10 +27329,10 @@ maybe-clean-target-rda: maybe-clean-target-rda: clean-target-rda clean-target-rda: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/rda" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35735,10 +27354,10 @@ maybe-distclean-target-rda: maybe-distclean-target-rda: distclean-target-rda distclean-target-rda: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/rda" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35760,10 +27379,10 @@ maybe-maintainer-clean-target-rda: maybe-maintainer-clean-target-rda: maintainer-clean-target-rda maintainer-clean-target-rda: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/rda" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35780,79 +27399,67 @@ maintainer-clean-target-rda: @endif target-rda - - - .PHONY: configure-target-libada maybe-configure-target-libada maybe-configure-target-libada: @if target-libada maybe-configure-target-libada: configure-target-libada -configure-target-libada: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for libada..."; \ + +# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +$(TARGET_SUBDIR)/libada/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libada/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libada/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libada/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libada/Makefile; \ - mv $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \ + rm -f $(TARGET_SUBDIR)/libada/Makefile || : ; \ + cp multilib.out $(TARGET_SUBDIR)/libada/multilib.out + +configure-target-libada: $(TARGET_SUBDIR)/libada/multilib.out + @test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libada; \ cd "$(TARGET_SUBDIR)/libada" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libada/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(TARGET_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libada"; \ - libsrcdir="$$s/libada"; \ + srcdiroption="--srcdir=$${topdir}/libada"; \ + libsrcdir="$$s/libada"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)" \ || exit 1 @endif target-libada - - - - .PHONY: all-target-libada maybe-all-target-libada maybe-all-target-libada: @if target-libada TARGET-target-libada=all maybe-all-target-libada: all-target-libada all-target-libada: configure-target-libada - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libada && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libada)) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libada)) @endif target-libada - - - - .PHONY: check-target-libada maybe-check-target-libada maybe-check-target-libada: @if target-libada maybe-check-target-libada: check-target-libada check-target-libada: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libada && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -35865,9 +27472,9 @@ maybe-install-target-libada: maybe-install-target-libada: install-target-libada install-target-libada: installdirs - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libada && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -35883,10 +27490,10 @@ maybe-info-target-libada: info-target-libada info-target-libada: \ configure-target-libada - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/libada" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35909,10 +27516,10 @@ maybe-dvi-target-libada: dvi-target-libada dvi-target-libada: \ configure-target-libada - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/libada" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35928,32 +27535,6 @@ dvi-target-libada: \ @endif target-libada -.PHONY: maybe-html-target-libada html-target-libada -maybe-html-target-libada: -@if target-libada -maybe-html-target-libada: html-target-libada - -html-target-libada: \ - configure-target-libada - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libada" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libada && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-libada - .PHONY: maybe-TAGS-target-libada TAGS-target-libada maybe-TAGS-target-libada: @if target-libada @@ -35961,10 +27542,10 @@ maybe-TAGS-target-libada: TAGS-target-libada TAGS-target-libada: \ configure-target-libada - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/libada" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -35988,10 +27569,10 @@ maybe-install-info-target-libada: install-info-target-libada install-info-target-libada: \ configure-target-libada \ info-target-libada - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/libada" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -36014,10 +27595,10 @@ maybe-installcheck-target-libada: installcheck-target-libada installcheck-target-libada: \ configure-target-libada - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/libada" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -36039,10 +27620,10 @@ maybe-mostlyclean-target-libada: maybe-mostlyclean-target-libada: mostlyclean-target-libada mostlyclean-target-libada: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libada" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -36064,10 +27645,10 @@ maybe-clean-target-libada: maybe-clean-target-libada: clean-target-libada clean-target-libada: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/libada" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -36089,10 +27670,10 @@ maybe-distclean-target-libada: maybe-distclean-target-libada: distclean-target-libada distclean-target-libada: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/libada" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -36114,10 +27695,10 @@ maybe-maintainer-clean-target-libada: maybe-maintainer-clean-target-libada: maintainer-clean-target-libada maintainer-clean-target-libada: - @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libada" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -36135,360 +27716,6 @@ maintainer-clean-target-libada: - - -.PHONY: configure-target-libgomp maybe-configure-target-libgomp -maybe-configure-target-libgomp: -@if target-libgomp -maybe-configure-target-libgomp: configure-target-libgomp -configure-target-libgomp: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for libgomp..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \ - mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \ - $(NORMAL_TARGET_EXPORTS) \ - echo Configuring in $(TARGET_SUBDIR)/libgomp; \ - cd "$(TARGET_SUBDIR)/libgomp" || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libgomp"; \ - libsrcdir="$$s/libgomp"; \ - rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - || exit 1 -@endif target-libgomp - - - - - -.PHONY: all-target-libgomp maybe-all-target-libgomp -maybe-all-target-libgomp: -@if target-libgomp -TARGET-target-libgomp=all -maybe-all-target-libgomp: all-target-libgomp -all-target-libgomp: configure-target-libgomp - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgomp)) -@endif target-libgomp - - - - - -.PHONY: check-target-libgomp maybe-check-target-libgomp -maybe-check-target-libgomp: -@if target-libgomp -maybe-check-target-libgomp: check-target-libgomp - -check-target-libgomp: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) check) - -@endif target-libgomp - -.PHONY: install-target-libgomp maybe-install-target-libgomp -maybe-install-target-libgomp: -@if target-libgomp -maybe-install-target-libgomp: install-target-libgomp - -install-target-libgomp: installdirs - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) install) - -@endif target-libgomp - -# Other targets (info, dvi, etc.) - -.PHONY: maybe-info-target-libgomp info-target-libgomp -maybe-info-target-libgomp: -@if target-libgomp -maybe-info-target-libgomp: info-target-libgomp - -info-target-libgomp: \ - configure-target-libgomp - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libgomp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - info) \ - || exit 1 - -@endif target-libgomp - -.PHONY: maybe-dvi-target-libgomp dvi-target-libgomp -maybe-dvi-target-libgomp: -@if target-libgomp -maybe-dvi-target-libgomp: dvi-target-libgomp - -dvi-target-libgomp: \ - configure-target-libgomp - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libgomp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - dvi) \ - || exit 1 - -@endif target-libgomp - -.PHONY: maybe-html-target-libgomp html-target-libgomp -maybe-html-target-libgomp: -@if target-libgomp -maybe-html-target-libgomp: html-target-libgomp - -html-target-libgomp: \ - configure-target-libgomp - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libgomp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - html) \ - || exit 1 - -@endif target-libgomp - -.PHONY: maybe-TAGS-target-libgomp TAGS-target-libgomp -maybe-TAGS-target-libgomp: -@if target-libgomp -maybe-TAGS-target-libgomp: TAGS-target-libgomp - -TAGS-target-libgomp: \ - configure-target-libgomp - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libgomp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - TAGS) \ - || exit 1 - -@endif target-libgomp - -.PHONY: maybe-install-info-target-libgomp install-info-target-libgomp -maybe-install-info-target-libgomp: -@if target-libgomp -maybe-install-info-target-libgomp: install-info-target-libgomp - -install-info-target-libgomp: \ - configure-target-libgomp \ - info-target-libgomp - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libgomp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - install-info) \ - || exit 1 - -@endif target-libgomp - -.PHONY: maybe-installcheck-target-libgomp installcheck-target-libgomp -maybe-installcheck-target-libgomp: -@if target-libgomp -maybe-installcheck-target-libgomp: installcheck-target-libgomp - -installcheck-target-libgomp: \ - configure-target-libgomp - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libgomp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - installcheck) \ - || exit 1 - -@endif target-libgomp - -.PHONY: maybe-mostlyclean-target-libgomp mostlyclean-target-libgomp -maybe-mostlyclean-target-libgomp: -@if target-libgomp -maybe-mostlyclean-target-libgomp: mostlyclean-target-libgomp - -mostlyclean-target-libgomp: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgomp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - mostlyclean) \ - || exit 1 - -@endif target-libgomp - -.PHONY: maybe-clean-target-libgomp clean-target-libgomp -maybe-clean-target-libgomp: -@if target-libgomp -maybe-clean-target-libgomp: clean-target-libgomp - -clean-target-libgomp: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libgomp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - clean) \ - || exit 1 - -@endif target-libgomp - -.PHONY: maybe-distclean-target-libgomp distclean-target-libgomp -maybe-distclean-target-libgomp: -@if target-libgomp -maybe-distclean-target-libgomp: distclean-target-libgomp - -distclean-target-libgomp: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libgomp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - distclean) \ - || exit 1 - -@endif target-libgomp - -.PHONY: maybe-maintainer-clean-target-libgomp maintainer-clean-target-libgomp -maybe-maintainer-clean-target-libgomp: -@if target-libgomp -maybe-maintainer-clean-target-libgomp: maintainer-clean-target-libgomp - -maintainer-clean-target-libgomp: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgomp" ; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - maintainer-clean) \ - || exit 1 - -@endif target-libgomp - - - # ---------- # GCC module # ---------- @@ -36503,9 +27730,9 @@ GCC_STRAP_TARGETS = bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstra $(GCC_STRAP_TARGETS): all-prebootstrap configure-gcc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ echo "Bootstrapping the compiler"; \ - $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,:[ :]*,:,g;s,^[ :]*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -36523,28 +27750,32 @@ $(GCC_STRAP_TARGETS): all-prebootstrap configure-gcc msg="Comparing stage2 and stage3 of the compiler"; \ compare=compare ;; \ esac; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ echo "$$msg"; \ cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ + $(SET_LIB_PATH) \ echo "Building runtime libraries"; \ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all profiledbootstrap: all-prebootstrap configure-gcc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,:[ :]*,:,g;s,^[ :]*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ echo "Bootstrapping training compiler"; \ cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stageprofile_build @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ echo "Building feedback based compiler"; \ cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stagefeedback_build @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ + $(SET_LIB_PATH) \ echo "Building runtime libraries"; \ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all @@ -36552,11 +27783,13 @@ profiledbootstrap: all-prebootstrap configure-gcc cross: all-build all-gas all-ld @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ echo "Building the C and C++ compiler"; \ cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++" @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ + $(SET_LIB_PATH) \ echo "Building runtime libraries"; \ $(MAKE) $(RECURSE_FLAGS_TO_PASS) LANGUAGES="c c++" all @endif gcc-no-bootstrap @@ -36567,6 +27800,7 @@ check-gcc-c++: @if [ -f ./gcc/Makefile ] ; then \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \ else \ @@ -36590,6 +27824,7 @@ gcc-no-fixedincludes: rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ + $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ (cd ./gcc && \ $(MAKE) $(GCC_FLAGS_TO_PASS) install); \ @@ -36606,42 +27841,42 @@ gcc-no-fixedincludes: # stage_last instead tracks the stage that was built last. These targets # are dummy when toplevel bootstrap is not active. -# While making host and target tools, symlinks to the final stage must be -# there, so $(unstage) should be run at various points. To avoid excessive -# recursive invocations of make, we "inline" them using a variable. These -# must be referenced as ": $(MAKE) ; $(unstage)" rather than "$(unstage)" -# to avoid warnings from the GNU Make job server. - -unstage = : -stage = : -current_stage = "" - +.PHONY: unstage +unstage: @if gcc-bootstrap -unstage = [ -f stage_current ] || $(MAKE) `cat stage_last`-start -stage = if [ -f stage_current ]; then $(MAKE) `cat stage_current`-end || exit 1; else :; fi -current_stage = "`cat stage_current 2> /dev/null`" + @[ -f stage_current ] || $(MAKE) `cat stage_last`-start @endif gcc-bootstrap -.PHONY: unstage stage -unstage: - @: $(MAKE); $(unstage) +.PHONY: stage stage: - @: $(MAKE); $(stage) - -# Disable commands for lean bootstrap. -LEAN = false +@if gcc-bootstrap + @$(MAKE) `cat stage_current`-end +@endif gcc-bootstrap # We name the build directories for the various stages "stage1-gcc", # "stage2-gcc","stage3-gcc", etc. # Since the 'compare' process will fail (on debugging information) if any # directory names are different, we need to link the gcc directory for -# the previous stage to a constant name ('prev-gcc'), and to make the name of +# the previous stage to a constant name ('gcc-prev'), and to make the name of # the build directories constant as well. For the latter, we use naked names # like 'gcc', because the scripts in that directory assume it. We use # mv on platforms where symlinks to directories do not work or are not # reliable. +# At the end of the bootstrap, a symlink to 'stage3-gcc' named 'gcc' must +# be kept, so that libraries can find it. Ick! + +# It would be best to preinstall gcc into a staging area (and in the +# future, gather there all prebootstrap packages). This would allow +# assemblers and linkers can be bootstrapped as well as the compiler +# (both in a combined tree, or separately). This however requires some +# change to the gcc driver, again in order to avoid comparison failures. + +# Bugs: This is crippled when doing parallel make, the `make all-host' +# and `make all-target' phases can be parallelized. + + # 'touch' doesn't work right on some platforms. STAMP = echo timestamp > @@ -36660,10 +27895,8 @@ objext = .o # Flags to pass to stage2 and later makes. POSTSTAGE1_FLAGS_TO_PASS = \ CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ - STAGE_PREFIX=$$r/prev-gcc/ \ + STAGE_PREFIX=$$r/stage-gcc/ \ CFLAGS="$(BOOT_CFLAGS)" \ - LIBCFLAGS="$(BOOT_CFLAGS)" \ - LDFLAGS="$(BOOT_LDFLAGS)" \ ADAC="\$$(CC)" # For stage 1: @@ -36679,146 +27912,661 @@ POSTSTAGE1_FLAGS_TO_PASS = \ .PHONY: stage1-start stage1-end stage1-start:: - @: $(MAKE); $(stage); \ + @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ echo stage1 > stage_current ; \ - echo stage1 > stage_last; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) + echo stage1 > stage_last @if bfd - @cd $(HOST_SUBDIR); [ -d stage1-bfd ] || \ - mkdir stage1-bfd; \ - mv stage1-bfd bfd + @[ -d stage1-bfd ] || mkdir stage1-bfd; \ + set stage1-bfd bfd ; @CREATE_LINK_TO_DIR@ @endif bfd @if opcodes - @cd $(HOST_SUBDIR); [ -d stage1-opcodes ] || \ - mkdir stage1-opcodes; \ - mv stage1-opcodes opcodes + @[ -d stage1-opcodes ] || mkdir stage1-opcodes; \ + set stage1-opcodes opcodes ; @CREATE_LINK_TO_DIR@ @endif opcodes @if binutils - @cd $(HOST_SUBDIR); [ -d stage1-binutils ] || \ - mkdir stage1-binutils; \ - mv stage1-binutils binutils + @[ -d stage1-binutils ] || mkdir stage1-binutils; \ + set stage1-binutils binutils ; @CREATE_LINK_TO_DIR@ @endif binutils @if gas - @cd $(HOST_SUBDIR); [ -d stage1-gas ] || \ - mkdir stage1-gas; \ - mv stage1-gas gas + @[ -d stage1-gas ] || mkdir stage1-gas; \ + set stage1-gas gas ; @CREATE_LINK_TO_DIR@ @endif gas @if gcc - @cd $(HOST_SUBDIR); [ -d stage1-gcc ] || \ - mkdir stage1-gcc; \ - mv stage1-gcc gcc + @[ -d stage1-gcc ] || mkdir stage1-gcc; \ + set stage1-gcc gcc ; @CREATE_LINK_TO_DIR@ @endif gcc @if intl - @cd $(HOST_SUBDIR); [ -d stage1-intl ] || \ - mkdir stage1-intl; \ - mv stage1-intl intl + @[ -d stage1-intl ] || mkdir stage1-intl; \ + set stage1-intl intl ; @CREATE_LINK_TO_DIR@ @endif intl @if ld - @cd $(HOST_SUBDIR); [ -d stage1-ld ] || \ - mkdir stage1-ld; \ - mv stage1-ld ld + @[ -d stage1-ld ] || mkdir stage1-ld; \ + set stage1-ld ld ; @CREATE_LINK_TO_DIR@ @endif ld @if libcpp - @cd $(HOST_SUBDIR); [ -d stage1-libcpp ] || \ - mkdir stage1-libcpp; \ - mv stage1-libcpp libcpp + @[ -d stage1-libcpp ] || mkdir stage1-libcpp; \ + set stage1-libcpp libcpp ; @CREATE_LINK_TO_DIR@ @endif libcpp -@if libdecnumber - @cd $(HOST_SUBDIR); [ -d stage1-libdecnumber ] || \ - mkdir stage1-libdecnumber; \ - mv stage1-libdecnumber libdecnumber -@endif libdecnumber @if libiberty - @cd $(HOST_SUBDIR); [ -d stage1-libiberty ] || \ - mkdir stage1-libiberty; \ - mv stage1-libiberty libiberty + @[ -d stage1-libiberty ] || mkdir stage1-libiberty; \ + set stage1-libiberty libiberty ; @CREATE_LINK_TO_DIR@ @endif libiberty @if zlib - @cd $(HOST_SUBDIR); [ -d stage1-zlib ] || \ - mkdir stage1-zlib; \ - mv stage1-zlib zlib + @[ -d stage1-zlib ] || mkdir stage1-zlib; \ + set stage1-zlib zlib ; @CREATE_LINK_TO_DIR@ @endif zlib - @[ -d stage1-$(TARGET_SUBDIR) ] || \ - mkdir stage1-$(TARGET_SUBDIR); \ - mv stage1-$(TARGET_SUBDIR) $(TARGET_SUBDIR) -stage1-end:: +stage1-end:: + @rm -f stage_current @if bfd - @if test -d $(HOST_SUBDIR)/bfd ; then \ - cd $(HOST_SUBDIR); mv bfd stage1-bfd ; \ - fi + @set bfd stage1-bfd ; @UNDO_LINK_TO_DIR@ @endif bfd @if opcodes - @if test -d $(HOST_SUBDIR)/opcodes ; then \ - cd $(HOST_SUBDIR); mv opcodes stage1-opcodes ; \ - fi + @set opcodes stage1-opcodes ; @UNDO_LINK_TO_DIR@ @endif opcodes @if binutils - @if test -d $(HOST_SUBDIR)/binutils ; then \ - cd $(HOST_SUBDIR); mv binutils stage1-binutils ; \ - fi + @set binutils stage1-binutils ; @UNDO_LINK_TO_DIR@ @endif binutils @if gas - @if test -d $(HOST_SUBDIR)/gas ; then \ - cd $(HOST_SUBDIR); mv gas stage1-gas ; \ - fi + @set gas stage1-gas ; @UNDO_LINK_TO_DIR@ @endif gas @if gcc - @if test -d $(HOST_SUBDIR)/gcc ; then \ - cd $(HOST_SUBDIR); mv gcc stage1-gcc ; \ - fi + @set gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ @endif gcc @if intl - @if test -d $(HOST_SUBDIR)/intl ; then \ - cd $(HOST_SUBDIR); mv intl stage1-intl ; \ - fi + @set intl stage1-intl ; @UNDO_LINK_TO_DIR@ @endif intl @if ld - @if test -d $(HOST_SUBDIR)/ld ; then \ - cd $(HOST_SUBDIR); mv ld stage1-ld ; \ - fi + @set ld stage1-ld ; @UNDO_LINK_TO_DIR@ @endif ld @if libcpp - @if test -d $(HOST_SUBDIR)/libcpp ; then \ - cd $(HOST_SUBDIR); mv libcpp stage1-libcpp ; \ - fi + @set libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ @endif libcpp -@if libdecnumber - @if test -d $(HOST_SUBDIR)/libdecnumber ; then \ - cd $(HOST_SUBDIR); mv libdecnumber stage1-libdecnumber ; \ - fi -@endif libdecnumber @if libiberty - @if test -d $(HOST_SUBDIR)/libiberty ; then \ - cd $(HOST_SUBDIR); mv libiberty stage1-libiberty ; \ - fi + @set libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ @endif libiberty @if zlib - @if test -d $(HOST_SUBDIR)/zlib ; then \ - cd $(HOST_SUBDIR); mv zlib stage1-zlib ; \ - fi + @set zlib stage1-zlib ; @UNDO_LINK_TO_DIR@ @endif zlib - @if test -d $(TARGET_SUBDIR) ; then \ - mv $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; \ - fi - rm -f stage_current -# Bubble a bugfix through all the stages up to stage 1. They are -# remade, but not reconfigured. The next stage (if any) will not be -# reconfigured as well. +# Bubble a bugfix through all the stages up to stage 1. They +# are remade, but not reconfigured. The next stage (if any) will not +# be reconfigured as well. .PHONY: stage1-bubble stage1-bubble:: - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - if test -f stage1-lean ; then \ + @if test -f stage1-lean ; then \ echo Skipping rebuild of stage1 ; \ else \ - $(MAKE) stage1-start; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage1; \ fi .PHONY: all-stage1 clean-stage1 +all-stage1: \ + maybe-all-stage1-bfd \ + maybe-all-stage1-opcodes \ + maybe-all-stage1-binutils \ + maybe-all-stage1-gas \ + maybe-all-stage1-gcc \ + maybe-all-stage1-intl \ + maybe-all-stage1-ld \ + maybe-all-stage1-libcpp \ + maybe-all-stage1-libiberty \ + maybe-all-stage1-zlib + do-clean: clean-stage1 +clean-stage1: \ + maybe-clean-stage1-bfd \ + maybe-clean-stage1-opcodes \ + maybe-clean-stage1-binutils \ + maybe-clean-stage1-gas \ + maybe-clean-stage1-gcc \ + maybe-clean-stage1-intl \ + maybe-clean-stage1-ld \ + maybe-clean-stage1-libcpp \ + maybe-clean-stage1-libiberty \ + maybe-clean-stage1-zlib + + +.PHONY: configure-stage1-bfd maybe-configure-stage1-bfd +.PHONY: all-stage1-bfd maybe-all-stage1-bfd +.PHONY: clean-stage1-bfd maybe-clean-stage1-bfd + +maybe-configure-stage1-bfd: +maybe-all-stage1-bfd: +maybe-clean-stage1-bfd: + +@if bfd-bootstrap +maybe-configure-stage1-bfd: configure-stage1-bfd +configure-stage1-bfd: + @$(MAKE) stage1-start + @[ -f bfd/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + echo Configuring stage 1 in bfd ; \ + cd bfd || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/bfd"; \ + libsrcdir="$$s/bfd";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/bfd"; \ + libsrcdir="$$s/bfd";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + +maybe-all-stage1-bfd: all-stage1-bfd +all-stage1-bfd: configure-stage1-bfd + @$(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + cd bfd && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" + +maybe-clean-stage1-bfd: clean-stage1-bfd +clean-stage1-bfd: + @[ -f bfd/Makefile ] || [ -f stage1-bfd/Makefile ] \ + || exit 0 ; \ + [ -f bfd/Makefile ] || $(MAKE) stage1-start ; \ + cd bfd && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" clean +@endif bfd-bootstrap + + +.PHONY: configure-stage1-opcodes maybe-configure-stage1-opcodes +.PHONY: all-stage1-opcodes maybe-all-stage1-opcodes +.PHONY: clean-stage1-opcodes maybe-clean-stage1-opcodes + +maybe-configure-stage1-opcodes: +maybe-all-stage1-opcodes: +maybe-clean-stage1-opcodes: + +@if opcodes-bootstrap +maybe-configure-stage1-opcodes: configure-stage1-opcodes +configure-stage1-opcodes: + @$(MAKE) stage1-start + @[ -f opcodes/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + echo Configuring stage 1 in opcodes ; \ + cd opcodes || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/opcodes"; \ + libsrcdir="$$s/opcodes";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/opcodes"; \ + libsrcdir="$$s/opcodes";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + +maybe-all-stage1-opcodes: all-stage1-opcodes +all-stage1-opcodes: configure-stage1-opcodes + @$(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + cd opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" + +maybe-clean-stage1-opcodes: clean-stage1-opcodes +clean-stage1-opcodes: + @[ -f opcodes/Makefile ] || [ -f stage1-opcodes/Makefile ] \ + || exit 0 ; \ + [ -f opcodes/Makefile ] || $(MAKE) stage1-start ; \ + cd opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" clean +@endif opcodes-bootstrap + + +.PHONY: configure-stage1-binutils maybe-configure-stage1-binutils +.PHONY: all-stage1-binutils maybe-all-stage1-binutils +.PHONY: clean-stage1-binutils maybe-clean-stage1-binutils + +maybe-configure-stage1-binutils: +maybe-all-stage1-binutils: +maybe-clean-stage1-binutils: + +@if binutils-bootstrap +maybe-configure-stage1-binutils: configure-stage1-binutils +configure-stage1-binutils: + @$(MAKE) stage1-start + @[ -f binutils/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + echo Configuring stage 1 in binutils ; \ + cd binutils || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/binutils"; \ + libsrcdir="$$s/binutils";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/binutils"; \ + libsrcdir="$$s/binutils";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + +maybe-all-stage1-binutils: all-stage1-binutils +all-stage1-binutils: configure-stage1-binutils + @$(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + cd binutils && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" + +maybe-clean-stage1-binutils: clean-stage1-binutils +clean-stage1-binutils: + @[ -f binutils/Makefile ] || [ -f stage1-binutils/Makefile ] \ + || exit 0 ; \ + [ -f binutils/Makefile ] || $(MAKE) stage1-start ; \ + cd binutils && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" clean +@endif binutils-bootstrap + + +.PHONY: configure-stage1-gas maybe-configure-stage1-gas +.PHONY: all-stage1-gas maybe-all-stage1-gas +.PHONY: clean-stage1-gas maybe-clean-stage1-gas + +maybe-configure-stage1-gas: +maybe-all-stage1-gas: +maybe-clean-stage1-gas: + +@if gas-bootstrap +maybe-configure-stage1-gas: configure-stage1-gas +configure-stage1-gas: + @$(MAKE) stage1-start + @[ -f gas/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + echo Configuring stage 1 in gas ; \ + cd gas || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gas"; \ + libsrcdir="$$s/gas";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gas"; \ + libsrcdir="$$s/gas";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + +maybe-all-stage1-gas: all-stage1-gas +all-stage1-gas: configure-stage1-gas + @$(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + cd gas && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" + +maybe-clean-stage1-gas: clean-stage1-gas +clean-stage1-gas: + @[ -f gas/Makefile ] || [ -f stage1-gas/Makefile ] \ + || exit 0 ; \ + [ -f gas/Makefile ] || $(MAKE) stage1-start ; \ + cd gas && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" clean +@endif gas-bootstrap + + +.PHONY: configure-stage1-gcc maybe-configure-stage1-gcc +.PHONY: all-stage1-gcc maybe-all-stage1-gcc +.PHONY: clean-stage1-gcc maybe-clean-stage1-gcc + +maybe-configure-stage1-gcc: +maybe-all-stage1-gcc: +maybe-clean-stage1-gcc: + +@if gcc-bootstrap +maybe-configure-stage1-gcc: configure-stage1-gcc +configure-stage1-gcc: + @$(MAKE) stage1-start + @[ -f gcc/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + echo Configuring stage 1 in gcc ; \ + cd gcc || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gcc"; \ + libsrcdir="$$s/gcc";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gcc"; \ + libsrcdir="$$s/gcc";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + +maybe-all-stage1-gcc: all-stage1-gcc +all-stage1-gcc: configure-stage1-gcc + @$(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + cd gcc && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) + +maybe-clean-stage1-gcc: clean-stage1-gcc +clean-stage1-gcc: + @[ -f gcc/Makefile ] || [ -f stage1-gcc/Makefile ] \ + || exit 0 ; \ + [ -f gcc/Makefile ] || $(MAKE) stage1-start ; \ + cd gcc && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) clean +@endif gcc-bootstrap + + +.PHONY: configure-stage1-intl maybe-configure-stage1-intl +.PHONY: all-stage1-intl maybe-all-stage1-intl +.PHONY: clean-stage1-intl maybe-clean-stage1-intl + +maybe-configure-stage1-intl: +maybe-all-stage1-intl: +maybe-clean-stage1-intl: + +@if intl-bootstrap +maybe-configure-stage1-intl: configure-stage1-intl +configure-stage1-intl: + @$(MAKE) stage1-start + @[ -f intl/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + echo Configuring stage 1 in intl ; \ + cd intl || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/intl"; \ + libsrcdir="$$s/intl";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/intl"; \ + libsrcdir="$$s/intl";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + +maybe-all-stage1-intl: all-stage1-intl +all-stage1-intl: configure-stage1-intl + @$(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + cd intl && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" + +maybe-clean-stage1-intl: clean-stage1-intl +clean-stage1-intl: + @[ -f intl/Makefile ] || [ -f stage1-intl/Makefile ] \ + || exit 0 ; \ + [ -f intl/Makefile ] || $(MAKE) stage1-start ; \ + cd intl && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" clean +@endif intl-bootstrap + + +.PHONY: configure-stage1-ld maybe-configure-stage1-ld +.PHONY: all-stage1-ld maybe-all-stage1-ld +.PHONY: clean-stage1-ld maybe-clean-stage1-ld + +maybe-configure-stage1-ld: +maybe-all-stage1-ld: +maybe-clean-stage1-ld: + +@if ld-bootstrap +maybe-configure-stage1-ld: configure-stage1-ld +configure-stage1-ld: + @$(MAKE) stage1-start + @[ -f ld/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + echo Configuring stage 1 in ld ; \ + cd ld || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/ld"; \ + libsrcdir="$$s/ld";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/ld"; \ + libsrcdir="$$s/ld";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + +maybe-all-stage1-ld: all-stage1-ld +all-stage1-ld: configure-stage1-ld + @$(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + cd ld && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" + +maybe-clean-stage1-ld: clean-stage1-ld +clean-stage1-ld: + @[ -f ld/Makefile ] || [ -f stage1-ld/Makefile ] \ + || exit 0 ; \ + [ -f ld/Makefile ] || $(MAKE) stage1-start ; \ + cd ld && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" clean +@endif ld-bootstrap + + +.PHONY: configure-stage1-libcpp maybe-configure-stage1-libcpp +.PHONY: all-stage1-libcpp maybe-all-stage1-libcpp +.PHONY: clean-stage1-libcpp maybe-clean-stage1-libcpp + +maybe-configure-stage1-libcpp: +maybe-all-stage1-libcpp: +maybe-clean-stage1-libcpp: + +@if libcpp-bootstrap +maybe-configure-stage1-libcpp: configure-stage1-libcpp +configure-stage1-libcpp: + @$(MAKE) stage1-start + @[ -f libcpp/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + echo Configuring stage 1 in libcpp ; \ + cd libcpp || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/libcpp"; \ + libsrcdir="$$s/libcpp";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/libcpp"; \ + libsrcdir="$$s/libcpp";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + +maybe-all-stage1-libcpp: all-stage1-libcpp +all-stage1-libcpp: configure-stage1-libcpp + @$(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + cd libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" + +maybe-clean-stage1-libcpp: clean-stage1-libcpp +clean-stage1-libcpp: + @[ -f libcpp/Makefile ] || [ -f stage1-libcpp/Makefile ] \ + || exit 0 ; \ + [ -f libcpp/Makefile ] || $(MAKE) stage1-start ; \ + cd libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" clean +@endif libcpp-bootstrap + + +.PHONY: configure-stage1-libiberty maybe-configure-stage1-libiberty +.PHONY: all-stage1-libiberty maybe-all-stage1-libiberty +.PHONY: clean-stage1-libiberty maybe-clean-stage1-libiberty + +maybe-configure-stage1-libiberty: +maybe-all-stage1-libiberty: +maybe-clean-stage1-libiberty: + +@if libiberty-bootstrap +maybe-configure-stage1-libiberty: configure-stage1-libiberty +configure-stage1-libiberty: + @$(MAKE) stage1-start + @[ -f libiberty/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + echo Configuring stage 1 in libiberty ; \ + cd libiberty || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/libiberty"; \ + libsrcdir="$$s/libiberty";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/libiberty"; \ + libsrcdir="$$s/libiberty";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + +maybe-all-stage1-libiberty: all-stage1-libiberty +all-stage1-libiberty: configure-stage1-libiberty + @$(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + cd libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" + +maybe-clean-stage1-libiberty: clean-stage1-libiberty +clean-stage1-libiberty: + @[ -f libiberty/Makefile ] || [ -f stage1-libiberty/Makefile ] \ + || exit 0 ; \ + [ -f libiberty/Makefile ] || $(MAKE) stage1-start ; \ + cd libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" clean +@endif libiberty-bootstrap + + +.PHONY: configure-stage1-zlib maybe-configure-stage1-zlib +.PHONY: all-stage1-zlib maybe-all-stage1-zlib +.PHONY: clean-stage1-zlib maybe-clean-stage1-zlib + +maybe-configure-stage1-zlib: +maybe-all-stage1-zlib: +maybe-clean-stage1-zlib: + +@if zlib-bootstrap +maybe-configure-stage1-zlib: configure-stage1-zlib +configure-stage1-zlib: + @$(MAKE) stage1-start + @[ -f zlib/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + echo Configuring stage 1 in zlib ; \ + cd zlib || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/zlib"; \ + libsrcdir="$$s/zlib";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/zlib"; \ + libsrcdir="$$s/zlib";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + +maybe-all-stage1-zlib: all-stage1-zlib +all-stage1-zlib: configure-stage1-zlib + @$(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + cd zlib && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" + +maybe-clean-stage1-zlib: clean-stage1-zlib +clean-stage1-zlib: + @[ -f zlib/Makefile ] || [ -f stage1-zlib/Makefile ] \ + || exit 0 ; \ + [ -f zlib/Makefile ] || $(MAKE) stage1-start ; \ + cd zlib && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" clean +@endif zlib-bootstrap + + # FIXME: Will not need to be conditional when toplevel bootstrap is the # only possibility, but now it conflicts with no-bootstrap rules @@ -36831,7 +28579,7 @@ do-clean: clean-stage1 .PHONY: distclean-stage1 distclean-stage1:: - @: $(MAKE); $(stage) + [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : rm -rf stage1-* @@ -36841,204 +28589,717 @@ distclean-stage1:: .PHONY: stage2-start stage2-end stage2-start:: - @: $(MAKE); $(stage); \ + @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ echo stage2 > stage_current ; \ - echo stage2 > stage_last; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) + echo stage2 > stage_last @if bfd - @cd $(HOST_SUBDIR); [ -d stage2-bfd ] || \ - mkdir stage2-bfd; \ - mv stage2-bfd bfd ; \ - mv stage1-bfd prev-bfd || test -f stage1-lean + @[ -d stage2-bfd ] || mkdir stage2-bfd; \ + set stage2-bfd bfd ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-bfd prev-bfd ; @CREATE_LINK_TO_DIR@ @endif bfd @if opcodes - @cd $(HOST_SUBDIR); [ -d stage2-opcodes ] || \ - mkdir stage2-opcodes; \ - mv stage2-opcodes opcodes ; \ - mv stage1-opcodes prev-opcodes || test -f stage1-lean + @[ -d stage2-opcodes ] || mkdir stage2-opcodes; \ + set stage2-opcodes opcodes ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-opcodes prev-opcodes ; @CREATE_LINK_TO_DIR@ @endif opcodes @if binutils - @cd $(HOST_SUBDIR); [ -d stage2-binutils ] || \ - mkdir stage2-binutils; \ - mv stage2-binutils binutils ; \ - mv stage1-binutils prev-binutils || test -f stage1-lean + @[ -d stage2-binutils ] || mkdir stage2-binutils; \ + set stage2-binutils binutils ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-binutils prev-binutils ; @CREATE_LINK_TO_DIR@ @endif binutils @if gas - @cd $(HOST_SUBDIR); [ -d stage2-gas ] || \ - mkdir stage2-gas; \ - mv stage2-gas gas ; \ - mv stage1-gas prev-gas || test -f stage1-lean + @[ -d stage2-gas ] || mkdir stage2-gas; \ + set stage2-gas gas ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-gas prev-gas ; @CREATE_LINK_TO_DIR@ @endif gas @if gcc - @cd $(HOST_SUBDIR); [ -d stage2-gcc ] || \ - mkdir stage2-gcc; \ - mv stage2-gcc gcc ; \ - mv stage1-gcc prev-gcc || test -f stage1-lean + @[ -d stage2-gcc ] || mkdir stage2-gcc; \ + set stage2-gcc gcc ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ @endif gcc @if intl - @cd $(HOST_SUBDIR); [ -d stage2-intl ] || \ - mkdir stage2-intl; \ - mv stage2-intl intl ; \ - mv stage1-intl prev-intl || test -f stage1-lean + @[ -d stage2-intl ] || mkdir stage2-intl; \ + set stage2-intl intl ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-intl prev-intl ; @CREATE_LINK_TO_DIR@ @endif intl @if ld - @cd $(HOST_SUBDIR); [ -d stage2-ld ] || \ - mkdir stage2-ld; \ - mv stage2-ld ld ; \ - mv stage1-ld prev-ld || test -f stage1-lean + @[ -d stage2-ld ] || mkdir stage2-ld; \ + set stage2-ld ld ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-ld prev-ld ; @CREATE_LINK_TO_DIR@ @endif ld @if libcpp - @cd $(HOST_SUBDIR); [ -d stage2-libcpp ] || \ - mkdir stage2-libcpp; \ - mv stage2-libcpp libcpp ; \ - mv stage1-libcpp prev-libcpp || test -f stage1-lean + @[ -d stage2-libcpp ] || mkdir stage2-libcpp; \ + set stage2-libcpp libcpp ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ @endif libcpp -@if libdecnumber - @cd $(HOST_SUBDIR); [ -d stage2-libdecnumber ] || \ - mkdir stage2-libdecnumber; \ - mv stage2-libdecnumber libdecnumber ; \ - mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean -@endif libdecnumber @if libiberty - @cd $(HOST_SUBDIR); [ -d stage2-libiberty ] || \ - mkdir stage2-libiberty; \ - mv stage2-libiberty libiberty ; \ - mv stage1-libiberty prev-libiberty || test -f stage1-lean + @[ -d stage2-libiberty ] || mkdir stage2-libiberty; \ + set stage2-libiberty libiberty ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-libiberty prev-libiberty ; @CREATE_LINK_TO_DIR@ @endif libiberty @if zlib - @cd $(HOST_SUBDIR); [ -d stage2-zlib ] || \ - mkdir stage2-zlib; \ - mv stage2-zlib zlib ; \ - mv stage1-zlib prev-zlib || test -f stage1-lean + @[ -d stage2-zlib ] || mkdir stage2-zlib; \ + set stage2-zlib zlib ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-zlib prev-zlib ; @CREATE_LINK_TO_DIR@ @endif zlib - @[ -d stage2-$(TARGET_SUBDIR) ] || \ - mkdir stage2-$(TARGET_SUBDIR); \ - mv stage2-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ - mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean -stage2-end:: +stage2-end:: + @rm -f stage_current @if bfd - @if test -d $(HOST_SUBDIR)/bfd ; then \ - cd $(HOST_SUBDIR); mv bfd stage2-bfd ; \ - mv prev-bfd stage1-bfd ; : ; \ - fi + @set bfd stage2-bfd ; @UNDO_LINK_TO_DIR@ ; \ + set prev-bfd stage1-bfd ; @UNDO_LINK_TO_DIR@ @endif bfd @if opcodes - @if test -d $(HOST_SUBDIR)/opcodes ; then \ - cd $(HOST_SUBDIR); mv opcodes stage2-opcodes ; \ - mv prev-opcodes stage1-opcodes ; : ; \ - fi + @set opcodes stage2-opcodes ; @UNDO_LINK_TO_DIR@ ; \ + set prev-opcodes stage1-opcodes ; @UNDO_LINK_TO_DIR@ @endif opcodes @if binutils - @if test -d $(HOST_SUBDIR)/binutils ; then \ - cd $(HOST_SUBDIR); mv binutils stage2-binutils ; \ - mv prev-binutils stage1-binutils ; : ; \ - fi + @set binutils stage2-binutils ; @UNDO_LINK_TO_DIR@ ; \ + set prev-binutils stage1-binutils ; @UNDO_LINK_TO_DIR@ @endif binutils @if gas - @if test -d $(HOST_SUBDIR)/gas ; then \ - cd $(HOST_SUBDIR); mv gas stage2-gas ; \ - mv prev-gas stage1-gas ; : ; \ - fi + @set gas stage2-gas ; @UNDO_LINK_TO_DIR@ ; \ + set prev-gas stage1-gas ; @UNDO_LINK_TO_DIR@ @endif gas @if gcc - @if test -d $(HOST_SUBDIR)/gcc ; then \ - cd $(HOST_SUBDIR); mv gcc stage2-gcc ; \ - mv prev-gcc stage1-gcc ; : ; \ - fi + @set gcc stage2-gcc ; @UNDO_LINK_TO_DIR@ ; \ + set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ @endif gcc @if intl - @if test -d $(HOST_SUBDIR)/intl ; then \ - cd $(HOST_SUBDIR); mv intl stage2-intl ; \ - mv prev-intl stage1-intl ; : ; \ - fi + @set intl stage2-intl ; @UNDO_LINK_TO_DIR@ ; \ + set prev-intl stage1-intl ; @UNDO_LINK_TO_DIR@ @endif intl @if ld - @if test -d $(HOST_SUBDIR)/ld ; then \ - cd $(HOST_SUBDIR); mv ld stage2-ld ; \ - mv prev-ld stage1-ld ; : ; \ - fi + @set ld stage2-ld ; @UNDO_LINK_TO_DIR@ ; \ + set prev-ld stage1-ld ; @UNDO_LINK_TO_DIR@ @endif ld @if libcpp - @if test -d $(HOST_SUBDIR)/libcpp ; then \ - cd $(HOST_SUBDIR); mv libcpp stage2-libcpp ; \ - mv prev-libcpp stage1-libcpp ; : ; \ - fi + @set libcpp stage2-libcpp ; @UNDO_LINK_TO_DIR@ ; \ + set prev-libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ @endif libcpp -@if libdecnumber - @if test -d $(HOST_SUBDIR)/libdecnumber ; then \ - cd $(HOST_SUBDIR); mv libdecnumber stage2-libdecnumber ; \ - mv prev-libdecnumber stage1-libdecnumber ; : ; \ - fi -@endif libdecnumber @if libiberty - @if test -d $(HOST_SUBDIR)/libiberty ; then \ - cd $(HOST_SUBDIR); mv libiberty stage2-libiberty ; \ - mv prev-libiberty stage1-libiberty ; : ; \ - fi + @set libiberty stage2-libiberty ; @UNDO_LINK_TO_DIR@ ; \ + set prev-libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ @endif libiberty @if zlib - @if test -d $(HOST_SUBDIR)/zlib ; then \ - cd $(HOST_SUBDIR); mv zlib stage2-zlib ; \ - mv prev-zlib stage1-zlib ; : ; \ - fi + @set zlib stage2-zlib ; @UNDO_LINK_TO_DIR@ ; \ + set prev-zlib stage1-zlib ; @UNDO_LINK_TO_DIR@ @endif zlib - @if test -d $(TARGET_SUBDIR) ; then \ - mv $(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR) ; \ - mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; : ; \ - fi - rm -f stage_current -# Bubble a bugfix through all the stages up to stage 2. They are -# remade, but not reconfigured. The next stage (if any) will not be -# reconfigured as well. +# Bubble a bugfix through all the stages up to stage 2. They +# are remade, but not reconfigured. The next stage (if any) will not +# be reconfigured as well. .PHONY: stage2-bubble stage2-bubble:: stage1-bubble - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - if test -f stage2-lean || test -f stage1-lean ; then \ + @if test -f stage2-lean || test -f stage1-lean ; then \ echo Skipping rebuild of stage2 ; \ else \ - $(MAKE) stage2-start; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage2; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage2; \ fi .PHONY: all-stage2 clean-stage2 +all-stage2: \ + maybe-all-stage2-bfd \ + maybe-all-stage2-opcodes \ + maybe-all-stage2-binutils \ + maybe-all-stage2-gas \ + maybe-all-stage2-gcc \ + maybe-all-stage2-intl \ + maybe-all-stage2-ld \ + maybe-all-stage2-libcpp \ + maybe-all-stage2-libiberty \ + maybe-all-stage2-zlib + do-clean: clean-stage2 +clean-stage2: \ + maybe-clean-stage2-bfd \ + maybe-clean-stage2-opcodes \ + maybe-clean-stage2-binutils \ + maybe-clean-stage2-gas \ + maybe-clean-stage2-gcc \ + maybe-clean-stage2-intl \ + maybe-clean-stage2-ld \ + maybe-clean-stage2-libcpp \ + maybe-clean-stage2-libiberty \ + maybe-clean-stage2-zlib + + +.PHONY: configure-stage2-bfd maybe-configure-stage2-bfd +.PHONY: all-stage2-bfd maybe-all-stage2-bfd +.PHONY: clean-stage2-bfd maybe-clean-stage2-bfd + +maybe-configure-stage2-bfd: +maybe-all-stage2-bfd: +maybe-clean-stage2-bfd: + +@if bfd-bootstrap +maybe-configure-stage2-bfd: configure-stage2-bfd +configure-stage2-bfd: + @$(MAKE) stage2-start + @[ -f bfd/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 2 in bfd ; \ + cd bfd || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/bfd"; \ + libsrcdir="$$s/bfd";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/bfd"; \ + libsrcdir="$$s/bfd";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage2-bfd: all-stage2-bfd +all-stage2-bfd: configure-stage2-bfd + @$(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd bfd && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage2-bfd: clean-stage2-bfd +clean-stage2-bfd: + @[ -f bfd/Makefile ] || [ -f stage2-bfd/Makefile ] \ + || exit 0 ; \ + [ -f bfd/Makefile ] || $(MAKE) stage2-start ; \ + cd bfd && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif bfd-bootstrap + + +.PHONY: configure-stage2-opcodes maybe-configure-stage2-opcodes +.PHONY: all-stage2-opcodes maybe-all-stage2-opcodes +.PHONY: clean-stage2-opcodes maybe-clean-stage2-opcodes + +maybe-configure-stage2-opcodes: +maybe-all-stage2-opcodes: +maybe-clean-stage2-opcodes: + +@if opcodes-bootstrap +maybe-configure-stage2-opcodes: configure-stage2-opcodes +configure-stage2-opcodes: + @$(MAKE) stage2-start + @[ -f opcodes/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 2 in opcodes ; \ + cd opcodes || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/opcodes"; \ + libsrcdir="$$s/opcodes";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/opcodes"; \ + libsrcdir="$$s/opcodes";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage2-opcodes: all-stage2-opcodes +all-stage2-opcodes: configure-stage2-opcodes + @$(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage2-opcodes: clean-stage2-opcodes +clean-stage2-opcodes: + @[ -f opcodes/Makefile ] || [ -f stage2-opcodes/Makefile ] \ + || exit 0 ; \ + [ -f opcodes/Makefile ] || $(MAKE) stage2-start ; \ + cd opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif opcodes-bootstrap + + +.PHONY: configure-stage2-binutils maybe-configure-stage2-binutils +.PHONY: all-stage2-binutils maybe-all-stage2-binutils +.PHONY: clean-stage2-binutils maybe-clean-stage2-binutils + +maybe-configure-stage2-binutils: +maybe-all-stage2-binutils: +maybe-clean-stage2-binutils: + +@if binutils-bootstrap +maybe-configure-stage2-binutils: configure-stage2-binutils +configure-stage2-binutils: + @$(MAKE) stage2-start + @[ -f binutils/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 2 in binutils ; \ + cd binutils || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/binutils"; \ + libsrcdir="$$s/binutils";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/binutils"; \ + libsrcdir="$$s/binutils";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage2-binutils: all-stage2-binutils +all-stage2-binutils: configure-stage2-binutils + @$(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd binutils && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage2-binutils: clean-stage2-binutils +clean-stage2-binutils: + @[ -f binutils/Makefile ] || [ -f stage2-binutils/Makefile ] \ + || exit 0 ; \ + [ -f binutils/Makefile ] || $(MAKE) stage2-start ; \ + cd binutils && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif binutils-bootstrap + + +.PHONY: configure-stage2-gas maybe-configure-stage2-gas +.PHONY: all-stage2-gas maybe-all-stage2-gas +.PHONY: clean-stage2-gas maybe-clean-stage2-gas + +maybe-configure-stage2-gas: +maybe-all-stage2-gas: +maybe-clean-stage2-gas: + +@if gas-bootstrap +maybe-configure-stage2-gas: configure-stage2-gas +configure-stage2-gas: + @$(MAKE) stage2-start + @[ -f gas/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 2 in gas ; \ + cd gas || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gas"; \ + libsrcdir="$$s/gas";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gas"; \ + libsrcdir="$$s/gas";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage2-gas: all-stage2-gas +all-stage2-gas: configure-stage2-gas + @$(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd gas && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage2-gas: clean-stage2-gas +clean-stage2-gas: + @[ -f gas/Makefile ] || [ -f stage2-gas/Makefile ] \ + || exit 0 ; \ + [ -f gas/Makefile ] || $(MAKE) stage2-start ; \ + cd gas && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif gas-bootstrap + + +.PHONY: configure-stage2-gcc maybe-configure-stage2-gcc +.PHONY: all-stage2-gcc maybe-all-stage2-gcc +.PHONY: clean-stage2-gcc maybe-clean-stage2-gcc + +maybe-configure-stage2-gcc: +maybe-all-stage2-gcc: +maybe-clean-stage2-gcc: -# FIXME: Will not need to be conditional when toplevel bootstrap is the -# only possibility, but now it conflicts with no-bootstrap rules @if gcc-bootstrap +maybe-configure-stage2-gcc: configure-stage2-gcc +configure-stage2-gcc: + @$(MAKE) stage2-start + @[ -f gcc/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 2 in gcc ; \ + cd gcc || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gcc"; \ + libsrcdir="$$s/gcc";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gcc"; \ + libsrcdir="$$s/gcc";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +maybe-all-stage2-gcc: all-stage2-gcc +all-stage2-gcc: configure-stage2-gcc + @$(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd gcc && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(EXTRA_GCC_FLAGS) +maybe-clean-stage2-gcc: clean-stage2-gcc +clean-stage2-gcc: + @[ -f gcc/Makefile ] || [ -f stage2-gcc/Makefile ] \ + || exit 0 ; \ + [ -f gcc/Makefile ] || $(MAKE) stage2-start ; \ + cd gcc && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(EXTRA_GCC_FLAGS) clean +@endif gcc-bootstrap + + +.PHONY: configure-stage2-intl maybe-configure-stage2-intl +.PHONY: all-stage2-intl maybe-all-stage2-intl +.PHONY: clean-stage2-intl maybe-clean-stage2-intl -.PHONY: bootstrap2 bootstrap2-lean -bootstrap2: - echo stage2 > stage_final +maybe-configure-stage2-intl: +maybe-all-stage2-intl: +maybe-clean-stage2-intl: + +@if intl-bootstrap +maybe-configure-stage2-intl: configure-stage2-intl +configure-stage2-intl: + @$(MAKE) stage2-start + @[ -f intl/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 2 in intl ; \ + cd intl || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/intl"; \ + libsrcdir="$$s/intl";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/intl"; \ + libsrcdir="$$s/intl";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage2-intl: all-stage2-intl +all-stage2-intl: configure-stage2-intl + @$(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage2-bubble - @: $(MAKE); $(unstage) + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd intl && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage2-intl: clean-stage2-intl +clean-stage2-intl: + @[ -f intl/Makefile ] || [ -f stage2-intl/Makefile ] \ + || exit 0 ; \ + [ -f intl/Makefile ] || $(MAKE) stage2-start ; \ + cd intl && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif intl-bootstrap + + +.PHONY: configure-stage2-ld maybe-configure-stage2-ld +.PHONY: all-stage2-ld maybe-all-stage2-ld +.PHONY: clean-stage2-ld maybe-clean-stage2-ld + +maybe-configure-stage2-ld: +maybe-all-stage2-ld: +maybe-clean-stage2-ld: + +@if ld-bootstrap +maybe-configure-stage2-ld: configure-stage2-ld +configure-stage2-ld: + @$(MAKE) stage2-start + @[ -f ld/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 2 in ld ; \ + cd ld || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/ld"; \ + libsrcdir="$$s/ld";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/ld"; \ + libsrcdir="$$s/ld";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage2-ld: all-stage2-ld +all-stage2-ld: configure-stage2-ld + @$(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd ld && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage2-ld: clean-stage2-ld +clean-stage2-ld: + @[ -f ld/Makefile ] || [ -f stage2-ld/Makefile ] \ + || exit 0 ; \ + [ -f ld/Makefile ] || $(MAKE) stage2-start ; \ + cd ld && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif ld-bootstrap + + +.PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp +.PHONY: all-stage2-libcpp maybe-all-stage2-libcpp +.PHONY: clean-stage2-libcpp maybe-clean-stage2-libcpp + +maybe-configure-stage2-libcpp: +maybe-all-stage2-libcpp: +maybe-clean-stage2-libcpp: + +@if libcpp-bootstrap +maybe-configure-stage2-libcpp: configure-stage2-libcpp +configure-stage2-libcpp: + @$(MAKE) stage2-start + @[ -f libcpp/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 2 in libcpp ; \ + cd libcpp || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/libcpp"; \ + libsrcdir="$$s/libcpp";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/libcpp"; \ + libsrcdir="$$s/libcpp";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ -bootstrap2-lean: - echo stage2 > stage_final +maybe-all-stage2-libcpp: all-stage2-libcpp +all-stage2-libcpp: configure-stage2-libcpp + @$(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage2-bubble - @: $(MAKE); $(unstage) + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage2-libcpp: clean-stage2-libcpp +clean-stage2-libcpp: + @[ -f libcpp/Makefile ] || [ -f stage2-libcpp/Makefile ] \ + || exit 0 ; \ + [ -f libcpp/Makefile ] || $(MAKE) stage2-start ; \ + cd libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif libcpp-bootstrap + + +.PHONY: configure-stage2-libiberty maybe-configure-stage2-libiberty +.PHONY: all-stage2-libiberty maybe-all-stage2-libiberty +.PHONY: clean-stage2-libiberty maybe-clean-stage2-libiberty + +maybe-configure-stage2-libiberty: +maybe-all-stage2-libiberty: +maybe-clean-stage2-libiberty: + +@if libiberty-bootstrap +maybe-configure-stage2-libiberty: configure-stage2-libiberty +configure-stage2-libiberty: + @$(MAKE) stage2-start + @[ -f libiberty/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 2 in libiberty ; \ + cd libiberty || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/libiberty"; \ + libsrcdir="$$s/libiberty";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/libiberty"; \ + libsrcdir="$$s/libiberty";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage2-libiberty: all-stage2-libiberty +all-stage2-libiberty: configure-stage2-libiberty + @$(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage2-libiberty: clean-stage2-libiberty +clean-stage2-libiberty: + @[ -f libiberty/Makefile ] || [ -f stage2-libiberty/Makefile ] \ + || exit 0 ; \ + [ -f libiberty/Makefile ] || $(MAKE) stage2-start ; \ + cd libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif libiberty-bootstrap + + +.PHONY: configure-stage2-zlib maybe-configure-stage2-zlib +.PHONY: all-stage2-zlib maybe-all-stage2-zlib +.PHONY: clean-stage2-zlib maybe-clean-stage2-zlib + +maybe-configure-stage2-zlib: +maybe-all-stage2-zlib: +maybe-clean-stage2-zlib: + +@if zlib-bootstrap +maybe-configure-stage2-zlib: configure-stage2-zlib +configure-stage2-zlib: + @$(MAKE) stage2-start + @[ -f zlib/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 2 in zlib ; \ + cd zlib || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/zlib"; \ + libsrcdir="$$s/zlib";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/zlib"; \ + libsrcdir="$$s/zlib";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage2-zlib: all-stage2-zlib +all-stage2-zlib: configure-stage2-zlib + @$(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd zlib && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage2-zlib: clean-stage2-zlib +clean-stage2-zlib: + @[ -f zlib/Makefile ] || [ -f stage2-zlib/Makefile ] \ + || exit 0 ; \ + [ -f zlib/Makefile ] || $(MAKE) stage2-start ; \ + cd zlib && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif zlib-bootstrap + + + +# FIXME: Will not need to be conditional when toplevel bootstrap is the +# only possibility, but now it conflicts with no-bootstrap rules +@if gcc-bootstrap + + + +.PHONY: bootstrap2 +bootstrap2: stage2-bubble all # Rules to wipe a stage and all the following ones, also used for cleanstrap distclean-stage1:: distclean-stage2 .PHONY: distclean-stage2 distclean-stage2:: - @: $(MAKE); $(stage) + [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : rm -rf stage2-* @@ -37048,247 +29309,745 @@ distclean-stage2:: .PHONY: stage3-start stage3-end stage3-start:: - @: $(MAKE); $(stage); \ + @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ echo stage3 > stage_current ; \ - echo stage3 > stage_last; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) + echo stage3 > stage_last @if bfd - @cd $(HOST_SUBDIR); [ -d stage3-bfd ] || \ - mkdir stage3-bfd; \ - mv stage3-bfd bfd ; \ - mv stage2-bfd prev-bfd || test -f stage2-lean + @[ -d stage3-bfd ] || mkdir stage3-bfd; \ + set stage3-bfd bfd ; @CREATE_LINK_TO_DIR@ ; \ + set stage2-bfd prev-bfd ; @CREATE_LINK_TO_DIR@ @endif bfd @if opcodes - @cd $(HOST_SUBDIR); [ -d stage3-opcodes ] || \ - mkdir stage3-opcodes; \ - mv stage3-opcodes opcodes ; \ - mv stage2-opcodes prev-opcodes || test -f stage2-lean + @[ -d stage3-opcodes ] || mkdir stage3-opcodes; \ + set stage3-opcodes opcodes ; @CREATE_LINK_TO_DIR@ ; \ + set stage2-opcodes prev-opcodes ; @CREATE_LINK_TO_DIR@ @endif opcodes @if binutils - @cd $(HOST_SUBDIR); [ -d stage3-binutils ] || \ - mkdir stage3-binutils; \ - mv stage3-binutils binutils ; \ - mv stage2-binutils prev-binutils || test -f stage2-lean + @[ -d stage3-binutils ] || mkdir stage3-binutils; \ + set stage3-binutils binutils ; @CREATE_LINK_TO_DIR@ ; \ + set stage2-binutils prev-binutils ; @CREATE_LINK_TO_DIR@ @endif binutils @if gas - @cd $(HOST_SUBDIR); [ -d stage3-gas ] || \ - mkdir stage3-gas; \ - mv stage3-gas gas ; \ - mv stage2-gas prev-gas || test -f stage2-lean + @[ -d stage3-gas ] || mkdir stage3-gas; \ + set stage3-gas gas ; @CREATE_LINK_TO_DIR@ ; \ + set stage2-gas prev-gas ; @CREATE_LINK_TO_DIR@ @endif gas @if gcc - @cd $(HOST_SUBDIR); [ -d stage3-gcc ] || \ - mkdir stage3-gcc; \ - mv stage3-gcc gcc ; \ - mv stage2-gcc prev-gcc || test -f stage2-lean + @[ -d stage3-gcc ] || mkdir stage3-gcc; \ + set stage3-gcc gcc ; @CREATE_LINK_TO_DIR@ ; \ + set stage2-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ @endif gcc @if intl - @cd $(HOST_SUBDIR); [ -d stage3-intl ] || \ - mkdir stage3-intl; \ - mv stage3-intl intl ; \ - mv stage2-intl prev-intl || test -f stage2-lean + @[ -d stage3-intl ] || mkdir stage3-intl; \ + set stage3-intl intl ; @CREATE_LINK_TO_DIR@ ; \ + set stage2-intl prev-intl ; @CREATE_LINK_TO_DIR@ @endif intl @if ld - @cd $(HOST_SUBDIR); [ -d stage3-ld ] || \ - mkdir stage3-ld; \ - mv stage3-ld ld ; \ - mv stage2-ld prev-ld || test -f stage2-lean + @[ -d stage3-ld ] || mkdir stage3-ld; \ + set stage3-ld ld ; @CREATE_LINK_TO_DIR@ ; \ + set stage2-ld prev-ld ; @CREATE_LINK_TO_DIR@ @endif ld @if libcpp - @cd $(HOST_SUBDIR); [ -d stage3-libcpp ] || \ - mkdir stage3-libcpp; \ - mv stage3-libcpp libcpp ; \ - mv stage2-libcpp prev-libcpp || test -f stage2-lean + @[ -d stage3-libcpp ] || mkdir stage3-libcpp; \ + set stage3-libcpp libcpp ; @CREATE_LINK_TO_DIR@ ; \ + set stage2-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ @endif libcpp -@if libdecnumber - @cd $(HOST_SUBDIR); [ -d stage3-libdecnumber ] || \ - mkdir stage3-libdecnumber; \ - mv stage3-libdecnumber libdecnumber ; \ - mv stage2-libdecnumber prev-libdecnumber || test -f stage2-lean -@endif libdecnumber @if libiberty - @cd $(HOST_SUBDIR); [ -d stage3-libiberty ] || \ - mkdir stage3-libiberty; \ - mv stage3-libiberty libiberty ; \ - mv stage2-libiberty prev-libiberty || test -f stage2-lean + @[ -d stage3-libiberty ] || mkdir stage3-libiberty; \ + set stage3-libiberty libiberty ; @CREATE_LINK_TO_DIR@ ; \ + set stage2-libiberty prev-libiberty ; @CREATE_LINK_TO_DIR@ @endif libiberty @if zlib - @cd $(HOST_SUBDIR); [ -d stage3-zlib ] || \ - mkdir stage3-zlib; \ - mv stage3-zlib zlib ; \ - mv stage2-zlib prev-zlib || test -f stage2-lean + @[ -d stage3-zlib ] || mkdir stage3-zlib; \ + set stage3-zlib zlib ; @CREATE_LINK_TO_DIR@ ; \ + set stage2-zlib prev-zlib ; @CREATE_LINK_TO_DIR@ @endif zlib - @[ -d stage3-$(TARGET_SUBDIR) ] || \ - mkdir stage3-$(TARGET_SUBDIR); \ - mv stage3-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ - mv stage2-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage2-lean -stage3-end:: +stage3-end:: + @rm -f stage_current @if bfd - @if test -d $(HOST_SUBDIR)/bfd ; then \ - cd $(HOST_SUBDIR); mv bfd stage3-bfd ; \ - mv prev-bfd stage2-bfd ; : ; \ - fi + @set bfd stage3-bfd ; @UNDO_LINK_TO_DIR@ ; \ + set prev-bfd stage2-bfd ; @UNDO_LINK_TO_DIR@ @endif bfd @if opcodes - @if test -d $(HOST_SUBDIR)/opcodes ; then \ - cd $(HOST_SUBDIR); mv opcodes stage3-opcodes ; \ - mv prev-opcodes stage2-opcodes ; : ; \ - fi + @set opcodes stage3-opcodes ; @UNDO_LINK_TO_DIR@ ; \ + set prev-opcodes stage2-opcodes ; @UNDO_LINK_TO_DIR@ @endif opcodes @if binutils - @if test -d $(HOST_SUBDIR)/binutils ; then \ - cd $(HOST_SUBDIR); mv binutils stage3-binutils ; \ - mv prev-binutils stage2-binutils ; : ; \ - fi + @set binutils stage3-binutils ; @UNDO_LINK_TO_DIR@ ; \ + set prev-binutils stage2-binutils ; @UNDO_LINK_TO_DIR@ @endif binutils @if gas - @if test -d $(HOST_SUBDIR)/gas ; then \ - cd $(HOST_SUBDIR); mv gas stage3-gas ; \ - mv prev-gas stage2-gas ; : ; \ - fi + @set gas stage3-gas ; @UNDO_LINK_TO_DIR@ ; \ + set prev-gas stage2-gas ; @UNDO_LINK_TO_DIR@ @endif gas @if gcc - @if test -d $(HOST_SUBDIR)/gcc ; then \ - cd $(HOST_SUBDIR); mv gcc stage3-gcc ; \ - mv prev-gcc stage2-gcc ; : ; \ - fi + @set gcc stage3-gcc ; @UNDO_LINK_TO_DIR@ ; \ + set prev-gcc stage2-gcc ; @UNDO_LINK_TO_DIR@ @endif gcc @if intl - @if test -d $(HOST_SUBDIR)/intl ; then \ - cd $(HOST_SUBDIR); mv intl stage3-intl ; \ - mv prev-intl stage2-intl ; : ; \ - fi + @set intl stage3-intl ; @UNDO_LINK_TO_DIR@ ; \ + set prev-intl stage2-intl ; @UNDO_LINK_TO_DIR@ @endif intl @if ld - @if test -d $(HOST_SUBDIR)/ld ; then \ - cd $(HOST_SUBDIR); mv ld stage3-ld ; \ - mv prev-ld stage2-ld ; : ; \ - fi + @set ld stage3-ld ; @UNDO_LINK_TO_DIR@ ; \ + set prev-ld stage2-ld ; @UNDO_LINK_TO_DIR@ @endif ld @if libcpp - @if test -d $(HOST_SUBDIR)/libcpp ; then \ - cd $(HOST_SUBDIR); mv libcpp stage3-libcpp ; \ - mv prev-libcpp stage2-libcpp ; : ; \ - fi + @set libcpp stage3-libcpp ; @UNDO_LINK_TO_DIR@ ; \ + set prev-libcpp stage2-libcpp ; @UNDO_LINK_TO_DIR@ @endif libcpp -@if libdecnumber - @if test -d $(HOST_SUBDIR)/libdecnumber ; then \ - cd $(HOST_SUBDIR); mv libdecnumber stage3-libdecnumber ; \ - mv prev-libdecnumber stage2-libdecnumber ; : ; \ - fi -@endif libdecnumber @if libiberty - @if test -d $(HOST_SUBDIR)/libiberty ; then \ - cd $(HOST_SUBDIR); mv libiberty stage3-libiberty ; \ - mv prev-libiberty stage2-libiberty ; : ; \ - fi + @set libiberty stage3-libiberty ; @UNDO_LINK_TO_DIR@ ; \ + set prev-libiberty stage2-libiberty ; @UNDO_LINK_TO_DIR@ @endif libiberty @if zlib - @if test -d $(HOST_SUBDIR)/zlib ; then \ - cd $(HOST_SUBDIR); mv zlib stage3-zlib ; \ - mv prev-zlib stage2-zlib ; : ; \ - fi + @set zlib stage3-zlib ; @UNDO_LINK_TO_DIR@ ; \ + set prev-zlib stage2-zlib ; @UNDO_LINK_TO_DIR@ @endif zlib - @if test -d $(TARGET_SUBDIR) ; then \ - mv $(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR) ; \ - mv prev-$(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR) ; : ; \ - fi - rm -f stage_current -# Bubble a bugfix through all the stages up to stage 3. They are -# remade, but not reconfigured. The next stage (if any) will not be -# reconfigured as well. +# Bubble a bugfix through all the stages up to stage 3. They +# are remade, but not reconfigured. The next stage (if any) will not +# be reconfigured as well. .PHONY: stage3-bubble stage3-bubble:: stage2-bubble - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - if test -f stage3-lean || test -f stage2-lean ; then \ + @bootstrap_lean@-rm -rf stage1-* ; $(STAMP) stage1-lean + @if test -f stage3-lean || test -f stage2-lean ; then \ echo Skipping rebuild of stage3 ; \ else \ - $(MAKE) stage3-start; \ - if $(LEAN); then \ - rm -rf stage1-* ; \ - $(STAMP) stage1-lean ; \ - fi; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage3; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage3; \ fi - $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare .PHONY: all-stage3 clean-stage3 +all-stage3: \ + maybe-all-stage3-bfd \ + maybe-all-stage3-opcodes \ + maybe-all-stage3-binutils \ + maybe-all-stage3-gas \ + maybe-all-stage3-gcc \ + maybe-all-stage3-intl \ + maybe-all-stage3-ld \ + maybe-all-stage3-libcpp \ + maybe-all-stage3-libiberty \ + maybe-all-stage3-zlib + do-clean: clean-stage3 +clean-stage3: \ + maybe-clean-stage3-bfd \ + maybe-clean-stage3-opcodes \ + maybe-clean-stage3-binutils \ + maybe-clean-stage3-gas \ + maybe-clean-stage3-gcc \ + maybe-clean-stage3-intl \ + maybe-clean-stage3-ld \ + maybe-clean-stage3-libcpp \ + maybe-clean-stage3-libiberty \ + maybe-clean-stage3-zlib + + +.PHONY: configure-stage3-bfd maybe-configure-stage3-bfd +.PHONY: all-stage3-bfd maybe-all-stage3-bfd +.PHONY: clean-stage3-bfd maybe-clean-stage3-bfd + +maybe-configure-stage3-bfd: +maybe-all-stage3-bfd: +maybe-clean-stage3-bfd: + +@if bfd-bootstrap +maybe-configure-stage3-bfd: configure-stage3-bfd +configure-stage3-bfd: + @$(MAKE) stage3-start + @[ -f bfd/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 3 in bfd ; \ + cd bfd || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/bfd"; \ + libsrcdir="$$s/bfd";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/bfd"; \ + libsrcdir="$$s/bfd";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage3-bfd: all-stage3-bfd +all-stage3-bfd: configure-stage3-bfd + @$(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd bfd && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage3-bfd: clean-stage3-bfd +clean-stage3-bfd: + @[ -f bfd/Makefile ] || [ -f stage3-bfd/Makefile ] \ + || exit 0 ; \ + [ -f bfd/Makefile ] || $(MAKE) stage3-start ; \ + cd bfd && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif bfd-bootstrap + + +.PHONY: configure-stage3-opcodes maybe-configure-stage3-opcodes +.PHONY: all-stage3-opcodes maybe-all-stage3-opcodes +.PHONY: clean-stage3-opcodes maybe-clean-stage3-opcodes + +maybe-configure-stage3-opcodes: +maybe-all-stage3-opcodes: +maybe-clean-stage3-opcodes: + +@if opcodes-bootstrap +maybe-configure-stage3-opcodes: configure-stage3-opcodes +configure-stage3-opcodes: + @$(MAKE) stage3-start + @[ -f opcodes/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 3 in opcodes ; \ + cd opcodes || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/opcodes"; \ + libsrcdir="$$s/opcodes";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/opcodes"; \ + libsrcdir="$$s/opcodes";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage3-opcodes: all-stage3-opcodes +all-stage3-opcodes: configure-stage3-opcodes + @$(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage3-opcodes: clean-stage3-opcodes +clean-stage3-opcodes: + @[ -f opcodes/Makefile ] || [ -f stage3-opcodes/Makefile ] \ + || exit 0 ; \ + [ -f opcodes/Makefile ] || $(MAKE) stage3-start ; \ + cd opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif opcodes-bootstrap + + +.PHONY: configure-stage3-binutils maybe-configure-stage3-binutils +.PHONY: all-stage3-binutils maybe-all-stage3-binutils +.PHONY: clean-stage3-binutils maybe-clean-stage3-binutils + +maybe-configure-stage3-binutils: +maybe-all-stage3-binutils: +maybe-clean-stage3-binutils: + +@if binutils-bootstrap +maybe-configure-stage3-binutils: configure-stage3-binutils +configure-stage3-binutils: + @$(MAKE) stage3-start + @[ -f binutils/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 3 in binutils ; \ + cd binutils || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/binutils"; \ + libsrcdir="$$s/binutils";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/binutils"; \ + libsrcdir="$$s/binutils";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage3-binutils: all-stage3-binutils +all-stage3-binutils: configure-stage3-binutils + @$(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd binutils && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage3-binutils: clean-stage3-binutils +clean-stage3-binutils: + @[ -f binutils/Makefile ] || [ -f stage3-binutils/Makefile ] \ + || exit 0 ; \ + [ -f binutils/Makefile ] || $(MAKE) stage3-start ; \ + cd binutils && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif binutils-bootstrap + + +.PHONY: configure-stage3-gas maybe-configure-stage3-gas +.PHONY: all-stage3-gas maybe-all-stage3-gas +.PHONY: clean-stage3-gas maybe-clean-stage3-gas + +maybe-configure-stage3-gas: +maybe-all-stage3-gas: +maybe-clean-stage3-gas: + +@if gas-bootstrap +maybe-configure-stage3-gas: configure-stage3-gas +configure-stage3-gas: + @$(MAKE) stage3-start + @[ -f gas/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 3 in gas ; \ + cd gas || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gas"; \ + libsrcdir="$$s/gas";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gas"; \ + libsrcdir="$$s/gas";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage3-gas: all-stage3-gas +all-stage3-gas: configure-stage3-gas + @$(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd gas && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage3-gas: clean-stage3-gas +clean-stage3-gas: + @[ -f gas/Makefile ] || [ -f stage3-gas/Makefile ] \ + || exit 0 ; \ + [ -f gas/Makefile ] || $(MAKE) stage3-start ; \ + cd gas && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif gas-bootstrap + + +.PHONY: configure-stage3-gcc maybe-configure-stage3-gcc +.PHONY: all-stage3-gcc maybe-all-stage3-gcc +.PHONY: clean-stage3-gcc maybe-clean-stage3-gcc + +maybe-configure-stage3-gcc: +maybe-all-stage3-gcc: +maybe-clean-stage3-gcc: + +@if gcc-bootstrap +maybe-configure-stage3-gcc: configure-stage3-gcc +configure-stage3-gcc: + @$(MAKE) stage3-start + @[ -f gcc/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 3 in gcc ; \ + cd gcc || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gcc"; \ + libsrcdir="$$s/gcc";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gcc"; \ + libsrcdir="$$s/gcc";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage3-gcc: all-stage3-gcc +all-stage3-gcc: configure-stage3-gcc + @$(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd gcc && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(EXTRA_GCC_FLAGS) + +maybe-clean-stage3-gcc: clean-stage3-gcc +clean-stage3-gcc: + @[ -f gcc/Makefile ] || [ -f stage3-gcc/Makefile ] \ + || exit 0 ; \ + [ -f gcc/Makefile ] || $(MAKE) stage3-start ; \ + cd gcc && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(EXTRA_GCC_FLAGS) clean +@endif gcc-bootstrap + + +.PHONY: configure-stage3-intl maybe-configure-stage3-intl +.PHONY: all-stage3-intl maybe-all-stage3-intl +.PHONY: clean-stage3-intl maybe-clean-stage3-intl + +maybe-configure-stage3-intl: +maybe-all-stage3-intl: +maybe-clean-stage3-intl: + +@if intl-bootstrap +maybe-configure-stage3-intl: configure-stage3-intl +configure-stage3-intl: + @$(MAKE) stage3-start + @[ -f intl/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 3 in intl ; \ + cd intl || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/intl"; \ + libsrcdir="$$s/intl";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/intl"; \ + libsrcdir="$$s/intl";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage3-intl: all-stage3-intl +all-stage3-intl: configure-stage3-intl + @$(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd intl && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage3-intl: clean-stage3-intl +clean-stage3-intl: + @[ -f intl/Makefile ] || [ -f stage3-intl/Makefile ] \ + || exit 0 ; \ + [ -f intl/Makefile ] || $(MAKE) stage3-start ; \ + cd intl && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif intl-bootstrap + + +.PHONY: configure-stage3-ld maybe-configure-stage3-ld +.PHONY: all-stage3-ld maybe-all-stage3-ld +.PHONY: clean-stage3-ld maybe-clean-stage3-ld + +maybe-configure-stage3-ld: +maybe-all-stage3-ld: +maybe-clean-stage3-ld: + +@if ld-bootstrap +maybe-configure-stage3-ld: configure-stage3-ld +configure-stage3-ld: + @$(MAKE) stage3-start + @[ -f ld/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 3 in ld ; \ + cd ld || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/ld"; \ + libsrcdir="$$s/ld";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/ld"; \ + libsrcdir="$$s/ld";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage3-ld: all-stage3-ld +all-stage3-ld: configure-stage3-ld + @$(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd ld && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage3-ld: clean-stage3-ld +clean-stage3-ld: + @[ -f ld/Makefile ] || [ -f stage3-ld/Makefile ] \ + || exit 0 ; \ + [ -f ld/Makefile ] || $(MAKE) stage3-start ; \ + cd ld && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif ld-bootstrap + + +.PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp +.PHONY: all-stage3-libcpp maybe-all-stage3-libcpp +.PHONY: clean-stage3-libcpp maybe-clean-stage3-libcpp + +maybe-configure-stage3-libcpp: +maybe-all-stage3-libcpp: +maybe-clean-stage3-libcpp: + +@if libcpp-bootstrap +maybe-configure-stage3-libcpp: configure-stage3-libcpp +configure-stage3-libcpp: + @$(MAKE) stage3-start + @[ -f libcpp/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 3 in libcpp ; \ + cd libcpp || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/libcpp"; \ + libsrcdir="$$s/libcpp";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/libcpp"; \ + libsrcdir="$$s/libcpp";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage3-libcpp: all-stage3-libcpp +all-stage3-libcpp: configure-stage3-libcpp + @$(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage3-libcpp: clean-stage3-libcpp +clean-stage3-libcpp: + @[ -f libcpp/Makefile ] || [ -f stage3-libcpp/Makefile ] \ + || exit 0 ; \ + [ -f libcpp/Makefile ] || $(MAKE) stage3-start ; \ + cd libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif libcpp-bootstrap + + +.PHONY: configure-stage3-libiberty maybe-configure-stage3-libiberty +.PHONY: all-stage3-libiberty maybe-all-stage3-libiberty +.PHONY: clean-stage3-libiberty maybe-clean-stage3-libiberty + +maybe-configure-stage3-libiberty: +maybe-all-stage3-libiberty: +maybe-clean-stage3-libiberty: + +@if libiberty-bootstrap +maybe-configure-stage3-libiberty: configure-stage3-libiberty +configure-stage3-libiberty: + @$(MAKE) stage3-start + @[ -f libiberty/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 3 in libiberty ; \ + cd libiberty || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/libiberty"; \ + libsrcdir="$$s/libiberty";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/libiberty"; \ + libsrcdir="$$s/libiberty";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage3-libiberty: all-stage3-libiberty +all-stage3-libiberty: configure-stage3-libiberty + @$(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage3-libiberty: clean-stage3-libiberty +clean-stage3-libiberty: + @[ -f libiberty/Makefile ] || [ -f stage3-libiberty/Makefile ] \ + || exit 0 ; \ + [ -f libiberty/Makefile ] || $(MAKE) stage3-start ; \ + cd libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif libiberty-bootstrap + + +.PHONY: configure-stage3-zlib maybe-configure-stage3-zlib +.PHONY: all-stage3-zlib maybe-all-stage3-zlib +.PHONY: clean-stage3-zlib maybe-clean-stage3-zlib + +maybe-configure-stage3-zlib: +maybe-all-stage3-zlib: +maybe-clean-stage3-zlib: + +@if zlib-bootstrap +maybe-configure-stage3-zlib: configure-stage3-zlib +configure-stage3-zlib: + @$(MAKE) stage3-start + @[ -f zlib/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 3 in zlib ; \ + cd zlib || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/zlib"; \ + libsrcdir="$$s/zlib";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/zlib"; \ + libsrcdir="$$s/zlib";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage3-zlib: all-stage3-zlib +all-stage3-zlib: configure-stage3-zlib + @$(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd zlib && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage3-zlib: clean-stage3-zlib +clean-stage3-zlib: + @[ -f zlib/Makefile ] || [ -f stage3-zlib/Makefile ] \ + || exit 0 ; \ + [ -f zlib/Makefile ] || $(MAKE) stage3-start ; \ + cd zlib && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif zlib-bootstrap + + # FIXME: Will not need to be conditional when toplevel bootstrap is the # only possibility, but now it conflicts with no-bootstrap rules @if gcc-bootstrap compare: - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - if test -f stage2-lean; then \ + @if test -f stage2-lean; then \ echo Cannot compare object files as stage 2 was deleted. ; \ exit 0 ; \ fi; \ - : $(MAKE); $(stage); \ + [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ rm -f .bad_compare ; \ - echo Comparing stages 2 and 3 ; \ cd stage3-gcc; \ files=`find . -name "*$(objext)" -print` ; \ cd .. ; \ for file in $${files} ; do \ f1=$$r/stage2-gcc/$$file; f2=$$r/stage3-gcc/$$file; \ @do_compare@ > /dev/null 2>&1; \ - if test $$? -eq 1; then \ - case $$file in \ - ./cc*-checksum$(objext) | ./libgcc/* ) \ - echo warning: $$file differs ;; \ - *) \ - echo $$file differs >> .bad_compare ;; \ - esac ; \ - fi ; \ + test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \ done ; \ if [ -f .bad_compare ]; then \ echo "Bootstrap comparison failure!"; \ cat .bad_compare; \ exit 1; \ else \ - echo Comparison successful.; \ + true; \ fi ; \ $(STAMP) compare - if $(LEAN); then \ - rm -rf stage2-*; \ - $(STAMP) stage2-lean; \ - fi + @bootstrap_lean@-rm -rf stage2-* ; $(STAMP) stage2-lean -.PHONY: bootstrap bootstrap-lean -bootstrap: - echo stage3 > stage_final - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage3-bubble - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target - -bootstrap-lean: - echo stage3 > stage_final - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage3-bubble - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target +.PHONY: bootstrap +bootstrap: stage3-bubble compare all # Rules to wipe a stage and all the following ones, also used for cleanstrap distclean-stage2:: distclean-stage3 .PHONY: distclean-stage3 distclean-stage3:: - @: $(MAKE); $(stage) + [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : rm -rf stage3-* compare @@ -37301,247 +30060,745 @@ cleanstrap: distclean bootstrap .PHONY: stage4-start stage4-end stage4-start:: - @: $(MAKE); $(stage); \ + @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ echo stage4 > stage_current ; \ - echo stage4 > stage_last; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) + echo stage4 > stage_last @if bfd - @cd $(HOST_SUBDIR); [ -d stage4-bfd ] || \ - mkdir stage4-bfd; \ - mv stage4-bfd bfd ; \ - mv stage3-bfd prev-bfd || test -f stage3-lean + @[ -d stage4-bfd ] || mkdir stage4-bfd; \ + set stage4-bfd bfd ; @CREATE_LINK_TO_DIR@ ; \ + set stage3-bfd prev-bfd ; @CREATE_LINK_TO_DIR@ @endif bfd @if opcodes - @cd $(HOST_SUBDIR); [ -d stage4-opcodes ] || \ - mkdir stage4-opcodes; \ - mv stage4-opcodes opcodes ; \ - mv stage3-opcodes prev-opcodes || test -f stage3-lean + @[ -d stage4-opcodes ] || mkdir stage4-opcodes; \ + set stage4-opcodes opcodes ; @CREATE_LINK_TO_DIR@ ; \ + set stage3-opcodes prev-opcodes ; @CREATE_LINK_TO_DIR@ @endif opcodes @if binutils - @cd $(HOST_SUBDIR); [ -d stage4-binutils ] || \ - mkdir stage4-binutils; \ - mv stage4-binutils binutils ; \ - mv stage3-binutils prev-binutils || test -f stage3-lean + @[ -d stage4-binutils ] || mkdir stage4-binutils; \ + set stage4-binutils binutils ; @CREATE_LINK_TO_DIR@ ; \ + set stage3-binutils prev-binutils ; @CREATE_LINK_TO_DIR@ @endif binutils @if gas - @cd $(HOST_SUBDIR); [ -d stage4-gas ] || \ - mkdir stage4-gas; \ - mv stage4-gas gas ; \ - mv stage3-gas prev-gas || test -f stage3-lean + @[ -d stage4-gas ] || mkdir stage4-gas; \ + set stage4-gas gas ; @CREATE_LINK_TO_DIR@ ; \ + set stage3-gas prev-gas ; @CREATE_LINK_TO_DIR@ @endif gas @if gcc - @cd $(HOST_SUBDIR); [ -d stage4-gcc ] || \ - mkdir stage4-gcc; \ - mv stage4-gcc gcc ; \ - mv stage3-gcc prev-gcc || test -f stage3-lean + @[ -d stage4-gcc ] || mkdir stage4-gcc; \ + set stage4-gcc gcc ; @CREATE_LINK_TO_DIR@ ; \ + set stage3-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ @endif gcc @if intl - @cd $(HOST_SUBDIR); [ -d stage4-intl ] || \ - mkdir stage4-intl; \ - mv stage4-intl intl ; \ - mv stage3-intl prev-intl || test -f stage3-lean + @[ -d stage4-intl ] || mkdir stage4-intl; \ + set stage4-intl intl ; @CREATE_LINK_TO_DIR@ ; \ + set stage3-intl prev-intl ; @CREATE_LINK_TO_DIR@ @endif intl @if ld - @cd $(HOST_SUBDIR); [ -d stage4-ld ] || \ - mkdir stage4-ld; \ - mv stage4-ld ld ; \ - mv stage3-ld prev-ld || test -f stage3-lean + @[ -d stage4-ld ] || mkdir stage4-ld; \ + set stage4-ld ld ; @CREATE_LINK_TO_DIR@ ; \ + set stage3-ld prev-ld ; @CREATE_LINK_TO_DIR@ @endif ld @if libcpp - @cd $(HOST_SUBDIR); [ -d stage4-libcpp ] || \ - mkdir stage4-libcpp; \ - mv stage4-libcpp libcpp ; \ - mv stage3-libcpp prev-libcpp || test -f stage3-lean + @[ -d stage4-libcpp ] || mkdir stage4-libcpp; \ + set stage4-libcpp libcpp ; @CREATE_LINK_TO_DIR@ ; \ + set stage3-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ @endif libcpp -@if libdecnumber - @cd $(HOST_SUBDIR); [ -d stage4-libdecnumber ] || \ - mkdir stage4-libdecnumber; \ - mv stage4-libdecnumber libdecnumber ; \ - mv stage3-libdecnumber prev-libdecnumber || test -f stage3-lean -@endif libdecnumber @if libiberty - @cd $(HOST_SUBDIR); [ -d stage4-libiberty ] || \ - mkdir stage4-libiberty; \ - mv stage4-libiberty libiberty ; \ - mv stage3-libiberty prev-libiberty || test -f stage3-lean + @[ -d stage4-libiberty ] || mkdir stage4-libiberty; \ + set stage4-libiberty libiberty ; @CREATE_LINK_TO_DIR@ ; \ + set stage3-libiberty prev-libiberty ; @CREATE_LINK_TO_DIR@ @endif libiberty @if zlib - @cd $(HOST_SUBDIR); [ -d stage4-zlib ] || \ - mkdir stage4-zlib; \ - mv stage4-zlib zlib ; \ - mv stage3-zlib prev-zlib || test -f stage3-lean + @[ -d stage4-zlib ] || mkdir stage4-zlib; \ + set stage4-zlib zlib ; @CREATE_LINK_TO_DIR@ ; \ + set stage3-zlib prev-zlib ; @CREATE_LINK_TO_DIR@ @endif zlib - @[ -d stage4-$(TARGET_SUBDIR) ] || \ - mkdir stage4-$(TARGET_SUBDIR); \ - mv stage4-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ - mv stage3-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage3-lean -stage4-end:: +stage4-end:: + @rm -f stage_current @if bfd - @if test -d $(HOST_SUBDIR)/bfd ; then \ - cd $(HOST_SUBDIR); mv bfd stage4-bfd ; \ - mv prev-bfd stage3-bfd ; : ; \ - fi + @set bfd stage4-bfd ; @UNDO_LINK_TO_DIR@ ; \ + set prev-bfd stage3-bfd ; @UNDO_LINK_TO_DIR@ @endif bfd @if opcodes - @if test -d $(HOST_SUBDIR)/opcodes ; then \ - cd $(HOST_SUBDIR); mv opcodes stage4-opcodes ; \ - mv prev-opcodes stage3-opcodes ; : ; \ - fi + @set opcodes stage4-opcodes ; @UNDO_LINK_TO_DIR@ ; \ + set prev-opcodes stage3-opcodes ; @UNDO_LINK_TO_DIR@ @endif opcodes @if binutils - @if test -d $(HOST_SUBDIR)/binutils ; then \ - cd $(HOST_SUBDIR); mv binutils stage4-binutils ; \ - mv prev-binutils stage3-binutils ; : ; \ - fi + @set binutils stage4-binutils ; @UNDO_LINK_TO_DIR@ ; \ + set prev-binutils stage3-binutils ; @UNDO_LINK_TO_DIR@ @endif binutils @if gas - @if test -d $(HOST_SUBDIR)/gas ; then \ - cd $(HOST_SUBDIR); mv gas stage4-gas ; \ - mv prev-gas stage3-gas ; : ; \ - fi + @set gas stage4-gas ; @UNDO_LINK_TO_DIR@ ; \ + set prev-gas stage3-gas ; @UNDO_LINK_TO_DIR@ @endif gas @if gcc - @if test -d $(HOST_SUBDIR)/gcc ; then \ - cd $(HOST_SUBDIR); mv gcc stage4-gcc ; \ - mv prev-gcc stage3-gcc ; : ; \ - fi + @set gcc stage4-gcc ; @UNDO_LINK_TO_DIR@ ; \ + set prev-gcc stage3-gcc ; @UNDO_LINK_TO_DIR@ @endif gcc @if intl - @if test -d $(HOST_SUBDIR)/intl ; then \ - cd $(HOST_SUBDIR); mv intl stage4-intl ; \ - mv prev-intl stage3-intl ; : ; \ - fi + @set intl stage4-intl ; @UNDO_LINK_TO_DIR@ ; \ + set prev-intl stage3-intl ; @UNDO_LINK_TO_DIR@ @endif intl @if ld - @if test -d $(HOST_SUBDIR)/ld ; then \ - cd $(HOST_SUBDIR); mv ld stage4-ld ; \ - mv prev-ld stage3-ld ; : ; \ - fi + @set ld stage4-ld ; @UNDO_LINK_TO_DIR@ ; \ + set prev-ld stage3-ld ; @UNDO_LINK_TO_DIR@ @endif ld @if libcpp - @if test -d $(HOST_SUBDIR)/libcpp ; then \ - cd $(HOST_SUBDIR); mv libcpp stage4-libcpp ; \ - mv prev-libcpp stage3-libcpp ; : ; \ - fi + @set libcpp stage4-libcpp ; @UNDO_LINK_TO_DIR@ ; \ + set prev-libcpp stage3-libcpp ; @UNDO_LINK_TO_DIR@ @endif libcpp -@if libdecnumber - @if test -d $(HOST_SUBDIR)/libdecnumber ; then \ - cd $(HOST_SUBDIR); mv libdecnumber stage4-libdecnumber ; \ - mv prev-libdecnumber stage3-libdecnumber ; : ; \ - fi -@endif libdecnumber @if libiberty - @if test -d $(HOST_SUBDIR)/libiberty ; then \ - cd $(HOST_SUBDIR); mv libiberty stage4-libiberty ; \ - mv prev-libiberty stage3-libiberty ; : ; \ - fi + @set libiberty stage4-libiberty ; @UNDO_LINK_TO_DIR@ ; \ + set prev-libiberty stage3-libiberty ; @UNDO_LINK_TO_DIR@ @endif libiberty @if zlib - @if test -d $(HOST_SUBDIR)/zlib ; then \ - cd $(HOST_SUBDIR); mv zlib stage4-zlib ; \ - mv prev-zlib stage3-zlib ; : ; \ - fi + @set zlib stage4-zlib ; @UNDO_LINK_TO_DIR@ ; \ + set prev-zlib stage3-zlib ; @UNDO_LINK_TO_DIR@ @endif zlib - @if test -d $(TARGET_SUBDIR) ; then \ - mv $(TARGET_SUBDIR) stage4-$(TARGET_SUBDIR) ; \ - mv prev-$(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR) ; : ; \ - fi - rm -f stage_current -# Bubble a bugfix through all the stages up to stage 4. They are -# remade, but not reconfigured. The next stage (if any) will not be -# reconfigured as well. +# Bubble a bugfix through all the stages up to stage 4. They +# are remade, but not reconfigured. The next stage (if any) will not +# be reconfigured as well. .PHONY: stage4-bubble stage4-bubble:: stage3-bubble - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - if test -f stage4-lean || test -f stage3-lean ; then \ + @bootstrap_lean@-rm -rf stage2-* ; $(STAMP) stage2-lean + @if test -f stage4-lean || test -f stage3-lean ; then \ echo Skipping rebuild of stage4 ; \ else \ - $(MAKE) stage4-start; \ - if $(LEAN); then \ - rm -rf stage2-* ; \ - $(STAMP) stage2-lean ; \ - fi; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage4; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage4; \ fi - $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare3 .PHONY: all-stage4 clean-stage4 +all-stage4: \ + maybe-all-stage4-bfd \ + maybe-all-stage4-opcodes \ + maybe-all-stage4-binutils \ + maybe-all-stage4-gas \ + maybe-all-stage4-gcc \ + maybe-all-stage4-intl \ + maybe-all-stage4-ld \ + maybe-all-stage4-libcpp \ + maybe-all-stage4-libiberty \ + maybe-all-stage4-zlib + do-clean: clean-stage4 +clean-stage4: \ + maybe-clean-stage4-bfd \ + maybe-clean-stage4-opcodes \ + maybe-clean-stage4-binutils \ + maybe-clean-stage4-gas \ + maybe-clean-stage4-gcc \ + maybe-clean-stage4-intl \ + maybe-clean-stage4-ld \ + maybe-clean-stage4-libcpp \ + maybe-clean-stage4-libiberty \ + maybe-clean-stage4-zlib + + +.PHONY: configure-stage4-bfd maybe-configure-stage4-bfd +.PHONY: all-stage4-bfd maybe-all-stage4-bfd +.PHONY: clean-stage4-bfd maybe-clean-stage4-bfd + +maybe-configure-stage4-bfd: +maybe-all-stage4-bfd: +maybe-clean-stage4-bfd: + +@if bfd-bootstrap +maybe-configure-stage4-bfd: configure-stage4-bfd +configure-stage4-bfd: + @$(MAKE) stage4-start + @[ -f bfd/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 4 in bfd ; \ + cd bfd || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/bfd"; \ + libsrcdir="$$s/bfd";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/bfd"; \ + libsrcdir="$$s/bfd";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage4-bfd: all-stage4-bfd +all-stage4-bfd: configure-stage4-bfd + @$(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd bfd && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage4-bfd: clean-stage4-bfd +clean-stage4-bfd: + @[ -f bfd/Makefile ] || [ -f stage4-bfd/Makefile ] \ + || exit 0 ; \ + [ -f bfd/Makefile ] || $(MAKE) stage4-start ; \ + cd bfd && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif bfd-bootstrap + + +.PHONY: configure-stage4-opcodes maybe-configure-stage4-opcodes +.PHONY: all-stage4-opcodes maybe-all-stage4-opcodes +.PHONY: clean-stage4-opcodes maybe-clean-stage4-opcodes + +maybe-configure-stage4-opcodes: +maybe-all-stage4-opcodes: +maybe-clean-stage4-opcodes: + +@if opcodes-bootstrap +maybe-configure-stage4-opcodes: configure-stage4-opcodes +configure-stage4-opcodes: + @$(MAKE) stage4-start + @[ -f opcodes/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 4 in opcodes ; \ + cd opcodes || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/opcodes"; \ + libsrcdir="$$s/opcodes";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/opcodes"; \ + libsrcdir="$$s/opcodes";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage4-opcodes: all-stage4-opcodes +all-stage4-opcodes: configure-stage4-opcodes + @$(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage4-opcodes: clean-stage4-opcodes +clean-stage4-opcodes: + @[ -f opcodes/Makefile ] || [ -f stage4-opcodes/Makefile ] \ + || exit 0 ; \ + [ -f opcodes/Makefile ] || $(MAKE) stage4-start ; \ + cd opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif opcodes-bootstrap + + +.PHONY: configure-stage4-binutils maybe-configure-stage4-binutils +.PHONY: all-stage4-binutils maybe-all-stage4-binutils +.PHONY: clean-stage4-binutils maybe-clean-stage4-binutils + +maybe-configure-stage4-binutils: +maybe-all-stage4-binutils: +maybe-clean-stage4-binutils: + +@if binutils-bootstrap +maybe-configure-stage4-binutils: configure-stage4-binutils +configure-stage4-binutils: + @$(MAKE) stage4-start + @[ -f binutils/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 4 in binutils ; \ + cd binutils || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/binutils"; \ + libsrcdir="$$s/binutils";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/binutils"; \ + libsrcdir="$$s/binutils";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage4-binutils: all-stage4-binutils +all-stage4-binutils: configure-stage4-binutils + @$(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd binutils && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage4-binutils: clean-stage4-binutils +clean-stage4-binutils: + @[ -f binutils/Makefile ] || [ -f stage4-binutils/Makefile ] \ + || exit 0 ; \ + [ -f binutils/Makefile ] || $(MAKE) stage4-start ; \ + cd binutils && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif binutils-bootstrap + + +.PHONY: configure-stage4-gas maybe-configure-stage4-gas +.PHONY: all-stage4-gas maybe-all-stage4-gas +.PHONY: clean-stage4-gas maybe-clean-stage4-gas + +maybe-configure-stage4-gas: +maybe-all-stage4-gas: +maybe-clean-stage4-gas: + +@if gas-bootstrap +maybe-configure-stage4-gas: configure-stage4-gas +configure-stage4-gas: + @$(MAKE) stage4-start + @[ -f gas/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 4 in gas ; \ + cd gas || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gas"; \ + libsrcdir="$$s/gas";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gas"; \ + libsrcdir="$$s/gas";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage4-gas: all-stage4-gas +all-stage4-gas: configure-stage4-gas + @$(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd gas && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage4-gas: clean-stage4-gas +clean-stage4-gas: + @[ -f gas/Makefile ] || [ -f stage4-gas/Makefile ] \ + || exit 0 ; \ + [ -f gas/Makefile ] || $(MAKE) stage4-start ; \ + cd gas && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif gas-bootstrap + + +.PHONY: configure-stage4-gcc maybe-configure-stage4-gcc +.PHONY: all-stage4-gcc maybe-all-stage4-gcc +.PHONY: clean-stage4-gcc maybe-clean-stage4-gcc + +maybe-configure-stage4-gcc: +maybe-all-stage4-gcc: +maybe-clean-stage4-gcc: + +@if gcc-bootstrap +maybe-configure-stage4-gcc: configure-stage4-gcc +configure-stage4-gcc: + @$(MAKE) stage4-start + @[ -f gcc/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 4 in gcc ; \ + cd gcc || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gcc"; \ + libsrcdir="$$s/gcc";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gcc"; \ + libsrcdir="$$s/gcc";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage4-gcc: all-stage4-gcc +all-stage4-gcc: configure-stage4-gcc + @$(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd gcc && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(EXTRA_GCC_FLAGS) + +maybe-clean-stage4-gcc: clean-stage4-gcc +clean-stage4-gcc: + @[ -f gcc/Makefile ] || [ -f stage4-gcc/Makefile ] \ + || exit 0 ; \ + [ -f gcc/Makefile ] || $(MAKE) stage4-start ; \ + cd gcc && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(EXTRA_GCC_FLAGS) clean +@endif gcc-bootstrap + + +.PHONY: configure-stage4-intl maybe-configure-stage4-intl +.PHONY: all-stage4-intl maybe-all-stage4-intl +.PHONY: clean-stage4-intl maybe-clean-stage4-intl + +maybe-configure-stage4-intl: +maybe-all-stage4-intl: +maybe-clean-stage4-intl: + +@if intl-bootstrap +maybe-configure-stage4-intl: configure-stage4-intl +configure-stage4-intl: + @$(MAKE) stage4-start + @[ -f intl/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 4 in intl ; \ + cd intl || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/intl"; \ + libsrcdir="$$s/intl";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/intl"; \ + libsrcdir="$$s/intl";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage4-intl: all-stage4-intl +all-stage4-intl: configure-stage4-intl + @$(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd intl && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage4-intl: clean-stage4-intl +clean-stage4-intl: + @[ -f intl/Makefile ] || [ -f stage4-intl/Makefile ] \ + || exit 0 ; \ + [ -f intl/Makefile ] || $(MAKE) stage4-start ; \ + cd intl && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif intl-bootstrap + + +.PHONY: configure-stage4-ld maybe-configure-stage4-ld +.PHONY: all-stage4-ld maybe-all-stage4-ld +.PHONY: clean-stage4-ld maybe-clean-stage4-ld + +maybe-configure-stage4-ld: +maybe-all-stage4-ld: +maybe-clean-stage4-ld: + +@if ld-bootstrap +maybe-configure-stage4-ld: configure-stage4-ld +configure-stage4-ld: + @$(MAKE) stage4-start + @[ -f ld/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 4 in ld ; \ + cd ld || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/ld"; \ + libsrcdir="$$s/ld";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/ld"; \ + libsrcdir="$$s/ld";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage4-ld: all-stage4-ld +all-stage4-ld: configure-stage4-ld + @$(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd ld && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage4-ld: clean-stage4-ld +clean-stage4-ld: + @[ -f ld/Makefile ] || [ -f stage4-ld/Makefile ] \ + || exit 0 ; \ + [ -f ld/Makefile ] || $(MAKE) stage4-start ; \ + cd ld && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif ld-bootstrap + + +.PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp +.PHONY: all-stage4-libcpp maybe-all-stage4-libcpp +.PHONY: clean-stage4-libcpp maybe-clean-stage4-libcpp + +maybe-configure-stage4-libcpp: +maybe-all-stage4-libcpp: +maybe-clean-stage4-libcpp: + +@if libcpp-bootstrap +maybe-configure-stage4-libcpp: configure-stage4-libcpp +configure-stage4-libcpp: + @$(MAKE) stage4-start + @[ -f libcpp/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 4 in libcpp ; \ + cd libcpp || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/libcpp"; \ + libsrcdir="$$s/libcpp";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/libcpp"; \ + libsrcdir="$$s/libcpp";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage4-libcpp: all-stage4-libcpp +all-stage4-libcpp: configure-stage4-libcpp + @$(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage4-libcpp: clean-stage4-libcpp +clean-stage4-libcpp: + @[ -f libcpp/Makefile ] || [ -f stage4-libcpp/Makefile ] \ + || exit 0 ; \ + [ -f libcpp/Makefile ] || $(MAKE) stage4-start ; \ + cd libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif libcpp-bootstrap + + +.PHONY: configure-stage4-libiberty maybe-configure-stage4-libiberty +.PHONY: all-stage4-libiberty maybe-all-stage4-libiberty +.PHONY: clean-stage4-libiberty maybe-clean-stage4-libiberty + +maybe-configure-stage4-libiberty: +maybe-all-stage4-libiberty: +maybe-clean-stage4-libiberty: + +@if libiberty-bootstrap +maybe-configure-stage4-libiberty: configure-stage4-libiberty +configure-stage4-libiberty: + @$(MAKE) stage4-start + @[ -f libiberty/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 4 in libiberty ; \ + cd libiberty || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/libiberty"; \ + libsrcdir="$$s/libiberty";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/libiberty"; \ + libsrcdir="$$s/libiberty";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage4-libiberty: all-stage4-libiberty +all-stage4-libiberty: configure-stage4-libiberty + @$(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage4-libiberty: clean-stage4-libiberty +clean-stage4-libiberty: + @[ -f libiberty/Makefile ] || [ -f stage4-libiberty/Makefile ] \ + || exit 0 ; \ + [ -f libiberty/Makefile ] || $(MAKE) stage4-start ; \ + cd libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif libiberty-bootstrap + + +.PHONY: configure-stage4-zlib maybe-configure-stage4-zlib +.PHONY: all-stage4-zlib maybe-all-stage4-zlib +.PHONY: clean-stage4-zlib maybe-clean-stage4-zlib + +maybe-configure-stage4-zlib: +maybe-all-stage4-zlib: +maybe-clean-stage4-zlib: + +@if zlib-bootstrap +maybe-configure-stage4-zlib: configure-stage4-zlib +configure-stage4-zlib: + @$(MAKE) stage4-start + @[ -f zlib/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage 4 in zlib ; \ + cd zlib || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/zlib"; \ + libsrcdir="$$s/zlib";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/zlib"; \ + libsrcdir="$$s/zlib";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stage4-zlib: all-stage4-zlib +all-stage4-zlib: configure-stage4-zlib + @$(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd zlib && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + + +maybe-clean-stage4-zlib: clean-stage4-zlib +clean-stage4-zlib: + @[ -f zlib/Makefile ] || [ -f stage4-zlib/Makefile ] \ + || exit 0 ; \ + [ -f zlib/Makefile ] || $(MAKE) stage4-start ; \ + cd zlib && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif zlib-bootstrap + + # FIXME: Will not need to be conditional when toplevel bootstrap is the # only possibility, but now it conflicts with no-bootstrap rules @if gcc-bootstrap compare3: - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - if test -f stage3-lean; then \ + @if test -f stage3-lean; then \ echo Cannot compare object files as stage 3 was deleted. ; \ exit 0 ; \ fi; \ - : $(MAKE); $(stage); \ + [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ rm -f .bad_compare ; \ - echo Comparing stages 3 and 4 ; \ cd stage4-gcc; \ files=`find . -name "*$(objext)" -print` ; \ cd .. ; \ for file in $${files} ; do \ f1=$$r/stage3-gcc/$$file; f2=$$r/stage4-gcc/$$file; \ @do_compare@ > /dev/null 2>&1; \ - if test $$? -eq 1; then \ - case $$file in \ - ./cc*-checksum$(objext) | ./libgcc/* ) \ - echo warning: $$file differs ;; \ - *) \ - echo $$file differs >> .bad_compare ;; \ - esac ; \ - fi ; \ + test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \ done ; \ if [ -f .bad_compare ]; then \ echo "Bootstrap comparison failure!"; \ cat .bad_compare; \ exit 1; \ else \ - echo Comparison successful.; \ + true; \ fi ; \ $(STAMP) compare3 - if $(LEAN); then \ - rm -rf stage3-*; \ - $(STAMP) stage3-lean; \ - fi + @bootstrap_lean@-rm -rf stage3-* ; $(STAMP) stage3-lean -.PHONY: bootstrap4 bootstrap4-lean -bootstrap4: - echo stage4 > stage_final - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage4-bubble - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target - -bootstrap4-lean: - echo stage4 > stage_final - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage4-bubble - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target +.PHONY: bootstrap4 +bootstrap4: stage4-bubble compare3 all # Rules to wipe a stage and all the following ones, also used for cleanstrap distclean-stage3:: distclean-stage4 .PHONY: distclean-stage4 distclean-stage4:: - @: $(MAKE); $(stage) + [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : rm -rf stage4-* compare3 @@ -37551,170 +30808,701 @@ distclean-stage4:: .PHONY: stageprofile-start stageprofile-end stageprofile-start:: - @: $(MAKE); $(stage); \ + @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ echo stageprofile > stage_current ; \ - echo stageprofile > stage_last; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) + echo stageprofile > stage_last @if bfd - @cd $(HOST_SUBDIR); [ -d stageprofile-bfd ] || \ - mkdir stageprofile-bfd; \ - mv stageprofile-bfd bfd ; \ - mv stage1-bfd prev-bfd || test -f stage1-lean + @[ -d stageprofile-bfd ] || mkdir stageprofile-bfd; \ + set stageprofile-bfd bfd ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-bfd prev-bfd ; @CREATE_LINK_TO_DIR@ @endif bfd @if opcodes - @cd $(HOST_SUBDIR); [ -d stageprofile-opcodes ] || \ - mkdir stageprofile-opcodes; \ - mv stageprofile-opcodes opcodes ; \ - mv stage1-opcodes prev-opcodes || test -f stage1-lean + @[ -d stageprofile-opcodes ] || mkdir stageprofile-opcodes; \ + set stageprofile-opcodes opcodes ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-opcodes prev-opcodes ; @CREATE_LINK_TO_DIR@ @endif opcodes @if binutils - @cd $(HOST_SUBDIR); [ -d stageprofile-binutils ] || \ - mkdir stageprofile-binutils; \ - mv stageprofile-binutils binutils ; \ - mv stage1-binutils prev-binutils || test -f stage1-lean + @[ -d stageprofile-binutils ] || mkdir stageprofile-binutils; \ + set stageprofile-binutils binutils ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-binutils prev-binutils ; @CREATE_LINK_TO_DIR@ @endif binutils @if gas - @cd $(HOST_SUBDIR); [ -d stageprofile-gas ] || \ - mkdir stageprofile-gas; \ - mv stageprofile-gas gas ; \ - mv stage1-gas prev-gas || test -f stage1-lean + @[ -d stageprofile-gas ] || mkdir stageprofile-gas; \ + set stageprofile-gas gas ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-gas prev-gas ; @CREATE_LINK_TO_DIR@ @endif gas @if gcc - @cd $(HOST_SUBDIR); [ -d stageprofile-gcc ] || \ - mkdir stageprofile-gcc; \ - mv stageprofile-gcc gcc ; \ - mv stage1-gcc prev-gcc || test -f stage1-lean + @[ -d stageprofile-gcc ] || mkdir stageprofile-gcc; \ + set stageprofile-gcc gcc ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ @endif gcc @if intl - @cd $(HOST_SUBDIR); [ -d stageprofile-intl ] || \ - mkdir stageprofile-intl; \ - mv stageprofile-intl intl ; \ - mv stage1-intl prev-intl || test -f stage1-lean + @[ -d stageprofile-intl ] || mkdir stageprofile-intl; \ + set stageprofile-intl intl ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-intl prev-intl ; @CREATE_LINK_TO_DIR@ @endif intl @if ld - @cd $(HOST_SUBDIR); [ -d stageprofile-ld ] || \ - mkdir stageprofile-ld; \ - mv stageprofile-ld ld ; \ - mv stage1-ld prev-ld || test -f stage1-lean + @[ -d stageprofile-ld ] || mkdir stageprofile-ld; \ + set stageprofile-ld ld ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-ld prev-ld ; @CREATE_LINK_TO_DIR@ @endif ld @if libcpp - @cd $(HOST_SUBDIR); [ -d stageprofile-libcpp ] || \ - mkdir stageprofile-libcpp; \ - mv stageprofile-libcpp libcpp ; \ - mv stage1-libcpp prev-libcpp || test -f stage1-lean + @[ -d stageprofile-libcpp ] || mkdir stageprofile-libcpp; \ + set stageprofile-libcpp libcpp ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ @endif libcpp -@if libdecnumber - @cd $(HOST_SUBDIR); [ -d stageprofile-libdecnumber ] || \ - mkdir stageprofile-libdecnumber; \ - mv stageprofile-libdecnumber libdecnumber ; \ - mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean -@endif libdecnumber @if libiberty - @cd $(HOST_SUBDIR); [ -d stageprofile-libiberty ] || \ - mkdir stageprofile-libiberty; \ - mv stageprofile-libiberty libiberty ; \ - mv stage1-libiberty prev-libiberty || test -f stage1-lean + @[ -d stageprofile-libiberty ] || mkdir stageprofile-libiberty; \ + set stageprofile-libiberty libiberty ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-libiberty prev-libiberty ; @CREATE_LINK_TO_DIR@ @endif libiberty @if zlib - @cd $(HOST_SUBDIR); [ -d stageprofile-zlib ] || \ - mkdir stageprofile-zlib; \ - mv stageprofile-zlib zlib ; \ - mv stage1-zlib prev-zlib || test -f stage1-lean + @[ -d stageprofile-zlib ] || mkdir stageprofile-zlib; \ + set stageprofile-zlib zlib ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-zlib prev-zlib ; @CREATE_LINK_TO_DIR@ @endif zlib - @[ -d stageprofile-$(TARGET_SUBDIR) ] || \ - mkdir stageprofile-$(TARGET_SUBDIR); \ - mv stageprofile-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ - mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean -stageprofile-end:: +stageprofile-end:: + @rm -f stage_current @if bfd - @if test -d $(HOST_SUBDIR)/bfd ; then \ - cd $(HOST_SUBDIR); mv bfd stageprofile-bfd ; \ - mv prev-bfd stage1-bfd ; : ; \ - fi + @set bfd stageprofile-bfd ; @UNDO_LINK_TO_DIR@ ; \ + set prev-bfd stage1-bfd ; @UNDO_LINK_TO_DIR@ @endif bfd @if opcodes - @if test -d $(HOST_SUBDIR)/opcodes ; then \ - cd $(HOST_SUBDIR); mv opcodes stageprofile-opcodes ; \ - mv prev-opcodes stage1-opcodes ; : ; \ - fi + @set opcodes stageprofile-opcodes ; @UNDO_LINK_TO_DIR@ ; \ + set prev-opcodes stage1-opcodes ; @UNDO_LINK_TO_DIR@ @endif opcodes @if binutils - @if test -d $(HOST_SUBDIR)/binutils ; then \ - cd $(HOST_SUBDIR); mv binutils stageprofile-binutils ; \ - mv prev-binutils stage1-binutils ; : ; \ - fi + @set binutils stageprofile-binutils ; @UNDO_LINK_TO_DIR@ ; \ + set prev-binutils stage1-binutils ; @UNDO_LINK_TO_DIR@ @endif binutils @if gas - @if test -d $(HOST_SUBDIR)/gas ; then \ - cd $(HOST_SUBDIR); mv gas stageprofile-gas ; \ - mv prev-gas stage1-gas ; : ; \ - fi + @set gas stageprofile-gas ; @UNDO_LINK_TO_DIR@ ; \ + set prev-gas stage1-gas ; @UNDO_LINK_TO_DIR@ @endif gas @if gcc - @if test -d $(HOST_SUBDIR)/gcc ; then \ - cd $(HOST_SUBDIR); mv gcc stageprofile-gcc ; \ - mv prev-gcc stage1-gcc ; : ; \ - fi + @set gcc stageprofile-gcc ; @UNDO_LINK_TO_DIR@ ; \ + set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ @endif gcc @if intl - @if test -d $(HOST_SUBDIR)/intl ; then \ - cd $(HOST_SUBDIR); mv intl stageprofile-intl ; \ - mv prev-intl stage1-intl ; : ; \ - fi + @set intl stageprofile-intl ; @UNDO_LINK_TO_DIR@ ; \ + set prev-intl stage1-intl ; @UNDO_LINK_TO_DIR@ @endif intl @if ld - @if test -d $(HOST_SUBDIR)/ld ; then \ - cd $(HOST_SUBDIR); mv ld stageprofile-ld ; \ - mv prev-ld stage1-ld ; : ; \ - fi + @set ld stageprofile-ld ; @UNDO_LINK_TO_DIR@ ; \ + set prev-ld stage1-ld ; @UNDO_LINK_TO_DIR@ @endif ld @if libcpp - @if test -d $(HOST_SUBDIR)/libcpp ; then \ - cd $(HOST_SUBDIR); mv libcpp stageprofile-libcpp ; \ - mv prev-libcpp stage1-libcpp ; : ; \ - fi + @set libcpp stageprofile-libcpp ; @UNDO_LINK_TO_DIR@ ; \ + set prev-libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ @endif libcpp -@if libdecnumber - @if test -d $(HOST_SUBDIR)/libdecnumber ; then \ - cd $(HOST_SUBDIR); mv libdecnumber stageprofile-libdecnumber ; \ - mv prev-libdecnumber stage1-libdecnumber ; : ; \ - fi -@endif libdecnumber @if libiberty - @if test -d $(HOST_SUBDIR)/libiberty ; then \ - cd $(HOST_SUBDIR); mv libiberty stageprofile-libiberty ; \ - mv prev-libiberty stage1-libiberty ; : ; \ - fi + @set libiberty stageprofile-libiberty ; @UNDO_LINK_TO_DIR@ ; \ + set prev-libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ @endif libiberty @if zlib - @if test -d $(HOST_SUBDIR)/zlib ; then \ - cd $(HOST_SUBDIR); mv zlib stageprofile-zlib ; \ - mv prev-zlib stage1-zlib ; : ; \ - fi + @set zlib stageprofile-zlib ; @UNDO_LINK_TO_DIR@ ; \ + set prev-zlib stage1-zlib ; @UNDO_LINK_TO_DIR@ @endif zlib - @if test -d $(TARGET_SUBDIR) ; then \ - mv $(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR) ; \ - mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; : ; \ - fi - rm -f stage_current -# Bubble a bugfix through all the stages up to stage profile. They are -# remade, but not reconfigured. The next stage (if any) will not be -# reconfigured as well. +# Bubble a bugfix through all the stages up to stage profile. They +# are remade, but not reconfigured. The next stage (if any) will not +# be reconfigured as well. .PHONY: stageprofile-bubble stageprofile-bubble:: stage1-bubble - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - if test -f stageprofile-lean || test -f stage1-lean ; then \ + @if test -f stageprofile-lean || test -f stage1-lean ; then \ echo Skipping rebuild of stageprofile ; \ else \ - $(MAKE) stageprofile-start; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageprofile; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stageprofile; \ fi .PHONY: all-stageprofile clean-stageprofile +all-stageprofile: \ + maybe-all-stageprofile-bfd \ + maybe-all-stageprofile-opcodes \ + maybe-all-stageprofile-binutils \ + maybe-all-stageprofile-gas \ + maybe-all-stageprofile-gcc \ + maybe-all-stageprofile-intl \ + maybe-all-stageprofile-ld \ + maybe-all-stageprofile-libcpp \ + maybe-all-stageprofile-libiberty \ + maybe-all-stageprofile-zlib + do-clean: clean-stageprofile +clean-stageprofile: \ + maybe-clean-stageprofile-bfd \ + maybe-clean-stageprofile-opcodes \ + maybe-clean-stageprofile-binutils \ + maybe-clean-stageprofile-gas \ + maybe-clean-stageprofile-gcc \ + maybe-clean-stageprofile-intl \ + maybe-clean-stageprofile-ld \ + maybe-clean-stageprofile-libcpp \ + maybe-clean-stageprofile-libiberty \ + maybe-clean-stageprofile-zlib + + +.PHONY: configure-stageprofile-bfd maybe-configure-stageprofile-bfd +.PHONY: all-stageprofile-bfd maybe-all-stageprofile-bfd +.PHONY: clean-stageprofile-bfd maybe-clean-stageprofile-bfd + +maybe-configure-stageprofile-bfd: +maybe-all-stageprofile-bfd: +maybe-clean-stageprofile-bfd: + +@if bfd-bootstrap +maybe-configure-stageprofile-bfd: configure-stageprofile-bfd +configure-stageprofile-bfd: + @$(MAKE) stageprofile-start + @[ -f bfd/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage profile in bfd ; \ + cd bfd || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/bfd"; \ + libsrcdir="$$s/bfd";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/bfd"; \ + libsrcdir="$$s/bfd";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stageprofile-bfd: all-stageprofile-bfd +all-stageprofile-bfd: configure-stageprofile-bfd + @$(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd bfd && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" + +maybe-clean-stageprofile-bfd: clean-stageprofile-bfd +clean-stageprofile-bfd: + @[ -f bfd/Makefile ] || [ -f stageprofile-bfd/Makefile ] \ + || exit 0 ; \ + [ -f bfd/Makefile ] || $(MAKE) stageprofile-start ; \ + cd bfd && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean +@endif bfd-bootstrap + + +.PHONY: configure-stageprofile-opcodes maybe-configure-stageprofile-opcodes +.PHONY: all-stageprofile-opcodes maybe-all-stageprofile-opcodes +.PHONY: clean-stageprofile-opcodes maybe-clean-stageprofile-opcodes + +maybe-configure-stageprofile-opcodes: +maybe-all-stageprofile-opcodes: +maybe-clean-stageprofile-opcodes: + +@if opcodes-bootstrap +maybe-configure-stageprofile-opcodes: configure-stageprofile-opcodes +configure-stageprofile-opcodes: + @$(MAKE) stageprofile-start + @[ -f opcodes/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage profile in opcodes ; \ + cd opcodes || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/opcodes"; \ + libsrcdir="$$s/opcodes";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/opcodes"; \ + libsrcdir="$$s/opcodes";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stageprofile-opcodes: all-stageprofile-opcodes +all-stageprofile-opcodes: configure-stageprofile-opcodes + @$(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" + +maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes +clean-stageprofile-opcodes: + @[ -f opcodes/Makefile ] || [ -f stageprofile-opcodes/Makefile ] \ + || exit 0 ; \ + [ -f opcodes/Makefile ] || $(MAKE) stageprofile-start ; \ + cd opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean +@endif opcodes-bootstrap + + +.PHONY: configure-stageprofile-binutils maybe-configure-stageprofile-binutils +.PHONY: all-stageprofile-binutils maybe-all-stageprofile-binutils +.PHONY: clean-stageprofile-binutils maybe-clean-stageprofile-binutils + +maybe-configure-stageprofile-binutils: +maybe-all-stageprofile-binutils: +maybe-clean-stageprofile-binutils: + +@if binutils-bootstrap +maybe-configure-stageprofile-binutils: configure-stageprofile-binutils +configure-stageprofile-binutils: + @$(MAKE) stageprofile-start + @[ -f binutils/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage profile in binutils ; \ + cd binutils || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/binutils"; \ + libsrcdir="$$s/binutils";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/binutils"; \ + libsrcdir="$$s/binutils";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stageprofile-binutils: all-stageprofile-binutils +all-stageprofile-binutils: configure-stageprofile-binutils + @$(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd binutils && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" + +maybe-clean-stageprofile-binutils: clean-stageprofile-binutils +clean-stageprofile-binutils: + @[ -f binutils/Makefile ] || [ -f stageprofile-binutils/Makefile ] \ + || exit 0 ; \ + [ -f binutils/Makefile ] || $(MAKE) stageprofile-start ; \ + cd binutils && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean +@endif binutils-bootstrap + + +.PHONY: configure-stageprofile-gas maybe-configure-stageprofile-gas +.PHONY: all-stageprofile-gas maybe-all-stageprofile-gas +.PHONY: clean-stageprofile-gas maybe-clean-stageprofile-gas + +maybe-configure-stageprofile-gas: +maybe-all-stageprofile-gas: +maybe-clean-stageprofile-gas: + +@if gas-bootstrap +maybe-configure-stageprofile-gas: configure-stageprofile-gas +configure-stageprofile-gas: + @$(MAKE) stageprofile-start + @[ -f gas/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage profile in gas ; \ + cd gas || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gas"; \ + libsrcdir="$$s/gas";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gas"; \ + libsrcdir="$$s/gas";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stageprofile-gas: all-stageprofile-gas +all-stageprofile-gas: configure-stageprofile-gas + @$(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd gas && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" + +maybe-clean-stageprofile-gas: clean-stageprofile-gas +clean-stageprofile-gas: + @[ -f gas/Makefile ] || [ -f stageprofile-gas/Makefile ] \ + || exit 0 ; \ + [ -f gas/Makefile ] || $(MAKE) stageprofile-start ; \ + cd gas && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean +@endif gas-bootstrap + + +.PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc +.PHONY: all-stageprofile-gcc maybe-all-stageprofile-gcc +.PHONY: clean-stageprofile-gcc maybe-clean-stageprofile-gcc + +maybe-configure-stageprofile-gcc: +maybe-all-stageprofile-gcc: +maybe-clean-stageprofile-gcc: + +@if gcc-bootstrap +maybe-configure-stageprofile-gcc: configure-stageprofile-gcc +configure-stageprofile-gcc: + @$(MAKE) stageprofile-start + @[ -f gcc/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage profile in gcc ; \ + cd gcc || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gcc"; \ + libsrcdir="$$s/gcc";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gcc"; \ + libsrcdir="$$s/gcc";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stageprofile-gcc: all-stageprofile-gcc +all-stageprofile-gcc: configure-stageprofile-gcc + @$(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd gcc && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS) + +maybe-clean-stageprofile-gcc: clean-stageprofile-gcc +clean-stageprofile-gcc: + @[ -f gcc/Makefile ] || [ -f stageprofile-gcc/Makefile ] \ + || exit 0 ; \ + [ -f gcc/Makefile ] || $(MAKE) stageprofile-start ; \ + cd gcc && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS) clean +@endif gcc-bootstrap + + +.PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl +.PHONY: all-stageprofile-intl maybe-all-stageprofile-intl +.PHONY: clean-stageprofile-intl maybe-clean-stageprofile-intl + +maybe-configure-stageprofile-intl: +maybe-all-stageprofile-intl: +maybe-clean-stageprofile-intl: + +@if intl-bootstrap +maybe-configure-stageprofile-intl: configure-stageprofile-intl +configure-stageprofile-intl: + @$(MAKE) stageprofile-start + @[ -f intl/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage profile in intl ; \ + cd intl || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/intl"; \ + libsrcdir="$$s/intl";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/intl"; \ + libsrcdir="$$s/intl";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stageprofile-intl: all-stageprofile-intl +all-stageprofile-intl: configure-stageprofile-intl + @$(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd intl && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" + +maybe-clean-stageprofile-intl: clean-stageprofile-intl +clean-stageprofile-intl: + @[ -f intl/Makefile ] || [ -f stageprofile-intl/Makefile ] \ + || exit 0 ; \ + [ -f intl/Makefile ] || $(MAKE) stageprofile-start ; \ + cd intl && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean +@endif intl-bootstrap + + +.PHONY: configure-stageprofile-ld maybe-configure-stageprofile-ld +.PHONY: all-stageprofile-ld maybe-all-stageprofile-ld +.PHONY: clean-stageprofile-ld maybe-clean-stageprofile-ld + +maybe-configure-stageprofile-ld: +maybe-all-stageprofile-ld: +maybe-clean-stageprofile-ld: + +@if ld-bootstrap +maybe-configure-stageprofile-ld: configure-stageprofile-ld +configure-stageprofile-ld: + @$(MAKE) stageprofile-start + @[ -f ld/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage profile in ld ; \ + cd ld || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/ld"; \ + libsrcdir="$$s/ld";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/ld"; \ + libsrcdir="$$s/ld";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stageprofile-ld: all-stageprofile-ld +all-stageprofile-ld: configure-stageprofile-ld + @$(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd ld && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" + +maybe-clean-stageprofile-ld: clean-stageprofile-ld +clean-stageprofile-ld: + @[ -f ld/Makefile ] || [ -f stageprofile-ld/Makefile ] \ + || exit 0 ; \ + [ -f ld/Makefile ] || $(MAKE) stageprofile-start ; \ + cd ld && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean +@endif ld-bootstrap + + +.PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp +.PHONY: all-stageprofile-libcpp maybe-all-stageprofile-libcpp +.PHONY: clean-stageprofile-libcpp maybe-clean-stageprofile-libcpp + +maybe-configure-stageprofile-libcpp: +maybe-all-stageprofile-libcpp: +maybe-clean-stageprofile-libcpp: + +@if libcpp-bootstrap +maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp +configure-stageprofile-libcpp: + @$(MAKE) stageprofile-start + @[ -f libcpp/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage profile in libcpp ; \ + cd libcpp || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/libcpp"; \ + libsrcdir="$$s/libcpp";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/libcpp"; \ + libsrcdir="$$s/libcpp";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stageprofile-libcpp: all-stageprofile-libcpp +all-stageprofile-libcpp: configure-stageprofile-libcpp + @$(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" + +maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp +clean-stageprofile-libcpp: + @[ -f libcpp/Makefile ] || [ -f stageprofile-libcpp/Makefile ] \ + || exit 0 ; \ + [ -f libcpp/Makefile ] || $(MAKE) stageprofile-start ; \ + cd libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean +@endif libcpp-bootstrap + + +.PHONY: configure-stageprofile-libiberty maybe-configure-stageprofile-libiberty +.PHONY: all-stageprofile-libiberty maybe-all-stageprofile-libiberty +.PHONY: clean-stageprofile-libiberty maybe-clean-stageprofile-libiberty + +maybe-configure-stageprofile-libiberty: +maybe-all-stageprofile-libiberty: +maybe-clean-stageprofile-libiberty: + +@if libiberty-bootstrap +maybe-configure-stageprofile-libiberty: configure-stageprofile-libiberty +configure-stageprofile-libiberty: + @$(MAKE) stageprofile-start + @[ -f libiberty/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage profile in libiberty ; \ + cd libiberty || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/libiberty"; \ + libsrcdir="$$s/libiberty";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/libiberty"; \ + libsrcdir="$$s/libiberty";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stageprofile-libiberty: all-stageprofile-libiberty +all-stageprofile-libiberty: configure-stageprofile-libiberty + @$(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" + +maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty +clean-stageprofile-libiberty: + @[ -f libiberty/Makefile ] || [ -f stageprofile-libiberty/Makefile ] \ + || exit 0 ; \ + [ -f libiberty/Makefile ] || $(MAKE) stageprofile-start ; \ + cd libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean +@endif libiberty-bootstrap + + +.PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib +.PHONY: all-stageprofile-zlib maybe-all-stageprofile-zlib +.PHONY: clean-stageprofile-zlib maybe-clean-stageprofile-zlib + +maybe-configure-stageprofile-zlib: +maybe-all-stageprofile-zlib: +maybe-clean-stageprofile-zlib: + +@if zlib-bootstrap +maybe-configure-stageprofile-zlib: configure-stageprofile-zlib +configure-stageprofile-zlib: + @$(MAKE) stageprofile-start + @[ -f zlib/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage profile in zlib ; \ + cd zlib || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/zlib"; \ + libsrcdir="$$s/zlib";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/zlib"; \ + libsrcdir="$$s/zlib";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stageprofile-zlib: all-stageprofile-zlib +all-stageprofile-zlib: configure-stageprofile-zlib + @$(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd zlib && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" + +maybe-clean-stageprofile-zlib: clean-stageprofile-zlib +clean-stageprofile-zlib: + @[ -f zlib/Makefile ] || [ -f stageprofile-zlib/Makefile ] \ + || exit 0 ; \ + [ -f zlib/Makefile ] || $(MAKE) stageprofile-start ; \ + cd zlib && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean +@endif zlib-bootstrap + + # FIXME: Will not need to be conditional when toplevel bootstrap is the # only possibility, but now it conflicts with no-bootstrap rules @@ -37727,7 +31515,7 @@ do-clean: clean-stageprofile distclean-stage1:: distclean-stageprofile .PHONY: distclean-stageprofile distclean-stageprofile:: - @: $(MAKE); $(stage) + [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : rm -rf stageprofile-* @@ -37737,204 +31525,714 @@ distclean-stageprofile:: .PHONY: stagefeedback-start stagefeedback-end stagefeedback-start:: - @: $(MAKE); $(stage); \ + @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ echo stagefeedback > stage_current ; \ - echo stagefeedback > stage_last; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) + echo stagefeedback > stage_last @if bfd - @cd $(HOST_SUBDIR); [ -d stagefeedback-bfd ] || \ - mkdir stagefeedback-bfd; \ - mv stagefeedback-bfd bfd ; \ - mv stageprofile-bfd prev-bfd || test -f stageprofile-lean + @[ -d stagefeedback-bfd ] || mkdir stagefeedback-bfd; \ + set stagefeedback-bfd bfd ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-bfd prev-bfd ; @CREATE_LINK_TO_DIR@ @endif bfd @if opcodes - @cd $(HOST_SUBDIR); [ -d stagefeedback-opcodes ] || \ - mkdir stagefeedback-opcodes; \ - mv stagefeedback-opcodes opcodes ; \ - mv stageprofile-opcodes prev-opcodes || test -f stageprofile-lean + @[ -d stagefeedback-opcodes ] || mkdir stagefeedback-opcodes; \ + set stagefeedback-opcodes opcodes ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-opcodes prev-opcodes ; @CREATE_LINK_TO_DIR@ @endif opcodes @if binutils - @cd $(HOST_SUBDIR); [ -d stagefeedback-binutils ] || \ - mkdir stagefeedback-binutils; \ - mv stagefeedback-binutils binutils ; \ - mv stageprofile-binutils prev-binutils || test -f stageprofile-lean + @[ -d stagefeedback-binutils ] || mkdir stagefeedback-binutils; \ + set stagefeedback-binutils binutils ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-binutils prev-binutils ; @CREATE_LINK_TO_DIR@ @endif binutils @if gas - @cd $(HOST_SUBDIR); [ -d stagefeedback-gas ] || \ - mkdir stagefeedback-gas; \ - mv stagefeedback-gas gas ; \ - mv stageprofile-gas prev-gas || test -f stageprofile-lean + @[ -d stagefeedback-gas ] || mkdir stagefeedback-gas; \ + set stagefeedback-gas gas ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-gas prev-gas ; @CREATE_LINK_TO_DIR@ @endif gas @if gcc - @cd $(HOST_SUBDIR); [ -d stagefeedback-gcc ] || \ - mkdir stagefeedback-gcc; \ - mv stagefeedback-gcc gcc ; \ - mv stageprofile-gcc prev-gcc || test -f stageprofile-lean + @[ -d stagefeedback-gcc ] || mkdir stagefeedback-gcc; \ + set stagefeedback-gcc gcc ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ @endif gcc @if intl - @cd $(HOST_SUBDIR); [ -d stagefeedback-intl ] || \ - mkdir stagefeedback-intl; \ - mv stagefeedback-intl intl ; \ - mv stageprofile-intl prev-intl || test -f stageprofile-lean + @[ -d stagefeedback-intl ] || mkdir stagefeedback-intl; \ + set stagefeedback-intl intl ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-intl prev-intl ; @CREATE_LINK_TO_DIR@ @endif intl @if ld - @cd $(HOST_SUBDIR); [ -d stagefeedback-ld ] || \ - mkdir stagefeedback-ld; \ - mv stagefeedback-ld ld ; \ - mv stageprofile-ld prev-ld || test -f stageprofile-lean + @[ -d stagefeedback-ld ] || mkdir stagefeedback-ld; \ + set stagefeedback-ld ld ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-ld prev-ld ; @CREATE_LINK_TO_DIR@ @endif ld @if libcpp - @cd $(HOST_SUBDIR); [ -d stagefeedback-libcpp ] || \ - mkdir stagefeedback-libcpp; \ - mv stagefeedback-libcpp libcpp ; \ - mv stageprofile-libcpp prev-libcpp || test -f stageprofile-lean + @[ -d stagefeedback-libcpp ] || mkdir stagefeedback-libcpp; \ + set stagefeedback-libcpp libcpp ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ @endif libcpp -@if libdecnumber - @cd $(HOST_SUBDIR); [ -d stagefeedback-libdecnumber ] || \ - mkdir stagefeedback-libdecnumber; \ - mv stagefeedback-libdecnumber libdecnumber ; \ - mv stageprofile-libdecnumber prev-libdecnumber || test -f stageprofile-lean -@endif libdecnumber @if libiberty - @cd $(HOST_SUBDIR); [ -d stagefeedback-libiberty ] || \ - mkdir stagefeedback-libiberty; \ - mv stagefeedback-libiberty libiberty ; \ - mv stageprofile-libiberty prev-libiberty || test -f stageprofile-lean + @[ -d stagefeedback-libiberty ] || mkdir stagefeedback-libiberty; \ + set stagefeedback-libiberty libiberty ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-libiberty prev-libiberty ; @CREATE_LINK_TO_DIR@ @endif libiberty @if zlib - @cd $(HOST_SUBDIR); [ -d stagefeedback-zlib ] || \ - mkdir stagefeedback-zlib; \ - mv stagefeedback-zlib zlib ; \ - mv stageprofile-zlib prev-zlib || test -f stageprofile-lean + @[ -d stagefeedback-zlib ] || mkdir stagefeedback-zlib; \ + set stagefeedback-zlib zlib ; @CREATE_LINK_TO_DIR@ ; \ + set stage1-zlib prev-zlib ; @CREATE_LINK_TO_DIR@ @endif zlib - @[ -d stagefeedback-$(TARGET_SUBDIR) ] || \ - mkdir stagefeedback-$(TARGET_SUBDIR); \ - mv stagefeedback-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ - mv stageprofile-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stageprofile-lean -stagefeedback-end:: +stagefeedback-end:: + @rm -f stage_current @if bfd - @if test -d $(HOST_SUBDIR)/bfd ; then \ - cd $(HOST_SUBDIR); mv bfd stagefeedback-bfd ; \ - mv prev-bfd stageprofile-bfd ; : ; \ - fi + @set bfd stagefeedback-bfd ; @UNDO_LINK_TO_DIR@ ; \ + set prev-bfd stage1-bfd ; @UNDO_LINK_TO_DIR@ @endif bfd @if opcodes - @if test -d $(HOST_SUBDIR)/opcodes ; then \ - cd $(HOST_SUBDIR); mv opcodes stagefeedback-opcodes ; \ - mv prev-opcodes stageprofile-opcodes ; : ; \ - fi + @set opcodes stagefeedback-opcodes ; @UNDO_LINK_TO_DIR@ ; \ + set prev-opcodes stage1-opcodes ; @UNDO_LINK_TO_DIR@ @endif opcodes @if binutils - @if test -d $(HOST_SUBDIR)/binutils ; then \ - cd $(HOST_SUBDIR); mv binutils stagefeedback-binutils ; \ - mv prev-binutils stageprofile-binutils ; : ; \ - fi + @set binutils stagefeedback-binutils ; @UNDO_LINK_TO_DIR@ ; \ + set prev-binutils stage1-binutils ; @UNDO_LINK_TO_DIR@ @endif binutils @if gas - @if test -d $(HOST_SUBDIR)/gas ; then \ - cd $(HOST_SUBDIR); mv gas stagefeedback-gas ; \ - mv prev-gas stageprofile-gas ; : ; \ - fi + @set gas stagefeedback-gas ; @UNDO_LINK_TO_DIR@ ; \ + set prev-gas stage1-gas ; @UNDO_LINK_TO_DIR@ @endif gas @if gcc - @if test -d $(HOST_SUBDIR)/gcc ; then \ - cd $(HOST_SUBDIR); mv gcc stagefeedback-gcc ; \ - mv prev-gcc stageprofile-gcc ; : ; \ - fi + @set gcc stagefeedback-gcc ; @UNDO_LINK_TO_DIR@ ; \ + set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ @endif gcc @if intl - @if test -d $(HOST_SUBDIR)/intl ; then \ - cd $(HOST_SUBDIR); mv intl stagefeedback-intl ; \ - mv prev-intl stageprofile-intl ; : ; \ - fi + @set intl stagefeedback-intl ; @UNDO_LINK_TO_DIR@ ; \ + set prev-intl stage1-intl ; @UNDO_LINK_TO_DIR@ @endif intl @if ld - @if test -d $(HOST_SUBDIR)/ld ; then \ - cd $(HOST_SUBDIR); mv ld stagefeedback-ld ; \ - mv prev-ld stageprofile-ld ; : ; \ - fi + @set ld stagefeedback-ld ; @UNDO_LINK_TO_DIR@ ; \ + set prev-ld stage1-ld ; @UNDO_LINK_TO_DIR@ @endif ld @if libcpp - @if test -d $(HOST_SUBDIR)/libcpp ; then \ - cd $(HOST_SUBDIR); mv libcpp stagefeedback-libcpp ; \ - mv prev-libcpp stageprofile-libcpp ; : ; \ - fi + @set libcpp stagefeedback-libcpp ; @UNDO_LINK_TO_DIR@ ; \ + set prev-libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ @endif libcpp -@if libdecnumber - @if test -d $(HOST_SUBDIR)/libdecnumber ; then \ - cd $(HOST_SUBDIR); mv libdecnumber stagefeedback-libdecnumber ; \ - mv prev-libdecnumber stageprofile-libdecnumber ; : ; \ - fi -@endif libdecnumber @if libiberty - @if test -d $(HOST_SUBDIR)/libiberty ; then \ - cd $(HOST_SUBDIR); mv libiberty stagefeedback-libiberty ; \ - mv prev-libiberty stageprofile-libiberty ; : ; \ - fi + @set libiberty stagefeedback-libiberty ; @UNDO_LINK_TO_DIR@ ; \ + set prev-libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ @endif libiberty @if zlib - @if test -d $(HOST_SUBDIR)/zlib ; then \ - cd $(HOST_SUBDIR); mv zlib stagefeedback-zlib ; \ - mv prev-zlib stageprofile-zlib ; : ; \ - fi + @set zlib stagefeedback-zlib ; @UNDO_LINK_TO_DIR@ ; \ + set prev-zlib stage1-zlib ; @UNDO_LINK_TO_DIR@ @endif zlib - @if test -d $(TARGET_SUBDIR) ; then \ - mv $(TARGET_SUBDIR) stagefeedback-$(TARGET_SUBDIR) ; \ - mv prev-$(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR) ; : ; \ - fi - rm -f stage_current -# Bubble a bugfix through all the stages up to stage feedback. They are -# remade, but not reconfigured. The next stage (if any) will not be -# reconfigured as well. +# Bubble a bugfix through all the stages up to stage feedback. They +# are remade, but not reconfigured. The next stage (if any) will not +# be reconfigured as well. .PHONY: stagefeedback-bubble -stagefeedback-bubble:: stageprofile-bubble - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - if test -f stagefeedback-lean || test -f stageprofile-lean ; then \ +stagefeedback-bubble:: stage1-bubble + @if test -f stagefeedback-lean || test -f stage1-lean ; then \ echo Skipping rebuild of stagefeedback ; \ else \ - $(MAKE) stagefeedback-start; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stagefeedback; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stagefeedback; \ fi .PHONY: all-stagefeedback clean-stagefeedback +all-stagefeedback: \ + maybe-all-stagefeedback-bfd \ + maybe-all-stagefeedback-opcodes \ + maybe-all-stagefeedback-binutils \ + maybe-all-stagefeedback-gas \ + maybe-all-stagefeedback-gcc \ + maybe-all-stagefeedback-intl \ + maybe-all-stagefeedback-ld \ + maybe-all-stagefeedback-libcpp \ + maybe-all-stagefeedback-libiberty \ + maybe-all-stagefeedback-zlib + do-clean: clean-stagefeedback +clean-stagefeedback: \ + maybe-clean-stagefeedback-bfd \ + maybe-clean-stagefeedback-opcodes \ + maybe-clean-stagefeedback-binutils \ + maybe-clean-stagefeedback-gas \ + maybe-clean-stagefeedback-gcc \ + maybe-clean-stagefeedback-intl \ + maybe-clean-stagefeedback-ld \ + maybe-clean-stagefeedback-libcpp \ + maybe-clean-stagefeedback-libiberty \ + maybe-clean-stagefeedback-zlib + + +.PHONY: configure-stagefeedback-bfd maybe-configure-stagefeedback-bfd +.PHONY: all-stagefeedback-bfd maybe-all-stagefeedback-bfd +.PHONY: clean-stagefeedback-bfd maybe-clean-stagefeedback-bfd + +maybe-configure-stagefeedback-bfd: +maybe-all-stagefeedback-bfd: +maybe-clean-stagefeedback-bfd: + +@if bfd-bootstrap +maybe-configure-stagefeedback-bfd: configure-stagefeedback-bfd +configure-stagefeedback-bfd: + @$(MAKE) stagefeedback-start + @[ -f bfd/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage feedback in bfd ; \ + cd bfd || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/bfd"; \ + libsrcdir="$$s/bfd";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/bfd"; \ + libsrcdir="$$s/bfd";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stagefeedback-bfd: all-stagefeedback-bfd +all-stagefeedback-bfd: configure-stagefeedback-bfd + @$(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd bfd && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" + +maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd +clean-stagefeedback-bfd: + @[ -f bfd/Makefile ] || [ -f stagefeedback-bfd/Makefile ] \ + || exit 0 ; \ + [ -f bfd/Makefile ] || $(MAKE) stagefeedback-start ; \ + cd bfd && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean +@endif bfd-bootstrap + + +.PHONY: configure-stagefeedback-opcodes maybe-configure-stagefeedback-opcodes +.PHONY: all-stagefeedback-opcodes maybe-all-stagefeedback-opcodes +.PHONY: clean-stagefeedback-opcodes maybe-clean-stagefeedback-opcodes + +maybe-configure-stagefeedback-opcodes: +maybe-all-stagefeedback-opcodes: +maybe-clean-stagefeedback-opcodes: + +@if opcodes-bootstrap +maybe-configure-stagefeedback-opcodes: configure-stagefeedback-opcodes +configure-stagefeedback-opcodes: + @$(MAKE) stagefeedback-start + @[ -f opcodes/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage feedback in opcodes ; \ + cd opcodes || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/opcodes"; \ + libsrcdir="$$s/opcodes";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/opcodes"; \ + libsrcdir="$$s/opcodes";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stagefeedback-opcodes: all-stagefeedback-opcodes +all-stagefeedback-opcodes: configure-stagefeedback-opcodes + @$(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" + +maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes +clean-stagefeedback-opcodes: + @[ -f opcodes/Makefile ] || [ -f stagefeedback-opcodes/Makefile ] \ + || exit 0 ; \ + [ -f opcodes/Makefile ] || $(MAKE) stagefeedback-start ; \ + cd opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean +@endif opcodes-bootstrap + + +.PHONY: configure-stagefeedback-binutils maybe-configure-stagefeedback-binutils +.PHONY: all-stagefeedback-binutils maybe-all-stagefeedback-binutils +.PHONY: clean-stagefeedback-binutils maybe-clean-stagefeedback-binutils + +maybe-configure-stagefeedback-binutils: +maybe-all-stagefeedback-binutils: +maybe-clean-stagefeedback-binutils: + +@if binutils-bootstrap +maybe-configure-stagefeedback-binutils: configure-stagefeedback-binutils +configure-stagefeedback-binutils: + @$(MAKE) stagefeedback-start + @[ -f binutils/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage feedback in binutils ; \ + cd binutils || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/binutils"; \ + libsrcdir="$$s/binutils";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/binutils"; \ + libsrcdir="$$s/binutils";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stagefeedback-binutils: all-stagefeedback-binutils +all-stagefeedback-binutils: configure-stagefeedback-binutils + @$(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd binutils && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" + +maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils +clean-stagefeedback-binutils: + @[ -f binutils/Makefile ] || [ -f stagefeedback-binutils/Makefile ] \ + || exit 0 ; \ + [ -f binutils/Makefile ] || $(MAKE) stagefeedback-start ; \ + cd binutils && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean +@endif binutils-bootstrap + + +.PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas +.PHONY: all-stagefeedback-gas maybe-all-stagefeedback-gas +.PHONY: clean-stagefeedback-gas maybe-clean-stagefeedback-gas + +maybe-configure-stagefeedback-gas: +maybe-all-stagefeedback-gas: +maybe-clean-stagefeedback-gas: + +@if gas-bootstrap +maybe-configure-stagefeedback-gas: configure-stagefeedback-gas +configure-stagefeedback-gas: + @$(MAKE) stagefeedback-start + @[ -f gas/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage feedback in gas ; \ + cd gas || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gas"; \ + libsrcdir="$$s/gas";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gas"; \ + libsrcdir="$$s/gas";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stagefeedback-gas: all-stagefeedback-gas +all-stagefeedback-gas: configure-stagefeedback-gas + @$(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd gas && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" + +maybe-clean-stagefeedback-gas: clean-stagefeedback-gas +clean-stagefeedback-gas: + @[ -f gas/Makefile ] || [ -f stagefeedback-gas/Makefile ] \ + || exit 0 ; \ + [ -f gas/Makefile ] || $(MAKE) stagefeedback-start ; \ + cd gas && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean +@endif gas-bootstrap + + +.PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc +.PHONY: all-stagefeedback-gcc maybe-all-stagefeedback-gcc +.PHONY: clean-stagefeedback-gcc maybe-clean-stagefeedback-gcc + +maybe-configure-stagefeedback-gcc: +maybe-all-stagefeedback-gcc: +maybe-clean-stagefeedback-gcc: -# FIXME: Will not need to be conditional when toplevel bootstrap is the -# only possibility, but now it conflicts with no-bootstrap rules @if gcc-bootstrap +maybe-configure-stagefeedback-gcc: configure-stagefeedback-gcc +configure-stagefeedback-gcc: + @$(MAKE) stagefeedback-start + @[ -f gcc/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage feedback in gcc ; \ + cd gcc || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/gcc"; \ + libsrcdir="$$s/gcc";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/gcc"; \ + libsrcdir="$$s/gcc";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stagefeedback-gcc: all-stagefeedback-gcc +all-stagefeedback-gcc: configure-stagefeedback-gcc + @$(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd gcc && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS) + +maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc +clean-stagefeedback-gcc: + @[ -f gcc/Makefile ] || [ -f stagefeedback-gcc/Makefile ] \ + || exit 0 ; \ + [ -f gcc/Makefile ] || $(MAKE) stagefeedback-start ; \ + cd gcc && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS) clean +@endif gcc-bootstrap +.PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl +.PHONY: all-stagefeedback-intl maybe-all-stagefeedback-intl +.PHONY: clean-stagefeedback-intl maybe-clean-stagefeedback-intl -.PHONY: profiledbootstrap profiledbootstrap-lean -profiledbootstrap: - echo stagefeedback > stage_final +maybe-configure-stagefeedback-intl: +maybe-all-stagefeedback-intl: +maybe-clean-stagefeedback-intl: + +@if intl-bootstrap +maybe-configure-stagefeedback-intl: configure-stagefeedback-intl +configure-stagefeedback-intl: + @$(MAKE) stagefeedback-start + @[ -f intl/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage feedback in intl ; \ + cd intl || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/intl"; \ + libsrcdir="$$s/intl";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/intl"; \ + libsrcdir="$$s/intl";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stagefeedback-intl: all-stagefeedback-intl +all-stagefeedback-intl: configure-stagefeedback-intl + @$(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) stagefeedback-bubble - @: $(MAKE); $(unstage) + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd intl && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" + +maybe-clean-stagefeedback-intl: clean-stagefeedback-intl +clean-stagefeedback-intl: + @[ -f intl/Makefile ] || [ -f stagefeedback-intl/Makefile ] \ + || exit 0 ; \ + [ -f intl/Makefile ] || $(MAKE) stagefeedback-start ; \ + cd intl && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean +@endif intl-bootstrap + + +.PHONY: configure-stagefeedback-ld maybe-configure-stagefeedback-ld +.PHONY: all-stagefeedback-ld maybe-all-stagefeedback-ld +.PHONY: clean-stagefeedback-ld maybe-clean-stagefeedback-ld + +maybe-configure-stagefeedback-ld: +maybe-all-stagefeedback-ld: +maybe-clean-stagefeedback-ld: + +@if ld-bootstrap +maybe-configure-stagefeedback-ld: configure-stagefeedback-ld +configure-stagefeedback-ld: + @$(MAKE) stagefeedback-start + @[ -f ld/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage feedback in ld ; \ + cd ld || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/ld"; \ + libsrcdir="$$s/ld";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/ld"; \ + libsrcdir="$$s/ld";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stagefeedback-ld: all-stagefeedback-ld +all-stagefeedback-ld: configure-stagefeedback-ld + @$(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd ld && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" -profiledbootstrap-lean: - echo stagefeedback > stage_final +maybe-clean-stagefeedback-ld: clean-stagefeedback-ld +clean-stagefeedback-ld: + @[ -f ld/Makefile ] || [ -f stagefeedback-ld/Makefile ] \ + || exit 0 ; \ + [ -f ld/Makefile ] || $(MAKE) stagefeedback-start ; \ + cd ld && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean +@endif ld-bootstrap + + +.PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp +.PHONY: all-stagefeedback-libcpp maybe-all-stagefeedback-libcpp +.PHONY: clean-stagefeedback-libcpp maybe-clean-stagefeedback-libcpp + +maybe-configure-stagefeedback-libcpp: +maybe-all-stagefeedback-libcpp: +maybe-clean-stagefeedback-libcpp: + +@if libcpp-bootstrap +maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp +configure-stagefeedback-libcpp: + @$(MAKE) stagefeedback-start + @[ -f libcpp/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage feedback in libcpp ; \ + cd libcpp || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/libcpp"; \ + libsrcdir="$$s/libcpp";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/libcpp"; \ + libsrcdir="$$s/libcpp";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stagefeedback-libcpp: all-stagefeedback-libcpp +all-stagefeedback-libcpp: configure-stagefeedback-libcpp + @$(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stagefeedback-bubble - @: $(MAKE); $(unstage) + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" + +maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp +clean-stagefeedback-libcpp: + @[ -f libcpp/Makefile ] || [ -f stagefeedback-libcpp/Makefile ] \ + || exit 0 ; \ + [ -f libcpp/Makefile ] || $(MAKE) stagefeedback-start ; \ + cd libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean +@endif libcpp-bootstrap + + +.PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty +.PHONY: all-stagefeedback-libiberty maybe-all-stagefeedback-libiberty +.PHONY: clean-stagefeedback-libiberty maybe-clean-stagefeedback-libiberty + +maybe-configure-stagefeedback-libiberty: +maybe-all-stagefeedback-libiberty: +maybe-clean-stagefeedback-libiberty: + +@if libiberty-bootstrap +maybe-configure-stagefeedback-libiberty: configure-stagefeedback-libiberty +configure-stagefeedback-libiberty: + @$(MAKE) stagefeedback-start + @[ -f libiberty/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage feedback in libiberty ; \ + cd libiberty || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/libiberty"; \ + libsrcdir="$$s/libiberty";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/libiberty"; \ + libsrcdir="$$s/libiberty";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stagefeedback-libiberty: all-stagefeedback-libiberty +all-stagefeedback-libiberty: configure-stagefeedback-libiberty + @$(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" + +maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty +clean-stagefeedback-libiberty: + @[ -f libiberty/Makefile ] || [ -f stagefeedback-libiberty/Makefile ] \ + || exit 0 ; \ + [ -f libiberty/Makefile ] || $(MAKE) stagefeedback-start ; \ + cd libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean +@endif libiberty-bootstrap + + +.PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib +.PHONY: all-stagefeedback-zlib maybe-all-stagefeedback-zlib +.PHONY: clean-stagefeedback-zlib maybe-clean-stagefeedback-zlib + +maybe-configure-stagefeedback-zlib: +maybe-all-stagefeedback-zlib: +maybe-clean-stagefeedback-zlib: + +@if zlib-bootstrap +maybe-configure-stagefeedback-zlib: configure-stagefeedback-zlib +configure-stagefeedback-zlib: + @$(MAKE) stagefeedback-start + @[ -f zlib/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + echo Configuring stage feedback in zlib ; \ + cd zlib || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/zlib"; \ + libsrcdir="$$s/zlib";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/zlib"; \ + libsrcdir="$$s/zlib";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ + +maybe-all-stagefeedback-zlib: all-stagefeedback-zlib +all-stagefeedback-zlib: configure-stagefeedback-zlib + @$(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(STAGE_HOST_EXPORTS) \ + cd zlib && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" + +maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib +clean-stagefeedback-zlib: + @[ -f zlib/Makefile ] || [ -f stagefeedback-zlib/Makefile ] \ + || exit 0 ; \ + [ -f zlib/Makefile ] || $(MAKE) stagefeedback-start ; \ + cd zlib && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean +@endif zlib-bootstrap + + + +# FIXME: Will not need to be conditional when toplevel bootstrap is the +# only possibility, but now it conflicts with no-bootstrap rules +@if gcc-bootstrap + + # Rules to wipe a stage and all the following ones, also used for cleanstrap -distclean-stageprofile:: distclean-stagefeedback +distclean-stage1:: distclean-stagefeedback .PHONY: distclean-stagefeedback distclean-stagefeedback:: - @: $(MAKE); $(stage) + [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : rm -rf stagefeedback-* @@ -37942,86 +32240,83 @@ distclean-stagefeedback:: -stageprofile-end:: - $(MAKE) distclean-stagefeedback - stagefeedback-start:: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - for i in prev-*; do \ - j=`echo $$i | sed s/^prev-//` ; \ - cd $$r/$$i && \ - { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../'$$j'/&",' | $(SHELL) ; } && \ - { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../'$$j'/&",' | $(SHELL) ; } ; \ - done + cd stageprofile-gcc && \ + { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../gcc/&",' | $(SHELL); } && \ + { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../gcc/&",' | $(SHELL); } +# FIXME: Will not need to be conditional when toplevel bootstrap is the +# only possibility, but now it conflicts with no-bootstrap rules @if gcc-bootstrap -do-distclean: distclean-stage1 - -# Provide a GCC build when we're building target libraries. This does -# not work as a dependency, just as the minimum necessary to avoid errors. -stage_last: - $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble +profiledbootstrap: + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ + $(HOST_EXPORTS) \ + echo "Bootstrapping the compiler"; \ + $(MAKE) stageprofile-bubble distclean-stagefeedback + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ + $(SET_LIB_PATH) \ + echo "Building runtime libraries and training compiler"; \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(SET_LIB_PATH) \ + $(HOST_EXPORTS) \ + echo "Building feedback based compiler"; \ + $(MAKE) stagefeedback-bubble stagefeedback-end @endif gcc-bootstrap -.PHONY: restrap -restrap: - @: $(MAKE); $(stage) - rm -rf stage1-$(TARGET_SUBDIR) stage2 stage3 stage4 stageprofile stagefeedback - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all +@if gcc-bootstrap +NOTPARALLEL = .NOTPARALLEL +$(NOTPARALLEL): +do-distclean: distclean-stage1 +@endif gcc-bootstrap # -------------------------------------- # Dependencies between different modules # -------------------------------------- # Generic dependencies for target modules on host stuff, especially gcc -@if gcc-bootstrap -configure-target-libstdc++-v3: stage_last -configure-target-libmudflap: stage_last -configure-target-libssp: stage_last -configure-target-libgcc-math: stage_last -configure-target-newlib: stage_last -configure-target-libgfortran: stage_last -configure-target-libobjc: stage_last -configure-target-libtermcap: stage_last -configure-target-winsup: stage_last -configure-target-libgloss: stage_last -configure-target-libiberty: stage_last -configure-target-gperf: stage_last -configure-target-examples: stage_last -configure-target-libffi: stage_last -configure-target-libjava: stage_last -configure-target-zlib: stage_last -configure-target-boehm-gc: stage_last -configure-target-qthreads: stage_last -configure-target-rda: stage_last -configure-target-libada: stage_last -configure-target-libgomp: stage_last -@endif gcc-bootstrap -@if gcc-no-bootstrap configure-target-libstdc++-v3: maybe-all-gcc + configure-target-libmudflap: maybe-all-gcc -configure-target-libssp: maybe-all-gcc -configure-target-libgcc-math: maybe-all-gcc + configure-target-newlib: maybe-all-gcc + configure-target-libgfortran: maybe-all-gcc + configure-target-libobjc: maybe-all-gcc + configure-target-libtermcap: maybe-all-gcc + configure-target-winsup: maybe-all-gcc + configure-target-libgloss: maybe-all-gcc + configure-target-libiberty: maybe-all-gcc + configure-target-gperf: maybe-all-gcc + configure-target-examples: maybe-all-gcc + configure-target-libffi: maybe-all-gcc + configure-target-libjava: maybe-all-gcc + configure-target-zlib: maybe-all-gcc + configure-target-boehm-gc: maybe-all-gcc + configure-target-qthreads: maybe-all-gcc + configure-target-rda: maybe-all-gcc + configure-target-libada: maybe-all-gcc -configure-target-libgomp: maybe-all-gcc -@endif gcc-no-bootstrap @@ -38039,12 +32334,8 @@ configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss configure-target-libjava: maybe-all-target-newlib maybe-all-target-libgloss configure-target-libjava: maybe-all-target-libstdc++-v3 -configure-target-libmudflap: maybe-all-target-newlib maybe-all-target-libgloss - configure-target-libobjc: maybe-all-target-newlib maybe-all-target-libgloss -configure-target-libssp: maybe-all-target-newlib maybe-all-target-libgloss - configure-target-libstdc++-v3: maybe-all-target-newlib maybe-all-target-libgloss configure-target-zlib: maybe-all-target-newlib maybe-all-target-libgloss @@ -38071,7 +32362,6 @@ configure-target-qthreads: maybe-all-target-newlib maybe-all-target-libgloss - # With all the machinery above in place, it is pretty easy to generate # dependencies. Host dependencies are a bit more complex because we have # to check for bootstrap/prebootstrap dependencies. To resolve @@ -38094,30 +32384,30 @@ configure-stage3-gcc: maybe-configure-stage3-intl configure-stage4-gcc: maybe-configure-stage4-intl configure-stageprofile-gcc: maybe-configure-stageprofile-intl configure-stagefeedback-gcc: maybe-configure-stagefeedback-intl -configure-gcc: maybe-all-binutils - -configure-stage1-gcc: maybe-all-stage1-binutils -configure-stage2-gcc: maybe-all-stage2-binutils -configure-stage3-gcc: maybe-all-stage3-binutils -configure-stage4-gcc: maybe-all-stage4-binutils -configure-stageprofile-gcc: maybe-all-stageprofile-binutils -configure-stagefeedback-gcc: maybe-all-stagefeedback-binutils -configure-gcc: maybe-all-gas - -configure-stage1-gcc: maybe-all-stage1-gas -configure-stage2-gcc: maybe-all-stage2-gas -configure-stage3-gcc: maybe-all-stage3-gas -configure-stage4-gcc: maybe-all-stage4-gas -configure-stageprofile-gcc: maybe-all-stageprofile-gas -configure-stagefeedback-gcc: maybe-all-stagefeedback-gas -configure-gcc: maybe-all-ld - -configure-stage1-gcc: maybe-all-stage1-ld -configure-stage2-gcc: maybe-all-stage2-ld -configure-stage3-gcc: maybe-all-stage3-ld -configure-stage4-gcc: maybe-all-stage4-ld -configure-stageprofile-gcc: maybe-all-stageprofile-ld -configure-stagefeedback-gcc: maybe-all-stagefeedback-ld +configure-gcc: maybe-configure-binutils + +configure-stage1-gcc: maybe-configure-stage1-binutils +configure-stage2-gcc: maybe-configure-stage2-binutils +configure-stage3-gcc: maybe-configure-stage3-binutils +configure-stage4-gcc: maybe-configure-stage4-binutils +configure-stageprofile-gcc: maybe-configure-stageprofile-binutils +configure-stagefeedback-gcc: maybe-configure-stagefeedback-binutils +configure-gcc: maybe-configure-gas + +configure-stage1-gcc: maybe-configure-stage1-gas +configure-stage2-gcc: maybe-configure-stage2-gas +configure-stage3-gcc: maybe-configure-stage3-gas +configure-stage4-gcc: maybe-configure-stage4-gas +configure-stageprofile-gcc: maybe-configure-stageprofile-gas +configure-stagefeedback-gcc: maybe-configure-stagefeedback-gas +configure-gcc: maybe-configure-ld + +configure-stage1-gcc: maybe-configure-stage1-ld +configure-stage2-gcc: maybe-configure-stage2-ld +configure-stage3-gcc: maybe-configure-stage3-ld +configure-stage4-gcc: maybe-configure-stage4-ld +configure-stageprofile-gcc: maybe-configure-stageprofile-ld +configure-stagefeedback-gcc: maybe-configure-stagefeedback-ld all-gcc: all-libiberty all-stage1-gcc: all-stage1-libiberty @@ -38188,6 +32478,30 @@ all-stage4-gcc: maybe-all-build-fixincludes all-stageprofile-gcc: maybe-all-build-fixincludes all-stagefeedback-gcc: maybe-all-build-fixincludes all-prebootstrap: maybe-all-build-fixincludes +all-gcc: maybe-all-binutils + +all-stage1-gcc: maybe-all-stage1-binutils +all-stage2-gcc: maybe-all-stage2-binutils +all-stage3-gcc: maybe-all-stage3-binutils +all-stage4-gcc: maybe-all-stage4-binutils +all-stageprofile-gcc: maybe-all-stageprofile-binutils +all-stagefeedback-gcc: maybe-all-stagefeedback-binutils +all-gcc: maybe-all-gas + +all-stage1-gcc: maybe-all-stage1-gas +all-stage2-gcc: maybe-all-stage2-gas +all-stage3-gcc: maybe-all-stage3-gas +all-stage4-gcc: maybe-all-stage4-gas +all-stageprofile-gcc: maybe-all-stageprofile-gas +all-stagefeedback-gcc: maybe-all-stagefeedback-gas +all-gcc: maybe-all-ld + +all-stage1-gcc: maybe-all-stage1-ld +all-stage2-gcc: maybe-all-stage2-ld +all-stage3-gcc: maybe-all-stage3-ld +all-stage4-gcc: maybe-all-stage4-ld +all-stageprofile-gcc: maybe-all-stageprofile-ld +all-stagefeedback-gcc: maybe-all-stagefeedback-ld all-gcc: maybe-all-zlib all-stage1-gcc: maybe-all-stage1-zlib @@ -38204,24 +32518,15 @@ all-stage3-gcc: all-stage3-libcpp all-stage4-gcc: all-stage4-libcpp all-stageprofile-gcc: all-stageprofile-libcpp all-stagefeedback-gcc: all-stagefeedback-libcpp -all-gcc: all-libdecnumber - -all-stage1-gcc: all-stage1-libdecnumber -all-stage2-gcc: all-stage2-libdecnumber -all-stage3-gcc: all-stage3-libdecnumber -all-stage4-gcc: all-stage4-libdecnumber -all-stageprofile-gcc: all-stageprofile-libdecnumber -all-stagefeedback-gcc: all-stagefeedback-libdecnumber -all-gcc: maybe-all-libiberty - -all-stage1-gcc: maybe-all-stage1-libiberty -all-stage2-gcc: maybe-all-stage2-libiberty -all-stage3-gcc: maybe-all-stage3-libiberty -all-stage4-gcc: maybe-all-stage4-libiberty -all-stageprofile-gcc: maybe-all-stageprofile-libiberty -all-stagefeedback-gcc: maybe-all-stagefeedback-libiberty -all-gcc: maybe-all-fixincludes -install-gcc: maybe-install-fixincludes +all-gcc: maybe-all-build-libiberty + +all-stage1-gcc: maybe-all-build-libiberty +all-stage2-gcc: maybe-all-build-libiberty +all-stage3-gcc: maybe-all-build-libiberty +all-stage4-gcc: maybe-all-build-libiberty +all-stageprofile-gcc: maybe-all-build-libiberty +all-stagefeedback-gcc: maybe-all-build-libiberty +all-prebootstrap: maybe-all-build-libiberty configure-libcpp: configure-libiberty configure-stage1-libcpp: configure-stage1-libiberty @@ -38254,8 +32559,9 @@ all-stage3-libcpp: maybe-all-stage3-intl all-stage4-libcpp: maybe-all-stage4-intl all-stageprofile-libcpp: maybe-all-stageprofile-intl all-stagefeedback-libcpp: maybe-all-stagefeedback-intl -all-fixincludes: maybe-all-libiberty -all-gnattools: maybe-all-target-libada +configure-gdb: maybe-configure-itcl +configure-gdb: maybe-configure-tcl +configure-gdb: maybe-configure-tk configure-gdb: maybe-configure-sim all-gdb: maybe-all-libiberty all-gdb: maybe-all-opcodes @@ -38264,6 +32570,10 @@ all-gdb: maybe-all-readline all-gdb: maybe-all-build-bison all-gdb: maybe-all-build-byacc all-gdb: maybe-all-sim +install-gdb: maybe-install-tcl +install-gdb: maybe-install-tk +install-gdb: maybe-install-itcl +install-gdb: maybe-install-libgui configure-libgui: maybe-configure-tcl configure-libgui: maybe-configure-tk all-libgui: maybe-all-tcl @@ -38558,17 +32868,12 @@ all-prebootstrap: maybe-all-gas all-prebootstrap: maybe-all-intl all-prebootstrap: maybe-all-ld all-prebootstrap: maybe-all-libcpp -all-prebootstrap: maybe-all-libdecnumber all-prebootstrap: maybe-all-libiberty all-prebootstrap: maybe-all-zlib @endif gcc-no-bootstrap -CONFIGURE_GDB_TK = @CONFIGURE_GDB_TK@ GDB_TK = @GDB_TK@ -INSTALL_GDB_TK = @INSTALL_GDB_TK@ -configure-gdb: $(CONFIGURE_GDB_TK) all-gdb: $(gdbnlmrequirements) $(GDB_TK) -install-gdb: $(INSTALL_GDB_TK) # Serialization dependencies. Host configures don't work well in parallel to # each other, due to contention over config.cache. Target configures and @@ -38579,6 +32884,17 @@ install-gdb: $(INSTALL_GDB_TK) # Regenerating top level configury # -------------------------------- +# Multilib.out tells target dirs what multilibs they should build. +# There is really only one copy. We use the 'timestamp' method to +# work around various timestamp bugs on some systems. +# We use move-if-change so that it's only considered updated when it +# actually changes, because it has to depend on a phony target. +multilib.out: maybe-all-gcc + @r=`${PWD_COMMAND}`; export r; \ + echo "Checking multilib configuration..."; \ + $(CC_FOR_TARGET) --print-multi-lib > multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/move-if-change multilib.tmp multilib.out ; \ + # Rebuilding Makefile.in, using autogen. AUTOGEN = autogen $(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def @@ -38588,7 +32904,7 @@ $(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def Makefile: $(srcdir)/Makefile.in config.status CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -config.status: configure +config.status: configure $(gcc_version_trigger) CONFIG_SHELL="$(SHELL)" $(SHELL) ./config.status --recheck # Rebuilding configure. |