X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Makefile.tpl;h=72e24983c5783f5c5bb72b8d59db4e0a66b505e3;hb=f86b235ae5cb80e78859673edaaf4ee96c3f2164;hp=3518079f8a4f6526b4b112d681468a6550124c44;hpb=54103d1ef8001e9d72e96b75d1227bdfe93f83cc;p=binutils-gdb.git diff --git a/Makefile.tpl b/Makefile.tpl index 3518079f8a4..72e24983c57 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -6,7 +6,7 @@ in # # Makefile for directory with subdirs to build. # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002 Free Software Foundation +# 1999, 2000, 2001, 2002, 2003 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 @@ -23,14 +23,10 @@ in # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -# Tell GNU make 3.79 not to run the top level in parallel. This -# prevents contention for $builddir/$target/config.cache, as well -# as minimizing scatter in file system caches. -NOTPARALLEL = .NOTPARALLEL -$(NOTPARALLEL): - +# ------------------------------- +# Standard Autoconf-set variables +# ------------------------------- VPATH=@srcdir@ -links=@configlinks@ build_alias=@build_alias@ build_cpu=@build_cpu@ @@ -48,18 +44,13 @@ target_vendor=@target_vendor@ target_os=@target_os@ target_canonical=@target_cpu@-@target_vendor@-@target_os@ -enable_shared = @enable_shared@ -enable_threads = @enable_threads@ -enable_version_specific_runtime_libs = @enable_version_specific_runtime_libs@ -# The file containing GCC's version number. -gcc_version_trigger = @gcc_version_trigger@ -gcc_version = @gcc_version@ - -srcdir = @srcdir@ +program_transform_name = @program_transform_name@ prefix = @prefix@ exec_prefix = @exec_prefix@ +srcdir = @srcdir@ + bindir = @bindir@ sbindir = @sbindir@ libexecdir = @libexecdir@ @@ -72,13 +63,6 @@ includedir = @includedir@ oldincludedir = @oldincludedir@ infodir = @infodir@ mandir = @mandir@ -gxx_include_dir=@gxx_include_dir@ - -tooldir = @tooldir@ -build_tooldir = @build_tooldir@ - -program_transform_name = @program_transform_name@ - man1dir = $(mandir)/man1 man2dir = $(mandir)/man2 man3dir = $(mandir)/man3 @@ -88,17 +72,6 @@ man6dir = $(mandir)/man6 man7dir = $(mandir)/man7 man8dir = $(mandir)/man8 man9dir = $(mandir)/man9 -# Directory in which the compiler finds executables, libraries, etc. -libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(gcc_version) -GDB_NLM_DEPS = - -SHELL = @config_shell@ - -# pwd command to use. Allow user to override default by setting PWDCMD in -# the environment to account for automounters. The make variable must not -# be called PWDCMD, otherwise the value set here is passed to make -# subprocesses and overrides the setting from the user's environment. -PWD = $${PWDCMD-pwd} # INSTALL_PROGRAM_ARGS is changed by configure.in to use -x for a # cygwin host. @@ -109,51 +82,89 @@ INSTALL_PROGRAM = $(INSTALL) $(INSTALL_PROGRAM_ARGS) INSTALL_SCRIPT = $(INSTALL) INSTALL_DATA = $(INSTALL) -m 644 -AS = @AS@ -AR = @AR@ -AR_FLAGS = rc -CC = @CC@ +# ------------------------------------------------- +# Miscellaneous non-standard autoconf-set variables +# ------------------------------------------------- -# Special variables passed down in EXTRA_GCC_FLAGS. They are defined -# here so that they can be overridden by Makefile fragments. -BUILD_CC = $(CC_FOR_BUILD) -BUILD_PREFIX = @BUILD_PREFIX@ -BUILD_PREFIX_1 = @BUILD_PREFIX_1@ +links=@configlinks@ +# The file containing GCC's version number. +gcc_version_trigger = @gcc_version_trigger@ +gcc_version = @gcc_version@ -CFLAGS = @CFLAGS@ -CXXFLAGS = @CXXFLAGS@ +# The gcc driver likes to know the arguments it was configured with. +TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@ -LDFLAGS = -LIBCFLAGS = $(CFLAGS) -CFLAGS_FOR_BUILD = $(CFLAGS) -# 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) -LDFLAGS_FOR_TARGET = -LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) -PICFLAG = -PICFLAG_FOR_TARGET = +gxx_include_dir = @gxx_include_dir@ +libstdcxx_incdir = @libstdcxx_incdir@ -CXX = @CXX@ +tooldir = @tooldir@ +build_tooldir = @build_tooldir@ -# Use -O2 to stress test the compiler. -LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates -CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates +# Directory in which the compiler finds executables, libraries, etc. +libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(gcc_version) +GDB_NLM_DEPS = -DLLTOOL = @DLLTOOL@ -WINDRES = @WINDRES@ +# This is the name of the environment variable used for the path to +# the libraries. +RPATH_ENVVAR = @RPATH_ENVVAR@ -NM = @NM@ +# This is set by configure to REALLY_SET_LIB_PATH if --enable-shared +# was used. +SET_LIB_PATH = @SET_LIB_PATH@ -LD = @LD@ +# 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 = \ + $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); -# These values are substituted by configure. -DEFAULT_YACC = @DEFAULT_YACC@ -DEFAULT_LEX = @DEFAULT_LEX@ -DEFAULT_M4 = @DEFAULT_M4@ +# 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@ + +# This is the list of directories to built for the host system. +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@ + +# 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@ + +# ---------------------------------------------- +# Programs producing files for the BUILD machine +# ---------------------------------------------- + +SHELL = @config_shell@ + +# pwd command to use. Allow user to override default by setting PWDCMD in +# the environment to account for automounters. The make variable must not +# be called PWDCMD, otherwise the value set here is passed to make +# subprocesses and overrides the setting from the user's environment. +PWD = $${PWDCMD-pwd} + +# compilers to use to create programs which must be run in the build +# environment. +CC_FOR_BUILD = @CC_FOR_BUILD@ +CFLAGS_FOR_BUILD = $(CFLAGS) + +CXX_FOR_BUILD = $(CXX) + +# Special variables passed down in EXTRA_GCC_FLAGS. They are defined +# here so that they can be overridden by Makefile fragments. +BUILD_CC = $(CC_FOR_BUILD) +BUILD_PREFIX = @BUILD_PREFIX@ +BUILD_PREFIX_1 = @BUILD_PREFIX_1@ BISON=@BISON@ USUAL_BISON = `if [ -f $$r/bison/bison ] ; then \ @@ -162,6 +173,7 @@ USUAL_BISON = `if [ -f $$r/bison/bison ] ; then \ echo bison ; \ fi` +DEFAULT_YACC = @DEFAULT_YACC@ YACC=@YACC@ USUAL_YACC = `if [ -f $$r/bison/bison ] ; then \ echo $$r/bison/bison -y -L $$s/bison/ ; \ @@ -171,11 +183,13 @@ USUAL_YACC = `if [ -f $$r/bison/bison ] ; then \ echo ${DEFAULT_YACC} ; \ fi` +DEFAULT_LEX = @DEFAULT_LEX@ LEX=@LEX@ USUAL_LEX = `if [ -f $$r/flex/flex ] ; \ then echo $$r/flex/flex ; \ else echo ${DEFAULT_LEX} ; fi` +DEFAULT_M4 = @DEFAULT_M4@ M4 = `if [ -f $$r/m4/m4 ] ; \ then echo $$r/m4/m4 ; \ else echo ${DEFAULT_M4} ; fi` @@ -202,74 +216,61 @@ RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \ then echo $$s/dejagnu/runtest ; \ else echo runtest ; fi` +# --------------------------------------------- +# Programs producing files for the HOST machine +# --------------------------------------------- -# compilers to use to create programs which must be run in the build -# environment. -CC_FOR_BUILD = @CC_FOR_BUILD@ -CXX_FOR_BUILD = $(CXX) +# 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 -SUBDIRS = @configdirs@ +AS = @AS@ -# This is set by the configure script to the list of directories which -# should be built using the target tools. -TARGET_CONFIGDIRS = @target_configdirs@ +AR = @AR@ +AR_FLAGS = rc -# Target libraries are put under this directory: -# Changed by configure to $(target_alias) if cross. -TARGET_SUBDIR = @target_subdir@ +CC = @CC@ +CFLAGS = @CFLAGS@ +LIBCFLAGS = $(CFLAGS) -BUILD_CONFIGDIRS = libiberty -BUILD_SUBDIR = @build_subdir@ +CXX = @CXX@ +CXXFLAGS = @CXXFLAGS@ +LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates -# This is set by the configure script to the arguments to use when configuring -# directories built for the build system. -BUILD_CONFIGARGS = @build_configargs@ +DLLTOOL = @DLLTOOL@ -# This is set by the configure script to the arguments to use when configuring -# directories built for the host system. -HOST_CONFIGARGS = @host_configargs@ +NM = @NM@ -# This is set by the configure script to the arguments to use when configuring -# directories built for the target. -TARGET_CONFIGARGS = @target_configargs@ +LD = @LD@ +LDFLAGS = -# This is set by configure to REALLY_SET_LIB_PATH if --enable-shared -# was used. -SET_LIB_PATH = @SET_LIB_PATH@ +RANLIB = @RANLIB@ -# This is the name of the environment variable used for the path to -# the libraries. This may be changed by configure.in. -RPATH_ENVVAR = @RPATH_ENVVAR@ +WINDRES = @WINDRES@ -# 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 +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: -# 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 = \ - $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); - -# Should be substed by configure.in FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ -CC_FOR_TARGET = @CC_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@ -GCJ_FOR_TARGET = @GCJ_FOR_TARGET@ -# 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=@GCC_FOR_TARGET@ -USUAL_GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) $$r/gcc/xgcc -B$$r/gcc/ $(FLAGS_FOR_TARGET) +AR_FOR_TARGET=@AR_FOR_TARGET@ +USUAL_AR_FOR_TARGET = ` \ + if [ -f $$r/binutils/ar ] ; then \ + echo $$r/binutils/ar ; \ + else \ + if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ + echo $(AR); \ + else \ + echo ar | sed '$(program_transform_name)' ; \ + fi; \ + fi` AS_FOR_TARGET=@AS_FOR_TARGET@ USUAL_AS_FOR_TARGET = ` \ @@ -281,23 +282,30 @@ USUAL_AS_FOR_TARGET = ` \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ echo $(AS); \ else \ - t='$(program_transform_name)'; echo as | sed -e 's/x/x/' $$t ; \ + echo as | sed '$(program_transform_name)' ; \ fi; \ fi` -LD_FOR_TARGET=@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_canonical)' = '$(target_canonical)' ] ; then \ - echo $(LD); \ - else \ - t='$(program_transform_name)'; echo ld | sed -e 's/x/x/' $$t ; \ - 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=@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@ USUAL_DLLTOOL_FOR_TARGET = ` \ @@ -307,31 +315,39 @@ USUAL_DLLTOOL_FOR_TARGET = ` \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ echo $(DLLTOOL); \ else \ - t='$(program_transform_name)'; echo dlltool | sed -e 's/x/x/' $$t ; \ + echo dlltool | sed '$(program_transform_name)' ; \ fi; \ fi` -WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@ -USUAL_WINDRES_FOR_TARGET = ` \ - if [ -f $$r/binutils/windres ] ; then \ - echo $$r/binutils/windres ; \ +GCJ_FOR_TARGET = @GCJ_FOR_TARGET@ + +LD_FOR_TARGET=@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_canonical)' = '$(target_canonical)' ] ; then \ - echo $(WINDRES); \ + echo $(LD); \ else \ - t='$(program_transform_name)'; echo windres | sed -e 's/x/x/' $$t ; \ + echo ld | sed '$(program_transform_name)' ; \ fi; \ fi` -AR_FOR_TARGET=@AR_FOR_TARGET@ -USUAL_AR_FOR_TARGET = ` \ - if [ -f $$r/binutils/ar ] ; then \ - echo $$r/binutils/ar ; \ +LDFLAGS_FOR_TARGET = + +NM_FOR_TARGET=@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_canonical)' = '$(target_canonical)' ] ; then \ - echo $(AR); \ + echo $(NM); \ else \ - t='$(program_transform_name)'; echo ar | sed -e 's/x/x/' $$t ; \ + echo nm | sed '$(program_transform_name)' ; \ fi; \ fi` @@ -347,30 +363,38 @@ USUAL_RANLIB_FOR_TARGET = ` \ echo ranlib; \ fi; \ else \ - t='$(program_transform_name)'; echo ranlib | sed -e 's/x/x/' $$t ; \ + echo ranlib | sed '$(program_transform_name)' ; \ fi; \ fi` -NM_FOR_TARGET=@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 ; \ +WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@ +USUAL_WINDRES_FOR_TARGET = ` \ + if [ -f $$r/binutils/windres ] ; then \ + echo $$r/binutils/windres ; \ else \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ - echo $(NM); \ + echo $(WINDRES); \ else \ - t='$(program_transform_name)'; echo nm | sed -e 's/x/x/' $$t ; \ + echo windres | sed '$(program_transform_name)' ; \ fi; \ fi` +PICFLAG_FOR_TARGET = + +# ------------------------------------ +# Miscellaneous targets and flag lists +# ------------------------------------ + # 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: all.normal .PHONY: all #### host and target specific makefile fragments come in here. +@target_makefile_frag@ +@alphaieee_frag@ +@ospace_frag@ +@host_makefile_frag@ ### # Flags to pass down to all sub-makes. @@ -389,6 +413,7 @@ BASE_FLAGS_TO_PASS = \ "CXXFLAGS=$(CXXFLAGS)" \ "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \ "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \ + "DESTDIR=$(DESTDIR)" \ "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \ "INSTALL=$(INSTALL)" \ "INSTALL_DATA=$(INSTALL_DATA)" \ @@ -458,7 +483,7 @@ EXTRA_HOST_FLAGS = \ 'DLLTOOL=$(DLLTOOL)' \ 'LD=$(LD)' \ 'NM=$(NM)' \ - "`echo 'RANLIB=$(RANLIB)' | sed -e s/.*=$$/XFOO=/`" \ + 'RANLIB=$(RANLIB)' \ 'WINDRES=$(WINDRES)' FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) @@ -512,7 +537,7 @@ EXTRA_GCC_FLAGS = \ 'BUILD_PREFIX=$(BUILD_PREFIX)' \ 'BUILD_PREFIX_1=$(BUILD_PREFIX_1)' \ 'NM=$(NM)' \ - "`echo 'RANLIB=$(RANLIB)' | sed -e s/.*=$$/XFOO=/`" \ + 'RANLIB=$(RANLIB)' \ 'WINDRES=$$(WINDRES_FOR_TARGET)' \ "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ @@ -588,13 +613,13 @@ do-[+target+]: done; \ ;; \ esac ; \ - if (cd ./$$i; \ + (cd ./$$i && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \ + "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - [+target+]); \ - then true; else exit 1; fi; \ + [+target+]) \ + || exit 1; \ else true; fi; \ done # Break into two pieces @@ -606,13 +631,13 @@ do-[+target+]: for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - if (cd $(TARGET_SUBDIR)/$$i; \ + (cd $(TARGET_SUBDIR)/$$i && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "`echo \"RANLIB=$${RANLIB}\" | sed -e 's/.*=$$/XFOO=/'`" \ + "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - [+target+]); \ - then true; else exit 1; fi; \ + [+target+]) \ + || exit 1; \ else true; fi; \ done [+ ENDFOR recursive_targets +] @@ -627,13 +652,14 @@ info: do-info installcheck: do-installcheck dvi: do-dvi -# Make sure makeinfo is built before we do a `make info'. -do-info: all-texinfo +# Make sure makeinfo is built before we do a `make info', if we're +# in fact building texinfo. +do-info: maybe-all-texinfo install-info: do-install-info dir.info s=`cd $(srcdir); ${PWD}`; export s; \ if [ -f dir.info ] ; then \ - $(INSTALL_DATA) dir.info $(infodir)/dir.info ; \ + $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \ else true ; fi local-clean: @@ -641,6 +667,7 @@ local-clean: local-distclean: -rm -f Makefile config.status config.cache mh-frag mt-frag + -rm -f multilib.out multilib.tmp maybedep.tmp serdep.tmp -if [ "$(TARGET_SUBDIR)" != "." ]; then \ rm -rf $(TARGET_SUBDIR); \ else true; fi @@ -669,7 +696,7 @@ $(CLEAN_MODULES) $(CLEAN_X11_MODULES) clean-gcc: r=`${PWD}`; export r; \ s=`cd $(srcdir); ${PWD}`; export s; \ $(SET_LIB_PATH) \ - (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) clean); \ + (cd $${dir} && $(MAKE) $(FLAGS_TO_PASS) clean); \ else \ true; \ fi @@ -682,7 +709,7 @@ $(CLEAN_TARGET_MODULES): r=`${PWD}`; export r; \ s=`cd $(srcdir); ${PWD}`; export s; \ $(SET_LIB_PATH) \ - (cd $(TARGET_SUBDIR)/$${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) clean); \ + (cd $(TARGET_SUBDIR)/$${dir} && $(MAKE) $(TARGET_FLAGS_TO_PASS) clean); \ else \ true; \ fi @@ -740,7 +767,7 @@ install.all: install-no-fixedincludes @if [ -f ./gcc/Makefile ] ; then \ r=`${PWD}` ; export r ; \ $(SET_LIB_PATH) \ - (cd ./gcc; \ + (cd ./gcc && \ $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \ else \ true ; \ @@ -763,7 +790,7 @@ installdirs: mkinstalldirs dir.info: do-install-info if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \ - $(srcdir)/texinfo/gen-info-dir $(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \ + $(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \ mv -f dir.info.new dir.info ; \ else true ; \ fi @@ -782,78 +809,78 @@ etags tags: TAGS # built are. TAGS: do-TAGS - # -------------------------------------- # Modules which run on the build machine # -------------------------------------- [+ FOR build_modules +] .PHONY: configure-build-[+module+] maybe-configure-build-[+module+] maybe-configure-build-[+module+]: -configure-build-[+module+]: $(BUILD_SUBDIR)/[+module+]/Makefile -$(BUILD_SUBDIR)/[+module+]/Makefile: config.status - @[ -d $(BUILD_SUBDIR)/[+module+] ] || mkdir $(BUILD_SUBDIR)/[+module+];\ - r=`${PWD}`; export r; \ - s=`cd $(srcdir); ${PWD}`; export s; \ - AR="$(AR_FOR_BUILD)"; export AR; \ - AS="$(AS_FOR_BUILD)"; export AS; \ - CC="$(CC_FOR_BUILD)"; export CC; \ - CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \ - CXX="$(CXX_FOR_BUILD)"; export CXX; \ - CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \ - GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \ - DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \ - LD="$(LD_FOR_BUILD)"; export LD; \ - LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \ - NM="$(NM_FOR_BUILD)"; export NM; \ - RANLIB="$(RANLIB_FOR_BUILD)"; export RANLIB; \ - WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \ - echo Configuring in $(BUILD_SUBDIR)/[+module+]; \ - cd "$(BUILD_SUBDIR)/[+module+]" || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(BUILD_SUBDIR)" in \ +configure-build-[+module+]: + @test ! -f $(BUILD_SUBDIR)/[+module+]/Makefile || exit 0; \ + [ -d $(BUILD_SUBDIR)/[+module+] ] || \ + mkdir $(BUILD_SUBDIR)/[+module+];\ + r=`${PWD}`; export r; \ + s=`cd $(srcdir); ${PWD}`; export s; \ + AR="$(AR_FOR_BUILD)"; export AR; \ + AS="$(AS_FOR_BUILD)"; export AS; \ + CC="$(CC_FOR_BUILD)"; export CC; \ + CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \ + CXX="$(CXX_FOR_BUILD)"; export CXX; \ + CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \ + GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \ + DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \ + LD="$(LD_FOR_BUILD)"; export LD; \ + LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \ + NM="$(NM_FOR_BUILD)"; export NM; \ + RANLIB="$(RANLIB_FOR_BUILD)"; export RANLIB; \ + WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \ + echo Configuring in $(BUILD_SUBDIR)/[+module+]; \ + cd "$(BUILD_SUBDIR)/[+module+]" || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(BUILD_SUBDIR)" in \ .) topdir="../$(srcdir)" ;; \ *) topdir="../../$(srcdir)" ;; \ - esac ;; \ - esac; \ - if [ "$(srcdir)" = "." ] ; then \ - if [ "$(BUILD_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - else \ - exit 1; \ - fi; \ + esac ;; \ + esac; \ + if [ "$(srcdir)" = "." ] ; then \ + if [ "$(BUILD_SUBDIR)" != "." ] ; then \ + if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ + true; \ + else \ + exit 1; \ + fi; \ else \ - true; \ + true; \ fi; \ - srcdiroption="--srcdir=."; \ - libsrcdir="."; \ else \ - srcdiroption="--srcdir=$${topdir}/[+module+]"; \ - libsrcdir="$$s/[+module+]"; \ + exit 1; \ fi; \ - rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(BUILD_CONFIGARGS) $${srcdiroption} \ - --with-build-subdir="$(BUILD_SUBDIR)" \ - || exit 1 + else \ + true; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ + srcdiroption="--srcdir=$${topdir}/[+module+]"; \ + libsrcdir="$$s/[+module+]"; \ + fi; \ + rm -f no-such-file || : ; \ + CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + $(BUILD_CONFIGARGS) $${srcdiroption} \ + --with-build-subdir="$(BUILD_SUBDIR)" \ + || exit 1 .PHONY: all-build-[+module+] maybe-all-build-[+module+] maybe-all-build-[+module+]: all-build-[+module+]: configure-build-[+module+] @r=`${PWD}`; export r; \ - s=`cd $(srcdir); ${PWD}`; export s; \ - (cd $(BUILD_SUBDIR)/[+module+] && $(MAKE) all) + s=`cd $(srcdir); ${PWD}`; export s; \ + (cd $(BUILD_SUBDIR)/[+module+] && $(MAKE) all) [+ ENDFOR build_modules +] # -------------------------------------- @@ -862,10 +889,9 @@ all-build-[+module+]: configure-build-[+module+] [+ FOR host_modules +] .PHONY: configure-[+module+] maybe-configure-[+module+] maybe-configure-[+module+]: -configure-[+module+]: [+module+]/Makefile - -[+module+]/Makefile: config.status - @[ -d [+module+] ] || mkdir [+module+]; \ +configure-[+module+]: + @test ! -f [+module+]/Makefile || exit 0; \ + [ -d [+module+] ] || mkdir [+module+]; \ r=`${PWD}`; export r; \ s=`cd $(srcdir); ${PWD}`; export s; \ CC="$(CC)"; export CC; \ @@ -905,12 +931,12 @@ configure-[+module+]: [+module+]/Makefile maybe-all-[+module+]: all-[+module+]: configure-[+module+] @r=`${PWD}`; export r; \ - s=`cd $(srcdir); ${PWD}`; export s; \ - $(SET_LIB_PATH) \ - (cd [+module+]; $(MAKE) $(FLAGS_TO_PASS)[+ - IF with_x - +] $(X11_FLAGS_TO_PASS)[+ - ENDIF with_x +] all) + s=`cd $(srcdir); ${PWD}`; export s; \ + $(SET_LIB_PATH) \ + (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ + IF with_x + +] $(X11_FLAGS_TO_PASS)[+ + ENDIF with_x +] all) [+ IF no_check +] .PHONY: check-[+module+] @@ -920,24 +946,24 @@ check-[+module+]: # This module is only tested in a native toolchain. check-[+module+]: @if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ - r=`${PWD}`; export r; \ - s=`cd $(srcdir); ${PWD}`; export s; \ - $(SET_LIB_PATH) \ - (cd [+module+]; $(MAKE) $(FLAGS_TO_PASS)[+ - IF with_x - +] $(X11_FLAGS_TO_PASS)[+ - ENDIF with_x +] check); \ + r=`${PWD}`; export r; \ + s=`cd $(srcdir); ${PWD}`; export s; \ + $(SET_LIB_PATH) \ + (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ + IF with_x + +] $(X11_FLAGS_TO_PASS)[+ + ENDIF with_x +] check); \ fi [+ ELSE check +] .PHONY: check-[+module+] check-[+module+]: @r=`${PWD}`; export r; \ - s=`cd $(srcdir); ${PWD}`; export s; \ - $(SET_LIB_PATH) \ - (cd [+module+]; $(MAKE) $(FLAGS_TO_PASS)[+ - IF with_x - +] $(X11_FLAGS_TO_PASS)[+ - ENDIF with_x +] check) + s=`cd $(srcdir); ${PWD}`; export s; \ + $(SET_LIB_PATH) \ + (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ + IF with_x + +] $(X11_FLAGS_TO_PASS)[+ + ENDIF with_x +] check) [+ ENDIF no_check +] [+ IF no_install +] @@ -949,12 +975,12 @@ install-[+module+]: maybe-install-[+module+]: install-[+module+]: installdirs @r=`${PWD}`; export r; \ - s=`cd $(srcdir); ${PWD}`; export s; \ - $(SET_LIB_PATH) \ - (cd [+module+]; $(MAKE) $(FLAGS_TO_PASS)[+ - IF with_x - +] $(X11_FLAGS_TO_PASS)[+ - ENDIF with_x +] install) + s=`cd $(srcdir); ${PWD}`; export s; \ + $(SET_LIB_PATH) \ + (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ + IF with_x + +] $(X11_FLAGS_TO_PASS)[+ + ENDIF with_x +] install) [+ ENDIF no_install +] [+ ENDFOR host_modules +] @@ -964,92 +990,93 @@ install-[+module+]: installdirs [+ FOR target_modules +] .PHONY: configure-target-[+module+] maybe-configure-target-[+module+] maybe-configure-target-[+module+]: -configure-target-[+module+]: $(TARGET_SUBDIR)/[+module+]/Makefile -# Don't manually override CC_FOR_TARGET at make time; get it set right -# at configure time. Otherwise multilibs may be wrong. -$(TARGET_SUBDIR)/[+module+]/multilib.out: maybe-all-gcc - @[ -d $(TARGET_SUBDIR)/[+module+] ] || mkdir $(TARGET_SUBDIR)/[+module+];\ +# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +$(TARGET_SUBDIR)/[+module+]/multilib.out: multilib.out + @[ -d $(TARGET_SUBDIR)/[+module+] ] || \ + mkdir $(TARGET_SUBDIR)/[+module+]; \ + rm -f $(TARGET_SUBDIR)/[+module+]/Makefile || : ; \ + cp multilib.out $(TARGET_SUBDIR)/[+module+]/multilib.out + +configure-target-[+module+]: $(TARGET_SUBDIR)/[+module+]/multilib.out + @test ! -f $(TARGET_SUBDIR)/[+module+]/Makefile || exit 0; \ + [ -d $(TARGET_SUBDIR)/[+module+] ] || \ + mkdir $(TARGET_SUBDIR)/[+module+];\ r=`${PWD}`; export r; \ - echo "Configuring multilibs for [+module+]"; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/[+module+]/multilib.out 2> /dev/null - -$(TARGET_SUBDIR)/[+module+]/Makefile: config.status $(TARGET_SUBDIR)/[+module+]/multilib.out - @[ -d $(TARGET_SUBDIR)/[+module+] ] || mkdir $(TARGET_SUBDIR)/[+module+];\ - r=`${PWD}`; export r; \ - s=`cd $(srcdir); ${PWD}`; export s; \ - $(SET_LIB_PATH) \ - AR="$(AR_FOR_TARGET)"; export AR; \ - AS="$(AS_FOR_TARGET)"; export AS; \ - CC="$(CC_FOR_TARGET)"; export CC; \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \[+ - IF raw_cxx +] - CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ - CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; \[+ - ELSE normal_cxx +] - CXX="$(CXX_FOR_TARGET)"; export CXX; \[+ - ENDIF raw_cxx +] - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ - GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \ - DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ - LD="$(LD_FOR_TARGET)"; export LD; \ - LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ - NM="$(NM_FOR_TARGET)"; export NM; \ - RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \ - WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ - echo Configuring in $(TARGET_SUBDIR)/[+module+]; \ - cd "$(TARGET_SUBDIR)/[+module+]" || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ + s=`cd $(srcdir); ${PWD}`; export s; \ + $(SET_LIB_PATH) \ + AR="$(AR_FOR_TARGET)"; export AR; \ + AS="$(AS_FOR_TARGET)"; export AS; \ + CC="$(CC_FOR_TARGET)"; export CC; \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \[+ +IF raw_cxx +] + CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ + CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; \[+ +ELSE normal_cxx +] + CXX="$(CXX_FOR_TARGET)"; export CXX; \[+ +ENDIF raw_cxx +] + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \ + DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ + LD="$(LD_FOR_TARGET)"; export LD; \ + LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ + NM="$(NM_FOR_TARGET)"; export NM; \ + RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \ + WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ + echo Configuring in $(TARGET_SUBDIR)/[+module+]; \ + cd "$(TARGET_SUBDIR)/[+module+]" || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(TARGET_SUBDIR)" in \ .) topdir="../$(srcdir)" ;; \ *) topdir="../../$(srcdir)" ;; \ - esac ;; \ - esac; \ - if [ "$(srcdir)" = "." ] ; then \ - if [ "$(TARGET_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - else \ - exit 1; \ - fi; \ + esac ;; \ + esac; \ + if [ "$(srcdir)" = "." ] ; then \ + if [ "$(TARGET_SUBDIR)" != "." ] ; then \ + if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \ + if [ -f Makefile ]; then \ + if $(MAKE) distclean; then \ + true; \ + else \ + exit 1; \ + fi; \ else \ - true; \ + true; \ fi; \ - srcdiroption="--srcdir=."; \ - libsrcdir="."; \ else \ - srcdiroption="--srcdir=$${topdir}/[+module+]"; \ - libsrcdir="$$s/[+module+]"; \ + exit 1; \ fi; \ - rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - --with-target-subdir="$(TARGET_SUBDIR)" \ - || exit 1 + else \ + true; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ + srcdiroption="--srcdir=$${topdir}/[+module+]"; \ + libsrcdir="$$s/[+module+]"; \ + fi; \ + rm -f no-such-file || : ; \ + CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)" \ + || exit 1 .PHONY: all-target-[+module+] maybe-all-target-[+module+] maybe-all-target-[+module+]: all-target-[+module+]: configure-target-[+module+] @r=`${PWD}`; export r; \ - s=`cd $(srcdir); ${PWD}`; export s; \ - $(SET_LIB_PATH) \ - (cd $(TARGET_SUBDIR)/[+module+]; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) [+ - IF raw_cxx - +] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+ - ENDIF raw_cxx - +] all) + s=`cd $(srcdir); ${PWD}`; export s; \ + $(SET_LIB_PATH) \ + (cd $(TARGET_SUBDIR)/[+module+] && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) [+ + IF raw_cxx + +] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+ + ENDIF raw_cxx + +] all) [+ IF no_check +] # Dummy target for uncheckable module. .PHONY: check-target-[+module+] @@ -1058,14 +1085,14 @@ check-target-[+module+]: .PHONY: check-target-[+module+] check-target-[+module+]: @r=`${PWD}`; export r; \ - s=`cd $(srcdir); ${PWD}`; export s; \ - $(SET_LIB_PATH) \ - (cd $(TARGET_SUBDIR)/[+module+]; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) [+ - IF raw_cxx - +] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+ - ENDIF raw_cxx - +] check) + s=`cd $(srcdir); ${PWD}`; export s; \ + $(SET_LIB_PATH) \ + (cd $(TARGET_SUBDIR)/[+module+] && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) [+ + IF raw_cxx + +] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+ + ENDIF raw_cxx + +] check) [+ ENDIF no_check +] [+ IF no_install +] .PHONY: install-target-[+module+] maybe-install-target-[+module+] @@ -1077,10 +1104,10 @@ install-target-[+module+]: maybe-install-target-[+module+]: install-target-[+module+]: installdirs @r=`${PWD}`; export r; \ - s=`cd $(srcdir); ${PWD}`; export s; \ - $(SET_LIB_PATH) \ - (cd $(TARGET_SUBDIR)/[+module+]; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) install) + s=`cd $(srcdir); ${PWD}`; export s; \ + $(SET_LIB_PATH) \ + (cd $(TARGET_SUBDIR)/[+module+] && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) install) [+ ENDIF no_install +] [+ ENDFOR target_modules +] @@ -1095,16 +1122,16 @@ install-target-[+module+]: installdirs # gcc is the only module which uses GCC_FLAGS_TO_PASS. .PHONY: configure-gcc maybe-configure-gcc maybe-configure-gcc: -configure-gcc: gcc/Makefile - -gcc/Makefile: config.status - @[ -d gcc ] || mkdir gcc; \ +configure-gcc: + @test ! -f gcc/Makefile || exit 0; \ + [ -d gcc ] || mkdir gcc; \ r=`${PWD}`; export r; \ s=`cd $(srcdir); ${PWD}`; export s; \ CC="$(CC)"; export CC; \ CFLAGS="$(CFLAGS)"; export CFLAGS; \ CXX="$(CXX)"; export CXX; \ CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \ + TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \ if [ z$(build_canonical) != z$(host_canoncial) ] ; then \ AR="$(AR)"; export AR; \ AS="$(AS)"; export AS; \ @@ -1134,19 +1161,22 @@ gcc/Makefile: config.status $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 -# Don't remake gcc if it's already been made by 'bootstrap'; that causes -# nothing but trouble. This wart will be fixed eventually by moving +# Don't 'make all' in gcc if it's already been made by 'bootstrap'; that +# causes trouble. This wart will be fixed eventually by moving # the bootstrap behavior to this file. .PHONY: all-gcc maybe-all-gcc maybe-all-gcc: all-gcc: configure-gcc - @if [ -f gcc/xgcc ] ; then \ - exit 0 ; \ + @if [ -f gcc/stage_last ] ; then \ + r=`${PWD}`; export r; \ + s=`cd $(srcdir); ${PWD}`; export s; \ + $(SET_LIB_PATH) \ + (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \ else \ r=`${PWD}`; export r; \ s=`cd $(srcdir); ${PWD}`; export s; \ $(SET_LIB_PATH) \ - (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) all); \ + (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) all); \ fi # Building GCC uses some tools for rebuilding "source" files @@ -1170,14 +1200,17 @@ bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean b s=`cd $(srcdir); ${PWD}`; export s; \ case "$@" in \ *bootstrap4-lean ) \ - msg="Comparing stage3 and stage4 of the compiler"; \ - compare=compare3-lean ;; \ - *bootstrap4 ) msg="Comparing stage3 and stage4 of the compiler"; \ - compare=compare3 ;; \ - *-lean ) msg="Comparing stage2 and stage3 of the compiler"; \ - compare=compare-lean ;; \ - * ) msg="Comparing stage2 and stage3 of the compiler"; \ - compare=compare ;; \ + msg="Comparing stage3 and stage4 of the compiler"; \ + compare=compare3-lean ;; \ + *bootstrap4 ) \ + msg="Comparing stage3 and stage4 of the compiler"; \ + compare=compare3 ;; \ + *-lean ) \ + msg="Comparing stage2 and stage3 of the compiler"; \ + compare=compare-lean ;; \ + * ) \ + msg="Comparing stage2 and stage3 of the compiler"; \ + compare=compare ;; \ esac; \ $(SET_LIB_PATH) \ echo "$$msg"; \ @@ -1208,22 +1241,25 @@ check-gcc: r=`${PWD}`; export r; \ s=`cd $(srcdir); ${PWD}`; export s; \ $(SET_LIB_PATH) \ - (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) check); \ + (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check); \ else \ true; \ fi -.PHONY: check-c++ -check-c++: +.PHONY: check-gcc-c++ +check-gcc-c++: @if [ -f ./gcc/Makefile ] ; then \ r=`${PWD}`; export r; \ s=`cd $(srcdir); ${PWD}`; export s; \ $(SET_LIB_PATH) \ - (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \ - $(MAKE) check-target-libstdc++-v3; \ + (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \ else \ true; \ - fi + fi + +.PHONY: check-c++ +check-c++: + $(MAKE) check-target-libstdc++-v3 check-gcc-c++ NOTPARALLEL=parallel-ok .PHONY: install-gcc maybe-install-gcc maybe-install-gcc: @@ -1232,7 +1268,7 @@ install-gcc: r=`${PWD}`; export r; \ s=`cd $(srcdir); ${PWD}`; export s; \ $(SET_LIB_PATH) \ - (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) install); \ + (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) install); \ else \ true; \ fi @@ -1252,7 +1288,7 @@ gcc-no-fixedincludes: r=`${PWD}`; export r; \ s=`cd $(srcdir); ${PWD}` ; export s; \ $(SET_LIB_PATH) \ - (cd ./gcc; \ + (cd ./gcc && \ $(MAKE) $(GCC_FLAGS_TO_PASS) install); \ rm -rf gcc/include; \ mv gcc/tmp-include gcc/include 2>/dev/null; \ @@ -1284,7 +1320,7 @@ configure-gdb: maybe-configure-tcl maybe-configure-tk maybe-configure-sim GDB_TK = @GDB_TK@ all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-readline maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK) install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-tix maybe-install-libgui -libgui/Makefile: maybe-configure-tcl maybe-configure-tk +configure-libgui: maybe-configure-tcl maybe-configure-tk all-libgui: maybe-all-tcl maybe-all-tk maybe-all-itcl # Host modules specific to binutils. @@ -1309,7 +1345,7 @@ all-itcl: maybe-all-tcl maybe-all-tk # We put install-tcl before install-itcl because itcl wants to run a # program on installation which uses the Tcl libraries. install-itcl: maybe-install-tcl -all-sid: maybe-all-tcl maybe-all-tk +all-sid: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-tcl maybe-all-tk install-sid: maybe-install-tcl maybe-install-tk all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-readline maybe-configure-gdb configure-tk: maybe-configure-tcl @@ -1326,7 +1362,6 @@ all-diff: maybe-all-libiberty all-fastjar: maybe-all-zlib maybe-all-libiberty all-fileutils: maybe-all-libiberty all-flex: maybe-all-libiberty maybe-all-bison maybe-all-byacc -all-grep: maybe-all-libiberty all-gzip: maybe-all-libiberty all-hello: maybe-all-libiberty all-m4: maybe-all-libiberty maybe-all-texinfo @@ -1336,7 +1371,6 @@ all-prms: maybe-all-libiberty all-recode: maybe-all-libiberty all-sed: maybe-all-libiberty all-send-pr: maybe-all-prms -all-snavigator: maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-db maybe-all-grep maybe-all-libgui all-tar: maybe-all-libiberty all-uudecode: maybe-all-libiberty @@ -1388,20 +1422,45 @@ configure-target-qthreads: $(ALL_GCC_C) # 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}`; 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. -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def - cd $(srcdir) && autogen Makefile.def +AUTOGEN = autogen +$(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def + cd $(srcdir) && $(AUTOGEN) Makefile.def -# with the gnu make, this is done automatically. +# Rebuilding Makefile. +Makefile: $(srcdir)/Makefile.in config.status + CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -host_makefile_frag=@host_makefile_frag@ -target_makefile_frag=@target_makefile_frag@ +config.status: configure $(gcc_version_trigger) + $(SHELL) ./config.status --recheck -Makefile: Makefile.in configure.in $(host_makefile_frag) $(target_makefile_frag) $(gcc_version_trigger) - $(SHELL) ./config.status +# Rebuilding configure. +AUTOCONF = autoconf +$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4 + cd $(srcdir) && $(AUTOCONF) -# +# ------------------------------ +# Special directives to GNU Make +# ------------------------------ + +# Tell GNU make 3.79 not to run the top level in parallel. This +# prevents contention for $builddir/$target/config.cache, as well +# as minimizing scatter in file system caches. +NOTPARALLEL = .NOTPARALLEL +$(NOTPARALLEL): +# Don't pass command-line variables to submakes. .NOEXPORT: MAKEOVERRIDES=