X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=Makefile.in;h=daa7fbe1bb1c2f19d0cae04c63e183838efae2c9;hb=caa740beb84d3e73cf48991baa02b0fd0c04811b;hp=aaff5d56bf6f1a94509b206496e17b09446b6278;hpb=4be4b991a6e885a05bd0fd82c69aa22d524115d7;p=deliverable%2Fbinutils-gdb.git diff --git a/Makefile.in b/Makefile.in index aaff5d56bf..daa7fbe1bb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,7 +14,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., 675 Mass Ave, Cambridge, MA 02139, USA. */ +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # srcdir = . @@ -42,6 +42,7 @@ man9dir = $(mandir)/man9 infodir = $(prefix)/info includedir = $(prefix)/include docdir = $(datadir)/doc +GDB_NLM_DEPS = SHELL = /bin/sh @@ -66,6 +67,11 @@ HOST_PREFIX_1 = loser- # We don't specify -g -O because many compilers don't support -g -O, # and/or -O is broken in and of itself. CFLAGS = -g +LIBCFLAGS = $(CFLAGS) +CFLAGS_FOR_TARGET = $(CFLAGS) +LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) +PICFLAG = +PICFLAG_FOR_TARGET = # start-sanitize-chill CHILLFLAGS = $(CFLAGS) @@ -74,7 +80,10 @@ CHILL_LIB = -lchill CXX = gcc # Use -O2 to stress test the compiler. -CXXFLAGS = -g -O2 -fno-implicit-templates +CXXFLAGS = -g -O2 +LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates +CXXFLAGS_FOR_TARGET = $(CXXFLAGS) +LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates RANLIB = ranlib NM = nm @@ -113,9 +122,6 @@ RUNTEST = `if [ -f $${srcroot}/dejagnu/runtest ] ; \ else echo runtest ; fi` -# libraries that may need to be augmented on a system-by-system basis -X11_LIB = -lX11 - # compilers to use to create programs which must be run in the build # environment. CC_FOR_BUILD = $(CC) @@ -124,6 +130,16 @@ CXX_FOR_BUILD = $(CXX) SUBDIRS = "this is set via configure, don't edit this" OTHERS = +# This is set by the configure script to the list of directories which +# should be built using the target tools. +TARGET_CONFIGDIRS = libiberty libgloss newlib libio librx libstdc++ libg++ winsup + +# Target libraries are put under this directory: +TARGET_SUBDIR = . # Changed by configure to $(target_alias) if cross. + +# This is set by the configure script to the arguments passed to configure. +CONFIG_ARGUMENTS = + ALL = all.normal INSTALL_TARGET = install-dirs \ $(INSTALL_MODULES) \ @@ -135,8 +151,8 @@ INSTALL_TARGET = install-dirs \ CC_FOR_TARGET = ` \ if [ -f $$r/gcc/Makefile ] ; then \ - if [ -f $$r/newlib/Makefile ] ; then \ - echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/newlib/targ-include -idirafter $${srcroot}/newlib/libc/include -nostdinc; \ + if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \ + echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $${srcroot}/newlib/libc/include -nostdinc; \ else \ echo $$r/gcc/xgcc -B$$r/gcc/; \ fi; \ @@ -144,19 +160,19 @@ CC_FOR_TARGET = ` \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ echo $(CC); \ else \ - t='$(program_transform_name)'; echo gcc | sed -e 's/brokensed/brokensed/' $$t; \ + t='$(program_transform_name)'; echo gcc | sed -e 's/x/x/' $$t; \ fi; \ fi` # start-sanitize-chill CHILL_FOR_TARGET = ` \ if [ -f $$r/gcc/Makefile ] ; then \ - echo $$r/gcc/xgcc -B$$r/gcc/ -L$$r/chillrt/; \ + echo $$r/gcc/xgcc -B$$r/gcc/ -L$$r/gcc/ch/runtime/; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ echo $(CC); \ else \ - t='$(program_transform_name)'; echo gcc | sed -e 's/brokensed/brokensed/' $$t; \ + t='$(program_transform_name)'; echo gcc | sed -e 's/x/x/' $$t; \ fi; \ fi` @@ -164,8 +180,8 @@ CHILL_FOR_TARGET = ` \ CXX_FOR_TARGET = ` \ if [ -f $$r/gcc/Makefile ] ; then \ - if [ -f $$r/newlib/Makefile ] ; then \ - echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/newlib/targ-include -idirafter $${srcroot}/newlib/libc/include -nostdinc; \ + if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \ + echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $${srcroot}/newlib/libc/include -nostdinc; \ else \ echo $$r/gcc/xgcc -B$$r/gcc/; \ fi; \ @@ -173,18 +189,40 @@ CXX_FOR_TARGET = ` \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ echo $(CXX); \ else \ - t='$(program_transform_name)'; echo gcc | sed -e 's/brokensed/brokensed/' $$t; \ + t='$(program_transform_name)'; echo gcc | sed -e 's/x/x/' $$t; \ fi; \ fi` AS_FOR_TARGET = ` \ - if [ -f $$r/gas/Makefile ] ; then \ + if [ -f $$r/gas/as.new ] ; then \ echo $$r/gas/as.new ; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ echo $(AS); \ else \ - t='$(program_transform_name)'; echo as | sed -e 's/brokensed/brokensed/' $$t ; \ + t='$(program_transform_name)'; echo as | sed -e 's/x/x/' $$t ; \ + fi; \ + fi` + +LD_FOR_TARGET = ` \ + if [ -f $$r/ld/ld.new ] ; then \ + echo $$r/ld/ld.new ; \ + else \ + if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ + echo $(LD); \ + else \ + t='$(program_transform_name)'; echo ld | sed -e 's/x/x/' $$t ; \ + fi; \ + fi` + +DLLTOOL_FOR_TARGET = ` \ + if [ -f $$r/binutils/dlltool ] ; then \ + echo $$r/binutils/dlltool ; \ + else \ + if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ + echo $(DLLTOOL); \ + else \ + t='$(program_transform_name)'; echo dlltool | sed -e 's/x/x/' $$t ; \ fi; \ fi` @@ -195,7 +233,7 @@ AR_FOR_TARGET = ` \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ echo $(AR); \ else \ - t='$(program_transform_name)'; echo ar | sed -e 's/brokensed/brokensed/' $$t ; \ + t='$(program_transform_name)'; echo ar | sed -e 's/x/x/' $$t ; \ fi; \ fi` @@ -206,22 +244,21 @@ RANLIB_FOR_TARGET = ` \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ echo $(RANLIB); \ else \ - t='$(program_transform_name)'; echo ranlib | sed -e 's/brokensed/brokensed/' $$t ; \ + t='$(program_transform_name)'; echo ranlib | sed -e 's/x/x/' $$t ; \ fi; \ fi` NM_FOR_TARGET = ` \ - if [ -f $$r/binutils/Makefile ] ; then \ + if [ -f $$r/binutils/nm.new ] ; then \ echo $$r/binutils/nm.new ; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ echo $(NM); \ else \ - t='$(program_transform_name)'; echo nm | sed -e 's/brokensed/brokensed/' $$t ; \ + t='$(program_transform_name)'; echo nm | sed -e 's/x/x/' $$t ; \ fi; \ fi` - #### host and target specific makefile fragments come in here. ### @@ -235,6 +272,7 @@ BASE_FLAGS_TO_PASS = \ "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ "CC_FOR_TARGET=$(CC_FOR_TARGET)" \ "CFLAGS=$(CFLAGS)" \ + "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ $(start-sanitize-chill)\ "CHILLFLAGS=$(CHILLFLAGS)" \ "CHILL_FOR_TARGET=$(CHILL_FOR_TARGET)" \ @@ -242,7 +280,9 @@ BASE_FLAGS_TO_PASS = \ $(end-sanitize-chill)\ "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \ "CXXFLAGS=$(CXXFLAGS)" \ + "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \ "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \ + "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \ "GCC_FOR_TARGET=$(CC_FOR_TARGET)" \ "INSTALL=$(INSTALL)" \ "INSTALL_DATA=$(INSTALL_DATA)" \ @@ -250,9 +290,16 @@ BASE_FLAGS_TO_PASS = \ "INSTALL_XFORM=$(INSTALL_XFORM)" \ "LDFLAGS=$(LDFLAGS)" \ "LEX=$(LEX)" \ + "LD_FOR_TARGET=$(LD_FOR_TARGET)" \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ + "LIBCXXFLAGS=$(LIBCXXFLAGS)" \ + "LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \ "M4=$(M4)" \ "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ "NM_FOR_TARGET=$(NM_FOR_TARGET)" \ + "PICFLAG=$(PICFLAG)" \ + "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ "RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \ "SHELL=$(SHELL)" \ "EXPECT=$(EXPECT)" \ @@ -278,10 +325,15 @@ FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) # Flags that are concerned with the location of the X11 include files # and library files +# +# NOTE: until the top-level is getting the values via autoconf, it only +# causes problems to have this top-level Makefile overriding the autoconf-set +# values in child directories. Only variables that don't conflict with +# autoconf'ed ones should be passed by X11_FLAGS_TO_PASS for now. +# X11_FLAGS_TO_PASS = \ - "X11_INCLUDE_FLAGS=$(X11_INCLUDE_FLAGS)" \ - "X11_LIB_FLAGS=$(X11_LIB_FLAGS)" \ - "X11_LIB=$(X11_LIB)" + 'X11_EXTRA_CFLAGS=$(X11_EXTRA_CFLAGS)' \ + '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; the variables @@ -291,8 +343,15 @@ EXTRA_TARGET_FLAGS = \ 'AR=$$(AR_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=$$(LD_FOR_TARGET)' \ + 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \ + 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \ 'NM=$$(NM_FOR_TARGET)' \ + 'PICFLAG=$$(PICFLAG_FOR_TARGET)' \ 'RANLIB=$$(RANLIB_FOR_TARGET)' TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) @@ -333,9 +392,9 @@ ALL_MODULES = \ all-flex \ all-gas \ all-gawk \ - all-gdb \ all-gprof \ all-grep \ + all-grez \ all-gzip \ all-hello \ all-indent \ @@ -346,7 +405,6 @@ ALL_MODULES = \ all-make \ all-mmalloc \ all-opcodes \ - all-pagas \ all-patch \ all-prms \ all-rcs \ @@ -390,7 +448,6 @@ CROSS_CHECK_MODULES = \ check-find \ check-gas \ check-gawk \ - check-gdb \ check-gprof \ check-grep \ check-gzip \ @@ -403,7 +460,6 @@ CROSS_CHECK_MODULES = \ check-make \ check-mmcheckoc \ check-opcodes \ - check-pagas \ check-patch \ check-prms \ check-rcs \ @@ -441,10 +497,9 @@ INSTALL_MODULES = \ install-flex \ install-gas \ install-gawk \ - install-gdb \ - install-glob \ install-gprof \ install-grep \ + install-grez \ install-gzip \ install-hello \ install-indent \ @@ -455,7 +510,6 @@ INSTALL_MODULES = \ install-make \ install-mmalloc \ install-opcodes \ - install-pagas \ install-patch \ install-prms \ install-rcs \ @@ -479,6 +533,7 @@ INSTALL_MODULES = \ ALL_X11_MODULES = \ all-emacs \ all-emacs19 \ + all-gdb \ all-expect \ all-gash \ all-tclX \ @@ -488,6 +543,7 @@ ALL_X11_MODULES = \ # compiled using $(X11_FLAGS_TO_PASS). CHECK_X11_MODULES = \ check-emacs \ + check-gdb \ check-expect \ check-gash \ check-tclX \ @@ -498,6 +554,7 @@ CHECK_X11_MODULES = \ INSTALL_X11_MODULES = \ install-emacs \ install-emacs19 \ + install-gdb \ install-expect \ install-gash \ install-tclX \ @@ -506,46 +563,47 @@ INSTALL_X11_MODULES = \ # This is a list of the targets for all of the modules which are compiled # using $(TARGET_FLAGS_TO_PASS). ALL_TARGET_MODULES = \ - $(start-sanitize-chill) \ - all-chillrt \ - $(end-sanitize-chill) \ - all-libio \ - all-libstdc++ \ - all-librx \ - all-libg++ \ - all-newlib \ - all-xiberty + all-target-libio \ + all-target-libstdc++ \ + all-target-librx \ + all-target-libg++ \ + all-target-newlib \ + all-target-winsup \ + all-target-libgloss \ + all-target-libiberty + +# This is a list of the configure targets for all of the modules which +# are compiled using the target tools. +CONFIGURE_TARGET_MODULES = \ + configure-target-libio \ + configure-target-libstdc++ \ + configure-target-librx \ + configure-target-libg++ \ + configure-target-newlib \ + configure-target-winsup \ + configure-target-libgloss \ + configure-target-libiberty # This is a list of the check targets for all of the modules which are # compiled using $(TARGET_FLAGS_TO_PASS). CHECK_TARGET_MODULES = \ - $(start-sanitize-chill) \ - check-chillrt \ - $(end-sanitize-chill) \ - check-libio \ - check-libstdc++ \ - check-libg++ \ - check-newlib \ - check-xiberty + check-target-libio \ + check-target-libstdc++ \ + check-target-libg++ \ + check-target-newlib \ + check-target-winsup \ + check-target-libiberty # This is a list of the install targets for all of the modules which are # compiled using $(TARGET_FLAGS_TO_PASS). INSTALL_TARGET_MODULES = \ - $(start-sanitize-chill) \ - install-chillrt \ - $(end-sanitize-chill) \ - install-libio \ - install-libstdc++ \ - install-libg++ \ - install-newlib \ - install-xiberty - -# This is a shell case of all modules which are compiled using -# $(TARGET_FLAGS_TO_PASS), used in the do-X rule. -TARGET_LIBS = libio | libstdc++ | librx | libg++ | newlib | xiberty -# start-sanitize-chill -TARGET_LIBS = chillrt | libio | libstdc++ | librx | libg++ | newlib | xiberty -# end-sanitize-chill + install-target-libio \ + install-target-libstdc++ \ + install-target-libg++ \ + install-target-newlib \ + install-target-winsup \ + install-target-libgloss \ + install-target-libiberty # The first rule in the file had better be this one. Don't put any above it. all: all.normal @@ -574,21 +632,16 @@ DO_X = \ do-install-info \ do-installcheck \ do-mostlyclean \ - do-realclean \ + do-maintainer-clean \ do-TAGS .PHONY: $(DO_X) $(DO_X): @target=`echo $@ | sed -e 's/^do-//'`; \ r=`pwd`; export r; \ srcroot=`cd $(srcdir); pwd`; export srcroot; \ - for i in $(SUBDIRS); do \ + for i in $(SUBDIRS) -dummy-; do \ if [ -f ./$$i/Makefile ]; then \ case $$i in \ - $(TARGET_LIBS) ) \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\(.*\)=\(.*\)|\1='\2'|"`; \ - done; \ - ;; \ gcc) \ for flag in $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\(.*\)=\(.*\)|\1='\2'|"`; \ @@ -609,11 +662,29 @@ $(DO_X): then true; else exit 1; fi; \ else true; fi; \ done + @target=`echo $@ | sed -e 's/^do-//'`; \ + r=`pwd`; export r; \ + srcroot=`cd $(srcdir); pwd`; export srcroot; \ + for i in $(TARGET_CONFIGDIRS) -dummy-; do \ + if [ -f $(TARGET_SUBDIR)/$$i/Makefile ]; then \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\(.*\)=\(.*\)|\1='\2'|"`; \ + done; \ + export AR AS CC CXX NM RANLIB; \ + if (cd $(TARGET_SUBDIR)/$$i; \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + $${target}); \ + then true; else exit 1; fi; \ + else true; fi; \ + done # Here are the targets which correspond to the do-X targets. .PHONY: info installcheck dvi install-info -.PHONY: clean distclean mostlyclean realclean local-clean local-distclean +.PHONY: clean distclean mostlyclean maintainer-clean realclean +.PHONY: local-clean local-distclean local-maintainer-clean info: do-info installcheck: do-installcheck dvi: do-dvi @@ -629,11 +700,20 @@ local-clean: local-distclean: -rm -f Makefile config.status + -if [ "$(TARGET_SUBDIR)" != "." ]; then \ + rm -rf $(TARGET_SUBDIR); \ + else true; fi + +local-maintainer-clean: + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." clean: do-clean local-clean mostlyclean: do-mostlyclean local-clean distclean: do-distclean local-clean local-distclean -realclean: do-realclean local-clean local-distclean +maintainer-clean: local-maintainer-clean do-maintainer-clean local-clean +maintainer-clean: local-distclean +realclean: maintainer-clean # Check target. @@ -645,12 +725,20 @@ check: $(CHECK_MODULES) \ # Installation targets. -.PHONY: install uninstall vault-install +.PHONY: install uninstall source-vault binary-vault vault-install install: $(INSTALL_TARGET) uninstall: @echo "the uninstall target is not supported in this tree" +source-vault: + $(MAKE) -f ./release/Build-A-Release \ + host=$(host_alias) source-vault + +binary-vault: + $(MAKE) -f ./release/Build-A-Release \ + host=$(host_alias) target=$(target_alias) + vault-install: @if [ -f ./release/vault-install ] ; then \ ./release/vault-install $(host_alias) $(target_alias) ; \ @@ -700,13 +788,12 @@ gcc-no-fixedincludes: # This rule is used to build the modules which use FLAGS_TO_PASS. To # build a target all-X means to cd to X and make all. -# all-glob is handled specially because it doesn't actually build. # # all-gui, and all-libproc are handled specially because # they are still experimental, and if they fail to build, that # shouldn't stop "make all". -.PHONY: $(ALL_MODULES) all-glob all-gui all-libproc -$(ALL_MODULES) all-glob all-gui all-libproc: +.PHONY: $(ALL_MODULES) all-gui all-libproc +$(ALL_MODULES) all-gui all-libproc: @dir=`echo $@ | sed -e 's/all-//'`; \ if [ -f ./$${dir}/Makefile ] ; then \ r=`pwd`; export r; \ @@ -756,15 +843,79 @@ $(INSTALL_MODULES): install-dirs true; \ fi +# This rule is used to configure the modules which are built with the +# target tools. +.PHONY: $(CONFIGURE_TARGET_MODULES) +$(CONFIGURE_TARGET_MODULES): + @dir=`echo $@ | sed -e 's/configure-target-//'`; \ + if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \ + true; \ + elif echo " $(TARGET_CONFIGDIRS) " | grep " $${dir} " >/dev/null 2>&1; then \ + if [ -d $(srcdir)/$${dir} ]; then \ + [ -d $(TARGET_SUBDIR)/$${dir} ] || mkdir $(TARGET_SUBDIR)/$${dir};\ + r=`pwd`; export r; \ + srcroot=`cd $(srcdir); pwd`; export srcroot; \ + AR="$(AR_FOR_TARGET)"; export AR; \ + AS="$(AS_FOR_TARGET)"; export AS; \ + CC="$(CC_FOR_TARGET)"; export CC; \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXX="$(CXX_FOR_TARGET)"; export CXX; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LD="$(LD_FOR_TARGET)"; export LD; \ + NM="$(NM_FOR_TARGET)"; export NM; \ + RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \ + echo Configuring in $(TARGET_SUBDIR)/$${dir}; \ + cd $(TARGET_SUBDIR)/$${dir}; \ + case $(srcdir) in \ + /*) \ + topdir=$(srcdir) ;; \ + *) \ + case "$(TARGET_SUBDIR)" in \ + .) topdir="../$(srcdir)" ;; \ + *) topdir="../../$(srcdir)" ;; \ + esac ;; \ + esac; \ + if [ "$(srcdir)" = "." ] ; then \ + if [ "$(TARGET_SUBDIR)" != "." ] ; then \ + if $(SHELL) $${srcroot}/symlink-tree $${topdir}/$${dir} "Makefile" ; then \ + true; \ + else \ + exit 1; \ + fi; \ + else \ + true; \ + fi; \ + srcdiroption="--srcdir=."; \ + libsrcdir="."; \ + else \ + srcdiroption="--srcdir=$${topdir}/$${dir}"; \ + libsrcdir="$${srcroot}/$${dir}"; \ + fi; \ + if [ -f $${libsrcdir}/configure ] ; then \ + $(SHELL) $${libsrcdir}/configure \ + $(CONFIG_ARGUMENTS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)"; \ + else \ + $(SHELL) $${srcroot}/configure \ + $(CONFIG_ARGUMENTS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)"; \ + fi; \ + else \ + true; \ + fi \ + else \ + true; \ + fi + # This rule is used to build the modules which use TARGET_FLAGS_TO_PASS. # To build a target all-X means to cd to X and make all. .PHONY: $(ALL_TARGET_MODULES) $(ALL_TARGET_MODULES): - @dir=`echo $@ | sed -e 's/all-//'`; \ - if [ -f ./$${dir}/Makefile ] ; then \ + @dir=`echo $@ | sed -e 's/all-target-//'`; \ + if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \ r=`pwd`; export r; \ srcroot=`cd $(srcdir); pwd`; export srcroot; \ - (cd $${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) all); \ + (cd $(TARGET_SUBDIR)/$${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) all); \ else \ true; \ fi @@ -773,11 +924,11 @@ $(ALL_TARGET_MODULES): # To build a target install-X means to cd to X and make install. .PHONY: $(CHECK_TARGET_MODULES) $(CHECK_TARGET_MODULES): - @dir=`echo $@ | sed -e 's/check-//'`; \ - if [ -f ./$${dir}/Makefile ] ; then \ + @dir=`echo $@ | sed -e 's/check-target-//'`; \ + if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \ r=`pwd`; export r; \ srcroot=`cd $(srcdir); pwd`; export srcroot; \ - (cd $${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) check); \ + (cd $(TARGET_SUBDIR)/$${dir};$(MAKE) $(TARGET_FLAGS_TO_PASS) check);\ else \ true; \ fi @@ -787,11 +938,12 @@ $(CHECK_TARGET_MODULES): # and make install. .PHONY: $(INSTALL_TARGET_MODULES) $(INSTALL_TARGET_MODULES): install-dirs - @dir=`echo $@ | sed -e 's/install-//'`; \ - if [ -f ./$${dir}/Makefile ] ; then \ + @dir=`echo $@ | sed -e 's/install-target-//'`; \ + if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \ r=`pwd`; export r; \ srcroot=`cd $(srcdir); pwd`; export srcroot; \ - (cd $${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) install); \ + (cd $(TARGET_SUBDIR)/$${dir}; \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) install); \ else \ true; \ fi @@ -890,11 +1042,8 @@ install-dosrel-fake: # This is a list of inter-dependencies among modules. all-autoconf: all-m4 all-bfd: -all-binutils: all-libiberty all-opcodes all-bfd all-flex +all-binutils: all-libiberty all-opcodes all-bfd all-flex all-byacc all-byacc: -# start-sanitize-chill -all-chillrt: all-binutils all-gas all-gcc all-newlib -# end-sanitize-chill all-cvs: all-dejagnu: all-tcl all-expect all-tk all-diff: all-libiberty @@ -908,29 +1057,36 @@ all-flex: all-libiberty all-byacc all-gas: all-libiberty all-opcodes all-bfd all-gash: all-tcl all-gawk: -all-gcc: all-libiberty all-byacc all-binutils all-gas all-pagas -all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-glob all-byacc all-sim all-gcc all-ld -all-glob: +ALL_GCC = all-gcc +all-gcc: all-libiberty all-byacc all-binutils all-gas all-ld +all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-byacc all-sim $(gdbnlmrequirements) all-gprof: all-libiberty all-bfd all-grep: all-libiberty -all-gui: all-gdb all-libproc all-librx +all-grez: all-libiberty all-bfd +all-gui: all-gdb all-libproc all-target-librx all-gzip: all-libiberty all-hello: all-libiberty all-indent: -all-ispell: all-emacs # all-emacs19 ??? is this needed? +all-ispell: all-emacs19 all-ld: all-libiberty all-bfd all-byacc all-flex -all-libg++: all-gas all-pagas all-ld all-gcc all-xiberty all-newlib \ - all-libio all-librx -all-libio: all-gas all-pagas all-ld all-gcc all-xiberty all-newlib +configure-target-libg++: $(ALL_GCC) configure-target-librx +all-target-libg++: configure-target-libg++ all-gas all-ld all-gcc all-target-libiberty all-target-newlib all-target-libio all-target-librx all-target-libstdc++ +configure-target-libgloss: $(ALL_GCC) +all-target-libgloss: configure-target-libgloss configure-target-newlib +configure-target-libio: $(ALL_GCC) +all-target-libio: configure-target-libio all-gas all-ld all-gcc all-target-libiberty all-target-newlib all-libiberty: -all-libstdc++: all-gas all-pagas all-ld all-gcc all-xiberty all-newlib \ - all-libio +configure-target-librx: $(ALL_GCC) configure-target-newlib +all-target-librx: configure-target-librx +configure-target-libstdc++: $(ALL_GCC) +all-target-libstdc++: configure-target-libstdc++ all-gas all-ld all-gcc all-target-libiberty all-target-newlib all-target-libio all-m4: all-libiberty all-make: all-libiberty all-mmalloc: -all-newlib: all-binutils all-gas all-pagas all-gcc +configure-target-newlib: $(ALL_GCC) +all-target-newlib: configure-target-newlib all-binutils all-gas all-gcc all-opcodes: all-bfd -all-patch: +all-patch: all-libiberty all-prms: all-libiberty all-rcs: all-readline: @@ -948,8 +1104,11 @@ all-textutils: all-tgas: all-libiberty all-bfd all-time: all-wdiff: +all-target-winsup: all-target-newlib configure-target-winsup +configure-target-winsup: configure-target-newlib all-uudecode: all-libiberty -all-xiberty: all-gcc all-ld all-newlib +configure-target-libiberty: $(ALL_GCC) +all-target-libiberty: configure-target-libiberty all-gcc all-ld all-target-newlib ### other supporting targets @@ -1010,23 +1169,21 @@ Makefile: Makefile.in configure.in $(host_makefile_frag) $(target_makefile_frag) # distribution (perhaps it would be better to include it anyway). DEVO_SUPPORT= README Makefile.in configure configure.in \ config.guess config.sub config move-if-change \ - COPYING COPYING.LIB install.sh + mpw-README mpw-build.in mpw-config.in mpw-configure \ + COPYING COPYING.LIB install.sh config-ml.in symlink-tree # Files in devo/etc used in any net release. # ChangeLog omitted because it may refer to files which are not in this # distribution (perhaps it would be better to include it anyway). ETC_SUPPORT= Makefile.in cfg-paper.texi configure.in configure.man \ - configure.texi standards.texi make-stds.texi + configure.texi standards.texi make-stds.texi \ + configure.info* standards.info* cfg-paper.info* # When you use `make setup-dirs' or `make taz' you should always redefine # this macro. SUPPORT_FILES = list-of-support-files-for-tool-in-question -# Directories that might want `make diststuff' run. -DISTSTUFFDIRS= ld gprof gdb libg++ binutils gnats gas # Files where "byacc" (Cygnus version) should be changed to "bison -y" (FSF). DISTBISONFILES= binutils/Makefile.in gas/Makefile.in gdb/Makefile.in -# Directories where "info" should be built. -DISTDOCDIRS= ld gprof binutils gas bfd libg++ libio gdb gnats send-pr .PHONY: taz @@ -1051,26 +1208,20 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \ @if [ -f .Sanitize ] ; then echo "RUN Sanitize FIRST!" ; false ; fi ; $(end-sanitize-Sanitize) ./configure sun4 - # Doc files don't change; include them in distribution. - for f in $(DISTDOCDIRS) ; do \ - if [ -r $$f/Makefile ]; then \ - (cd $$f ; $(MAKE) info) || exit 1 ; \ - else true ; fi ; \ - done - # Make links, and run "make diststuff" when needed. - # The `echo' for setting `p' is to convert all whitespace to spaces. - # Then the `case' further below should tell whether $$d is in - # DISTSTUFFDIRS. + [ -z "$(CONFIGURE_TARGET_MODULES)" ] \ + || $(MAKE) $(CONFIGURE_TARGET_MODULES) ALL_GCC="" \ + CC_FOR_TARGET="$(CC) CXX_FOR_TARGET="$(CXX)" + # Make links, and run "make diststuff" or "make info" when needed. rm -rf proto-toplev ; mkdir proto-toplev set -e ; dirs="$(TOOL) $(DEVO_SUPPORT) $(SUPPORT_FILES)" ; \ - p=" `echo $(DISTSTUFFDIRS)` " ; \ for d in $$dirs ; do \ if [ -d $$d ]; then \ - case " $$p " in \ - *" $$d "*) \ - echo making diststuff in $$d ; \ - (cd $$d ; pwd ; $(MAKE) diststuff ) || exit 1 ;; \ - esac ; \ + if [ ! -f $$d/Makefile ] ; then true ; \ + elif grep '^diststuff:' $$d/Makefile >/dev/null ; then \ + (cd $$d ; $(MAKE) diststuff ) || exit 1 ; \ + elif grep '^info:' $$d/Makefile >/dev/null ; then \ + (cd $$d ; $(MAKE) info ) || exit 1 ; \ + fi ; \ if [ -d $$d/proto-$$d.dir ]; then \ ln -s ../$$d/proto-$$d.dir proto-toplev/$$d ; \ else \ @@ -1078,17 +1229,18 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \ fi ; \ else ln -s ../$$d proto-toplev/$$d ; fi ; \ done + cd etc ; $(MAKE) info $(MAKE) distclean # mkdir proto-toplev/etc - (cd proto-toplev/etc; for i in $(ETC_SUPPORT); do \ + (cd proto-toplev/etc; \ + for i in $(ETC_SUPPORT); do \ ln -s ../../etc/$$i . ; \ - done) + done) # - # Take out texinfo and glob from configurable dirs + # Take out texinfo from configurable dirs rm proto-toplev/configure.in sed -e '/^host_tools=/s/texinfo //' \ - -e '/^host_libs=/s/glob //' \ proto-toplev/configure.in # mkdir proto-toplev/texinfo @@ -1117,16 +1269,16 @@ gas.tar.gz: $(DIST_SUPPORT) $(GAS_SUPPORT_DIRS) gas BINUTILS_SUPPORT_DIRS= bfd gas include libiberty opcodes ld gprof binutils.tar.gz: $(DIST_SUPPORT) $(BINUTILS_SUPPORT_DIRS) binutils $(MAKE) -f Makefile.in taz TOOL=binutils \ - SUPPORT_FILES="$(BINUTILS_SUPPORT_DIRS)" + SUPPORT_FILES="$(BINUTILS_SUPPORT_DIRS) makeall.bat configure.bat" .PHONY: gas+binutils.tar.gz GASB_SUPPORT_DIRS= $(GAS_SUPPORT_DIRS) binutils ld gprof gas+binutils.tar.gz: $(DIST_SUPPORT) $(GASB_SUPPORT_DIRS) gas $(MAKE) -f Makefile.in taz TOOL=gas \ - SUPPORT_FILES="$(GASB_SUPPORT_DIRS)" + SUPPORT_FILES="$(GASB_SUPPORT_DIRS) makeall.bat configure.bat" .PHONY: libg++.tar.gz -LIBGXX_SUPPORT_DIRS=include libio librx libiberty xiberty +LIBGXX_SUPPORT_DIRS=include libstdc++ libio librx libiberty libg++.tar.gz: $(DIST_SUPPORT) libg++ $(MAKE) -f Makefile.in taz TOOL=libg++ \ SUPPORT_FILES="$(LIBGXX_SUPPORT_DIRS)" @@ -1137,18 +1289,32 @@ gnats.tar.gz: $(DIST_SUPPORT) $(GNATS_SUPPORT_DIRS) gnats SUPPORT_FILES="$(GNATS_SUPPORT_DIRS)" .PHONY: gdb.tar.gz -GDB_SUPPORT_DIRS= bfd glob include libiberty mmalloc opcodes readline sim +GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline sim utils +GDBTK_SUPPORT_DIRS= `if [ -d tcl -a -d tk ] ; then echo tcl tk ; fi` gdb.tar.gz: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb $(MAKE) -f Makefile.in taz TOOL=gdb \ - SUPPORT_FILES="$(GDB_SUPPORT_DIRS)" + SUPPORT_FILES="$(GDB_SUPPORT_DIRS) $(GDBTK_SUPPORT_DIRS)" .PHONY: newlib.tar.gz -NEWLIB_SUPPORT_DIRS= +NEWLIB_SUPPORT_DIRS=libgloss +# taz configures for the sun4 target which won't configure newlib. +# We need newlib configured so that the .info files are made. +# Unfortunately, it is not enough to just configure newlib separately: +# taz will build the .info files but since SUBDIRS won't contain newlib, +# distclean won't be run (leaving Makefile, config.status, and the tmp files +# used in building the .info files, eg: *.def, *.ref). +# Compensate here by configuring newlib for a simple (no multilib support) +# cross target (sparc64), building the info files, and doing make distclean +# ourselves. newlib.tar.gz: $(DIST_SUPPORT) $(NEWLIB_SUPPORT_DIRS) newlib + rootme=`pwd` ; \ + cd newlib && ../configure --srcdir $$rootme/newlib \ + --host sun4 --target sparc64-elf + cd newlib ; make info + cd newlib ; make distclean $(MAKE) -f Makefile.in taz TOOL=newlib \ SUPPORT_FILES="$(NEWLIB_SUPPORT_DIRS)" \ - DEVO_SUPPORT="$(DEVO_SUPPORT) COPYING.NEWLIB" \ - DISTDOCDIRS="$(DISTDOCDIRS) newlib" + DEVO_SUPPORT="$(DEVO_SUPPORT) COPYING.NEWLIB" newlib .NOEXPORT: MAKEOVERRIDES=