X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=Makefile.in;h=f3a841aa86611d8b34db10dd0469e2a00e42c719;hb=93f967158fdb53e468173f0a4947b3dd06442983;hp=be05ea89c6d1ce52555ce743213b438698134599;hpb=65f1be0633e19288837b77453ab879a1f5d7d7f8;p=deliverable%2Fbinutils-gdb.git diff --git a/Makefile.in b/Makefile.in index be05ea89c6..f3a841aa86 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,7 @@ # # Makefile for directory with subdirs to build. -# Copyright (C) 1990, 1991, 1992, 1993 Free Software Foundation +# Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 1998 +# 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 @@ -14,22 +15,31 @@ # # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # srcdir = . prefix = /usr/local - exec_prefix = $(prefix) -bindir = $(exec_prefix)/bin -libdir = $(exec_prefix)/lib + +bindir=${exec_prefix}/bin +sbindir=${exec_prefix}/sbin +libexecdir=${exec_prefix}/libexec +datadir=${prefix}/share +sysconfdir=${prefix}/etc +sharedstatedir=${prefix}/com +localstatedir=${prefix}/var +libdir=${exec_prefix}/lib +includedir=${prefix}/include +oldincludedir=/usr/include +infodir=${prefix}/info +mandir=${prefix}/man + tooldir = $(exec_prefix)/$(target) program_transform_name = -datadir = $(prefix)/lib -mandir = $(prefix)/man man1dir = $(mandir)/man1 man2dir = $(mandir)/man2 man3dir = $(mandir)/man3 @@ -39,17 +49,18 @@ man6dir = $(mandir)/man6 man7dir = $(mandir)/man7 man8dir = $(mandir)/man8 man9dir = $(mandir)/man9 -infodir = $(prefix)/info -includedir = $(prefix)/include -docdir = $(datadir)/doc GDB_NLM_DEPS = SHELL = /bin/sh -INSTALL = $${srcroot}/install.sh -c -INSTALL_PROGRAM = $(INSTALL) +# INSTALL_PROGRAM_ARGS is changed by configure.in to use -x for a +# cygwin32 host. +INSTALL_PROGRAM_ARGS = + +INSTALL = $(SHELL) $$s/install-sh -c +INSTALL_PROGRAM = $(INSTALL) $(INSTALL_PROGRAM_ARGS) +INSTALL_SCRIPT = $(INSTALL) INSTALL_DATA = $(INSTALL) -m 644 -INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)' INSTALL_DOSREL = install-dosrel-fake @@ -64,11 +75,13 @@ HOST_CC = $(CC_FOR_BUILD) HOST_PREFIX = 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. +# These flag values are normally overridden by the configure script. CFLAGS = -g +CXXFLAGS = -g -O2 + LIBCFLAGS = $(CFLAGS) CFLAGS_FOR_TARGET = $(CFLAGS) +LDFLAGS_FOR_TARGET = LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) PICFLAG = PICFLAG_FOR_TARGET = @@ -77,34 +90,52 @@ PICFLAG_FOR_TARGET = CHILLFLAGS = $(CFLAGS) CHILL_LIB = -lchill # end-sanitize-chill -CXX = gcc +CXX = c++ # Use -O2 to stress test the compiler. -CXXFLAGS = -g -O2 LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates CXXFLAGS_FOR_TARGET = $(CXXFLAGS) LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates RANLIB = ranlib + +DLLTOOL = dlltool +WINDRES = windres + NM = nm + +LD = ld + # Not plain GZIP, since gzip looks there for extra command-line options. GZIPPROG = gzip -# BISON: This line sed'ed to BISON = bison -y for FSF releases, don't remove. -BISON = `if [ -f $$r/byacc/byacc ] ; \ - then echo $$r/byacc/byacc ; \ - else echo byacc ; \ +# These values are substituted by configure. +DEFAULT_YACC = yacc +DEFAULT_LEX = lex + +BISON = `if [ -f $$r/bison/bison ] ; then \ + echo $$r/bison/bison -L $$s/bison/ ; \ + else \ + echo bison ; \ + fi` + +YACC = `if [ -f $$r/bison/bison ] ; then \ + echo $$r/bison/bison -y -L $$s/bison/ ; \ + elif [ -f $$r/byacc/byacc ] ; then \ + echo $$r/byacc/byacc ; \ + else \ + echo ${DEFAULT_YACC} ; \ fi` LEX = `if [ -f $$r/flex/flex ] ; \ then echo $$r/flex/flex ; \ - else echo flex ; fi` + else echo ${DEFAULT_LEX} ; fi` M4 = `if [ -f $$r/m4/m4 ] ; \ then echo $$r/m4/m4 ; \ else echo m4 ; fi` -MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \ +MAKEINFO = `if [ -f $$r/texinfo/makeinfo/Makefile ] ; \ then echo $$r/texinfo/makeinfo/makeinfo ; \ else echo makeinfo ; fi` @@ -117,8 +148,8 @@ EXPECT = `if [ -f $$r/expect/expect ] ; \ then echo $$r/expect/expect ; \ else echo expect ; fi` -RUNTEST = `if [ -f $${srcroot}/dejagnu/runtest ] ; \ - then echo $${srcroot}/dejagnu/runtest ; \ +RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \ + then echo $$s/dejagnu/runtest ; \ else echo runtest ; fi` @@ -132,24 +163,45 @@ OTHERS = # This is set by the configure script to the list of directories which # should be built using the target tools. -TARGET_CONFIGDIRS = xiberty libgloss newlib libio librx libstdc++ libg++ winsup +TARGET_CONFIGDIRS = libiberty libgloss newlib libio librx libstdc++ libg++ winsup opcodes cygmon + +# Target libraries are put under this directory: +# Changed by configure to $(target_alias) if cross. +TARGET_SUBDIR = . # This is set by the configure script to the arguments passed to configure. CONFIG_ARGUMENTS = +# This is set by configure to REALLY_SET_LIB_PATH if --enable-shared +# was used. +SET_LIB_PATH = + +# This is the name of the environment variable used for the path to +# the libraries. This may be changed by configure.in. +RPATH_ENVVAR = LD_LIBRARY_PATH + +# configure.in sets SET_LIB_PATH to this if --enable-shared was used. +REALLY_SET_LIB_PATH = \ + $(RPATH_ENVVAR)=$$r/bfd:$$r/opcodes:$$$(RPATH_ENVVAR); \ + export $(RPATH_ENVVAR); + ALL = all.normal -INSTALL_TARGET = install-dirs \ +INSTALL_TARGET = installdirs \ + install-gcc \ $(INSTALL_MODULES) \ $(INSTALL_TARGET_MODULES) \ $(INSTALL_X11_MODULES) \ - install-gcc \ $(INSTALL_DOSREL) 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/gcc/xgcc ] ; then \ + if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \ + if [ -f $$r/$(TARGET_SUBDIR)/winsup/Makefile ] ; then \ + echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -L$$r/$(TARGET_SUBDIR)/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \ + else \ + echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \ + fi; \ else \ echo $$r/gcc/xgcc -B$$r/gcc/; \ fi; \ @@ -161,9 +213,15 @@ CC_FOR_TARGET = ` \ fi; \ fi` +# If CC_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 = $$r/gcc/xgcc -B$$r/gcc/ + # start-sanitize-chill CHILL_FOR_TARGET = ` \ - if [ -f $$r/gcc/Makefile ] ; then \ + if [ -f $$r/gcc/xgcc ] ; then \ echo $$r/gcc/xgcc -B$$r/gcc/ -L$$r/gcc/ch/runtime/; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ @@ -176,9 +234,13 @@ CHILL_FOR_TARGET = ` \ # end-sanitize-chill 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/gcc/xgcc ] ; then \ + if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \ + if [ -f $$r/$(TARGET_SUBDIR)/winsup/Makefile ] ; then \ + echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -L$$r/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \ + else \ + echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \ + fi; \ else \ echo $$r/gcc/xgcc -B$$r/gcc/; \ fi; \ @@ -186,13 +248,13 @@ CXX_FOR_TARGET = ` \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ echo $(CXX); \ else \ - t='$(program_transform_name)'; echo gcc | sed -e 's/x/x/' $$t; \ + t='$(program_transform_name)'; echo c++ | sed -e 's/x/x/' $$t; \ fi; \ fi` AS_FOR_TARGET = ` \ - if [ -f $$r/gas/as.new ] ; then \ - echo $$r/gas/as.new ; \ + if [ -f $$r/gas/as-new ] ; then \ + echo $$r/gas/as-new ; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ echo $(AS); \ @@ -202,8 +264,8 @@ AS_FOR_TARGET = ` \ fi` LD_FOR_TARGET = ` \ - if [ -f $$r/ld/ld.new ] ; then \ - echo $$r/ld/ld.new ; \ + if [ -f $$r/ld/ld-new ] ; then \ + echo $$r/ld/ld-new ; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ echo $(LD); \ @@ -223,6 +285,17 @@ DLLTOOL_FOR_TARGET = ` \ fi; \ fi` +WINDRES_FOR_TARGET = ` \ + if [ -f $$r/binutils/windres ] ; then \ + echo $$r/binutils/windres ; \ + else \ + if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ + echo $(WINDRES); \ + else \ + t='$(program_transform_name)'; echo windres | sed -e 's/x/x/' $$t ; \ + fi; \ + fi` + AR_FOR_TARGET = ` \ if [ -f $$r/binutils/ar ] ; then \ echo $$r/binutils/ar ; \ @@ -246,8 +319,8 @@ RANLIB_FOR_TARGET = ` \ fi` NM_FOR_TARGET = ` \ - if [ -f $$r/binutils/nm.new ] ; then \ - echo $$r/binutils/nm.new ; \ + if [ -f $$r/binutils/nm-new ] ; then \ + echo $$r/binutils/nm-new ; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ echo $(NM); \ @@ -280,11 +353,10 @@ BASE_FLAGS_TO_PASS = \ "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)" \ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ - "INSTALL_XFORM=$(INSTALL_XFORM)" \ + "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ "LDFLAGS=$(LDFLAGS)" \ "LEX=$(LEX)" \ "LD_FOR_TARGET=$(LD_FOR_TARGET)" \ @@ -293,19 +365,35 @@ BASE_FLAGS_TO_PASS = \ "LIBCXXFLAGS=$(LIBCXXFLAGS)" \ "LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \ "M4=$(M4)" \ + "MAKE=$(MAKE)" \ "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ "NM_FOR_TARGET=$(NM_FOR_TARGET)" \ "PICFLAG=$(PICFLAG)" \ "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ "RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \ + "RPATH_ENVVAR=$(RPATH_ENVVAR)" \ "SHELL=$(SHELL)" \ "EXPECT=$(EXPECT)" \ "RUNTEST=$(RUNTEST)" \ "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ - "YACC=$(BISON)" \ + "WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \ + "YACC=$(YACC)" \ + "bindir=$(bindir)" \ + "datadir=$(datadir)" \ "exec_prefix=$(exec_prefix)" \ + "includedir=$(includedir)" \ + "infodir=$(infodir)" \ + "libdir=$(libdir)" \ + "libexecdir=$(libexecdir)" \ + "lispdir=$(lispdir)" \ + "localstatedir=$(localstatedir)" \ + "mandir=$(mandir)" \ + "oldincludedir=$(oldincludedir)" \ "prefix=$(prefix)" \ - "tooldir=$(tooldir)" + "sbindir=$(sbindir)" \ + "sharedstatedir=$(sharedstatedir)" \ + "sysconfdir=$(sysconfdir)" \ + "tooldir=$(tooldir)" # Flags to pass down to most sub-makes, in which we're building with # the host environment. @@ -315,8 +403,11 @@ EXTRA_HOST_FLAGS = \ 'AS=$(AS)' \ 'CC=$(CC)' \ 'CXX=$(CXX)' \ + 'DLLTOOL=$(DLLTOOL)' \ + 'LD=$(LD)' \ 'NM=$(NM)' \ - 'RANLIB=$(RANLIB)' + 'RANLIB=$(RANLIB)' \ + 'WINDRES=$(WINDRES)' FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) @@ -349,7 +440,8 @@ EXTRA_TARGET_FLAGS = \ 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \ 'NM=$$(NM_FOR_TARGET)' \ 'PICFLAG=$$(PICFLAG_FOR_TARGET)' \ - 'RANLIB=$$(RANLIB_FOR_TARGET)' + 'RANLIB=$$(RANLIB_FOR_TARGET)' \ + 'WINDRES=$$(WINDRES_FOR_TARGET)' TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) @@ -364,44 +456,82 @@ EXTRA_GCC_FLAGS = \ 'AS=$(AS)' \ 'CC=$(CC)' \ 'CXX=$(CXX)' \ + 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ 'HOST_CC=$(CC_FOR_BUILD)' \ 'HOST_PREFIX=$(HOST_PREFIX)' \ 'HOST_PREFIX_1=$(HOST_PREFIX_1)' \ 'NM=$(NM)' \ - 'RANLIB=$$(RANLIB_FOR_TARGET)' + 'RANLIB=$$(RANLIB_FOR_TARGET)' \ + 'WINDRES=$$(WINDRES_FOR_TARGET)' \ + "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \ + "`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 'LIBGCC1_TEST=$(LIBGCC1_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 'ENQUIRE=$(ENQUIRE)' | sed -e s/.*=$$/XFOO=/`" \ + "`echo 'BOOT_CFLAGS=$(BOOT_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \ GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) # This is a list of the targets for all of the modules which are compiled # using $(FLAGS_TO_PASS). ALL_MODULES = \ + all-apache \ + all-ash \ all-autoconf \ + all-automake \ + all-bash \ all-bfd \ all-binutils \ + all-bison \ all-byacc \ - all-cvs \ + all-cvssrc \ + all-db \ all-dejagnu \ all-diff \ all-dosutils \ all-etc \ all-fileutils \ + all-findutils \ all-find \ all-flex \ all-gas \ all-gawk \ + all-gettext \ + all-gnuserv \ all-gprof \ all-grep \ + all-grez \ all-gzip \ all-hello \ + $(start-sanitize-ide) \ + all-ilu \ + $(end-sanitize-ide) \ all-indent \ + all-inet \ + all-intl \ all-ispell \ + all-itcl \ + $(start-sanitize-ide) \ + all-jstools \ + $(end-sanitize-ide) \ all-ld \ + all-libgui \ all-libiberty \ + $(start-sanitize-ide) \ + all-libide \ + all-libidetcl \ + $(end-sanitize-ide) \ + all-libtool \ all-m4 \ all-make \ all-mmalloc \ all-opcodes \ all-patch \ + all-perl \ all-prms \ all-rcs \ all-readline \ @@ -411,6 +541,7 @@ ALL_MODULES = \ all-send-pr \ all-shellutils \ all-sim \ + all-snavigator \ all-tar \ all-tcl \ all-texinfo \ @@ -418,10 +549,11 @@ ALL_MODULES = \ all-tgas \ all-time \ all-uudecode \ + $(start-sanitize-ide) \ + all-vmake \ + $(end-sanitize-ide) \ all-wdiff -# This is a list of the check targets for all of the modules which are -# compiled using $(FLAGS_TO_PASS). # This is a list of the check targets for all of the modules which are # compiled using $(FLAGS_TO_PASS). # @@ -429,34 +561,59 @@ ALL_MODULES = \ # are tested as part of the host's native tool-chain, and not # tested in a cross configuration. NATIVE_CHECK_MODULES = \ + check-bison \ check-byacc \ check-flex CROSS_CHECK_MODULES = \ + check-apache \ + check-ash \ check-autoconf \ + check-automake \ + check-bash \ check-bfd \ check-binutils \ - check-cvs \ + check-cvssrc \ + check-db \ check-dejagnu \ check-diff \ check-etc \ check-fileutils \ + check-findutils \ check-find \ check-gas \ check-gawk \ + check-gettext \ + check-gnuserv \ check-gprof \ check-grep \ check-gzip \ check-hello \ + $(start-sanitize-ide) \ + check-ilu \ + $(end-sanitize-ide) \ check-indent \ + check-inet \ + check-intl \ check-ispell \ + check-itcl \ + $(start-sanitize-ide) \ + check-jstools \ + $(end-sanitize-ide) \ check-ld \ + check-libgui \ check-libiberty \ + $(start-sanitize-ide) \ + check-libide \ + check-libidetcl \ + $(end-sanitize-ide) \ + check-libtool \ check-m4 \ check-make \ check-mmcheckoc \ check-opcodes \ check-patch \ + check-perl \ check-prms \ check-rcs \ check-readline \ @@ -464,6 +621,7 @@ CROSS_CHECK_MODULES = \ check-sed \ check-send-pr \ check-shellutils \ + check-snavigator \ check-sim \ check-tar \ check-tcl \ @@ -472,40 +630,75 @@ CROSS_CHECK_MODULES = \ check-tgas \ check-time \ check-uudecode \ + $(start-sanitize-ide) \ + check-vmake \ + $(end-sanitize-ide) \ check-wdiff CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES) # This is a list of the install targets for all of the modules which are # compiled using $(FLAGS_TO_PASS). +# We put install-opcodes before install-binutils because the installed +# binutils might be on PATH, and they might need the shared opcodes +# library. +# We put install-tcl before install-itcl because itcl wants to run a +# program on installation which uses the Tcl libraries. INSTALL_MODULES = \ + install-apache \ + install-ash \ install-autoconf \ + install-automake \ + install-bash \ install-bfd \ + install-opcodes \ install-binutils \ + install-bison \ install-byacc \ - install-cvs \ + install-cvssrc \ + install-db \ install-dejagnu \ install-diff \ install-dosutils \ install-etc \ install-fileutils \ + install-findutils \ install-find \ install-flex \ install-gas \ install-gawk \ + install-gettext \ + install-gnuserv \ install-gprof \ install-grep \ + install-grez \ install-gzip \ install-hello \ + $(start-sanitize-ide) \ + install-ilu \ + $(end-sanitize-ide) \ install-indent \ + install-inet \ + install-intl \ install-ispell \ + install-tcl \ + install-itcl \ + $(start-sanitize-ide) \ + install-jstools \ + $(end-sanitize-ide) \ install-ld \ + install-libgui \ install-libiberty \ + $(start-sanitize-ide) \ + install-libide \ + install-libidetcl \ + $(end-sanitize-ide) \ + install-libtool \ install-m4 \ install-make \ install-mmalloc \ - install-opcodes \ install-patch \ + install-perl \ install-prms \ install-rcs \ install-readline \ @@ -514,13 +707,16 @@ INSTALL_MODULES = \ install-send-pr \ install-shellutils \ install-sim \ + install-snavigator \ install-tar \ - install-tcl \ install-texinfo \ install-textutils \ install-tgas \ install-time \ install-uudecode \ + $(start-sanitize-ide) \ + install-vmake \ + $(end-sanitize-ide) \ install-wdiff # This is a list of the targets for all of the modules which are compiled @@ -531,18 +727,22 @@ ALL_X11_MODULES = \ all-gdb \ all-expect \ all-gash \ + all-guile \ all-tclX \ - all-tk + all-tk \ + all-tix # This is a list of the check targets for all of the modules which are # compiled using $(X11_FLAGS_TO_PASS). CHECK_X11_MODULES = \ check-emacs \ check-gdb \ + check-guile \ check-expect \ check-gash \ check-tclX \ - check-tk + check-tk \ + check-tix # This is a list of the install targets for all the modules which are # compiled using $(X11_FLAGS_TO_PASS). @@ -550,59 +750,168 @@ INSTALL_X11_MODULES = \ install-emacs \ install-emacs19 \ install-gdb \ + install-guile \ install-expect \ install-gash \ install-tclX \ - install-tk + install-tk \ + install-tix # This is a list of the targets for all of the modules which are compiled # using $(TARGET_FLAGS_TO_PASS). ALL_TARGET_MODULES = \ - all-libio \ - all-libstdc++ \ - all-librx \ - all-libg++ \ - all-newlib \ - all-winsup \ - all-libgloss \ - 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 \ + all-target-gperf \ + all-target-examples \ + all-target-cygmon # This is a list of the configure targets for all of the modules which # are compiled using the target tools. CONFIGURE_TARGET_MODULES = \ - configure-libio \ - configure-libstdc++ \ - configure-librx \ - configure-libg++ \ - configure-newlib \ - configure-winsup \ - configure-libgloss \ - configure-xiberty + configure-target-libio \ + configure-target-libstdc++ \ + configure-target-librx \ + configure-target-libg++ \ + configure-target-newlib \ + configure-target-winsup \ + configure-target-libgloss \ + configure-target-libiberty \ + configure-target-gperf \ + configure-target-examples \ + configure-target-cygmon # This is a list of the check targets for all of the modules which are # compiled using $(TARGET_FLAGS_TO_PASS). CHECK_TARGET_MODULES = \ - check-libio \ - check-libstdc++ \ - check-libg++ \ - check-newlib \ - check-winsup \ - check-xiberty + check-target-libio \ + check-target-libstdc++ \ + check-target-libg++ \ + check-target-newlib \ + check-target-winsup \ + check-target-libiberty \ + check-target-gperf # This is a list of the install targets for all of the modules which are # compiled using $(TARGET_FLAGS_TO_PASS). INSTALL_TARGET_MODULES = \ - install-libio \ - install-libstdc++ \ - install-libg++ \ - install-newlib \ - install-winsup \ - install-libgloss \ - 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 | winsup + install-target-libio \ + install-target-libstdc++ \ + install-target-libg++ \ + install-target-newlib \ + install-target-winsup \ + install-target-libgloss \ + install-target-libiberty \ + install-target-gperf + +# This is a list of the targets for which we can do a clean-{target}. +CLEAN_MODULES = \ + clean-apache \ + clean-ash \ + clean-autoconf \ + clean-automake \ + clean-bash \ + clean-bfd \ + clean-binutils \ + clean-bison \ + clean-byacc \ + clean-cvssrc \ + clean-db \ + clean-dejagnu \ + clean-diff \ + clean-dosutils \ + clean-etc \ + clean-fileutils \ + clean-findutils \ + clean-find \ + clean-flex \ + clean-gas \ + clean-gawk \ + clean-gettext \ + clean-gnuserv \ + clean-gprof \ + clean-grep \ + clean-grez \ + clean-gzip \ + clean-hello \ + $(start-sanitize-ide) \ + clean-ilu \ + $(end-sanitize-ide) \ + clean-indent \ + clean-inet \ + clean-intl \ + clean-ispell \ + clean-itcl \ + $(start-sanitize-ide) \ + clean-jstools \ + $(end-sanitize-ide) \ + clean-ld \ + clean-libgui \ + clean-libiberty \ + $(start-sanitize-ide) \ + clean-libide \ + clean-libidetcl \ + $(end-sanitize-ide) \ + clean-libtool \ + clean-m4 \ + clean-make \ + clean-mmalloc \ + clean-opcodes \ + clean-patch \ + clean-perl \ + clean-prms \ + clean-rcs \ + clean-readline \ + clean-release \ + clean-recode \ + clean-sed \ + clean-send-pr \ + clean-shellutils \ + clean-sim \ + clean-snavigator \ + clean-tar \ + clean-tcl \ + clean-texinfo \ + clean-textutils \ + clean-tgas \ + clean-time \ + clean-uudecode \ + $(start-sanitize-ide) \ + clean-vmake \ + $(end-sanitize-ide) \ + clean-wdiff + +# All of the target modules that can be cleaned +CLEAN_TARGET_MODULES = \ + clean-target-libio \ + clean-target-libstdc++ \ + clean-target-librx \ + clean-target-libg++ \ + clean-target-newlib \ + clean-target-winsup \ + clean-target-libgloss \ + clean-target-libiberty \ + clean-target-gperf \ + clean-target-examples \ + clean-target-cygmon + +# All of the x11 modules that can be cleaned +CLEAN_X11_MODULES = \ + clean-emacs \ + clean-emacs19 \ + clean-gdb \ + clean-expect \ + clean-gash \ + clean-guile \ + clean-tclX \ + clean-tk \ + clean-tix # The first rule in the file had better be this one. Don't put any above it. all: all.normal @@ -612,8 +921,8 @@ all: all.normal .PHONY: all.normal all.normal: \ $(ALL_MODULES) \ - $(ALL_TARGET_MODULES) \ $(ALL_X11_MODULES) \ + $(ALL_TARGET_MODULES) \ all-gcc # Do a target for all the subdirectories. A ``make do-X'' will do a @@ -637,31 +946,47 @@ DO_X = \ $(DO_X): @target=`echo $@ | sed -e 's/^do-//'`; \ r=`pwd`; export r; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ - for i in $(SUBDIRS) $(TARGET_CONFIGDIRS); do \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ + 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'|"`; \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'|"`; \ done; \ ;; \ *) \ for flag in $(EXTRA_HOST_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\(.*\)=\(.*\)|\1='\2'|"`; \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'|"`; \ done; \ ;; \ esac ; \ - export AR AS CC CXX NM RANLIB; \ + export AR AS CC CXX LD NM RANLIB DLLTOOL WINDRES; \ if (cd ./$$i; \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "NM=$${NM}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + $${target}); \ + then true; else exit 1; fi; \ + else true; fi; \ + done + @target=`echo $@ | sed -e 's/^do-//'`; \ + r=`pwd`; export r; \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ + 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 LD NM RANLIB DLLTOOL WINDRES; \ + if (cd $(TARGET_SUBDIR)/$$i; \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ $${target}); \ then true; else exit 1; fi; \ else true; fi; \ @@ -676,8 +1001,11 @@ info: do-info installcheck: do-installcheck dvi: do-dvi +# Make sure makeinfo is built before we do a `make info'. +do-info: all-texinfo + install-info: do-install-info dir.info - srcroot=`cd $(srcdir); pwd`; export srcroot; \ + s=`cd $(srcdir); pwd`; export s; \ if [ -f dir.info ] ; then \ $(INSTALL_DATA) dir.info $(infodir)/dir.info ; \ else true ; fi @@ -686,7 +1014,10 @@ local-clean: -rm -f *.a TEMP errs core *.o *~ \#* TAGS *.E local-distclean: - -rm -f Makefile config.status + -rm -f Makefile config.status config.cache + -if [ "$(TARGET_SUBDIR)" != "." ]; then \ + rm -rf $(TARGET_SUBDIR); \ + else true; fi local-maintainer-clean: @echo "This command is intended for maintainers to use;" @@ -699,6 +1030,34 @@ maintainer-clean: local-maintainer-clean do-maintainer-clean local-clean maintainer-clean: local-distclean realclean: maintainer-clean +# This rule is used to clean specific modules. +.PHONY: $(CLEAN_MODULES) $(CLEAN_X11_MODULES) clean-gcc +$(CLEAN_MODULES) $(CLEAN_X11_MODULES) clean-gcc: + @dir=`echo $@ | sed -e 's/clean-//'`; \ + if [ -f ./$${dir}/Makefile ] ; then \ + r=`pwd`; export r; \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ + (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) clean); \ + else \ + true; \ + fi + +.PHONY: $(CLEAN_TARGET_MODULES) +$(CLEAN_TARGET_MODULES): + @dir=`echo $@ | sed -e 's/clean-target-//'`; \ + rm -f $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/tmpmulti.out; \ + if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \ + r=`pwd`; export r; \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ + (cd $(TARGET_SUBDIR)/$${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) clean); \ + else \ + true; \ + fi + +clean-target: $(CLEAN_TARGET_MODULES) + # Check target. .PHONY: check @@ -734,17 +1093,23 @@ vault-install: install.all: install-no-fixedincludes @if [ -f ./gcc/Makefile ] ; then \ r=`pwd` ; export r ; \ + $(SET_LIB_PATH) \ (cd ./gcc; \ $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \ else \ true ; \ fi +# inet-install is used because the I*Net wants DejaGNU installed but +# not built. Similarly, gzip is built but not installed. +inet-install: + $(MAKE) INSTALL_MODULES="`echo $(INSTALL_MODULES) | sed -e 's/install-dejagnu//' -e 's/install-gzip//'`" install + # install-no-fixedincludes is used because Cygnus can not distribute # the fixed header files. .PHONY: install-no-fixedincludes install-no-fixedincludes: \ - install-dirs \ + installdirs \ $(INSTALL_MODULES) \ $(INSTALL_TARGET_MODULES) \ $(INSTALL_X11_MODULES) \ @@ -763,13 +1128,36 @@ gcc-no-fixedincludes: touch gcc/stmp-fixinc gcc/include/fixed; \ rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \ r=`pwd`; export r; \ - srcroot=`cd $(srcdir); pwd` ; export srcroot; \ + s=`cd $(srcdir); pwd` ; export s; \ + $(SET_LIB_PATH) \ (cd ./gcc; \ $(MAKE) $(GCC_FLAGS_TO_PASS) install); \ rm -rf gcc/include; \ mv gcc/tmp-include gcc/include 2>/dev/null; \ else true; fi +# start-sanitize-ide +# Install Foundry. Avoid installing a bunch of stuff we don't need. +install-foundry: + mods="$(INSTALL_MODULES)"; \ + x11_mods="$(INSTALL_X11_MODULES)"; \ + for d in install-tcl install-tk install-itcl install-tix install-ilu; do \ + mods="`echo $${mods} | sed -e "s/$$d//"`"; \ + x11_mods="`echo $${x11_mods} | sed -e "s/$$d//"`"; \ + done; \ + $(MAKE) INSTALL_MODULES="$${mods}" INSTALL_X11_MODULES="$${x11_mods}" install + for d in tcl tk itcl tix ilu; do \ + if [ -f $$d/Makefile ]; then \ + r=`pwd`; export r; \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ + (cd $$d; $(MAKE) $(FLAGS_TO_PASS) install-minimal); \ + else \ + true; \ + fi; \ + done +# end-sanitize-ide + # 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. # @@ -781,7 +1169,8 @@ $(ALL_MODULES) all-gui all-libproc: @dir=`echo $@ | sed -e 's/all-//'`; \ if [ -f ./$${dir}/Makefile ] ; then \ r=`pwd`; export r; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) all); \ else \ true; \ @@ -797,7 +1186,8 @@ $(NATIVE_CHECK_MODULES): dir=`echo $@ | sed -e 's/check-//'`; \ if [ -f ./$${dir}/Makefile ] ; then \ r=`pwd`; export r; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) check); \ else \ true; \ @@ -808,7 +1198,8 @@ $(CROSS_CHECK_MODULES): @dir=`echo $@ | sed -e 's/check-//'`; \ if [ -f ./$${dir}/Makefile ] ; then \ r=`pwd`; export r; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) check); \ else \ true; \ @@ -817,11 +1208,12 @@ $(CROSS_CHECK_MODULES): # This rule is used to install the modules which use FLAGS_TO_PASS. # To build a target install-X means to cd to X and make install. .PHONY: $(INSTALL_MODULES) -$(INSTALL_MODULES): install-dirs +$(INSTALL_MODULES): installdirs @dir=`echo $@ | sed -e 's/install-//'`; \ if [ -f ./$${dir}/Makefile ] ; then \ r=`pwd`; export r; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) install); \ else \ true; \ @@ -831,28 +1223,94 @@ $(INSTALL_MODULES): install-dirs # target tools. .PHONY: $(CONFIGURE_TARGET_MODULES) $(CONFIGURE_TARGET_MODULES): - @dir=`echo $@ | sed -e 's/configure-//'`; \ - if [ -f ./$${dir}/Makefile ] ; then \ + @dir=`echo $@ | sed -e 's/configure-target-//'`; \ + if [ -d $(TARGET_SUBDIR)/$${dir} ]; then \ + r=`pwd`; export r; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/$${dir}/tmpmulti.out 2> /dev/null; \ + if [ -s $(TARGET_SUBDIR)/$${dir}/tmpmulti.out ]; then \ + if [ -f $(TARGET_SUBDIR)/$${dir}/multilib.out ]; then \ + if cmp $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/tmpmulti.out > /dev/null; then \ + rm -f $(TARGET_SUBDIR)/$${dir}/tmpmulti.out; \ + else \ + echo "Multilibs changed for $${dir}, reconfiguring"; \ + rm -f $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/Makefile; \ + mv $(TARGET_SUBDIR)/$${dir}/tmpmulti.out $(TARGET_SUBDIR)/$${dir}/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/$${dir}/tmpmulti.out $(TARGET_SUBDIR)/$${dir}/multilib.out; \ + fi; \ + fi; \ + fi; exit 0 # break command into two pieces + @dir=`echo $@ | sed -e 's/configure-target-//'`; \ + if [ ! -d $(TARGET_SUBDIR) ]; then \ + true; \ + elif [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \ true; \ elif echo " $(TARGET_CONFIGDIRS) " | grep " $${dir} " >/dev/null 2>&1; then \ if [ -d $(srcdir)/$${dir} ]; then \ - if [ -d ./$${dir} ]; then true; else mkdir $${dir}; fi; \ + [ -d $(TARGET_SUBDIR)/$${dir} ] || mkdir $(TARGET_SUBDIR)/$${dir};\ r=`pwd`; export r; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ + 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; \ CXX="$(CXX_FOR_TARGET)"; export CXX; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + 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; \ - cd $${dir}; \ - $${srcroot}/configure $(CONFIG_ARGUMENTS) --srcdir=$${srcroot}/$${dir}; \ + WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ + 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) $$s/symlink-tree $${topdir}/$${dir} "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}/$${dir}"; \ + libsrcdir="$$s/$${dir}"; \ + fi; \ + if [ -f $${libsrcdir}/configure ] ; then \ + $(SHELL) $${libsrcdir}/configure \ + $(CONFIG_ARGUMENTS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)"; \ + else \ + $(SHELL) $$s/configure \ + $(CONFIG_ARGUMENTS) $${srcdiroption} \ + --with-target-subdir="$(TARGET_SUBDIR)"; \ + fi; \ else \ true; \ - fi \ + fi; \ else \ true; \ fi @@ -861,11 +1319,12 @@ $(CONFIGURE_TARGET_MODULES): # 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); \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ + (cd $(TARGET_SUBDIR)/$${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) all); \ else \ true; \ fi @@ -874,11 +1333,12 @@ $(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); \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ + (cd $(TARGET_SUBDIR)/$${dir};$(MAKE) $(TARGET_FLAGS_TO_PASS) check);\ else \ true; \ fi @@ -887,12 +1347,14 @@ $(CHECK_TARGET_MODULES): # TARGET_FLAGS_TO_PASS. To build a target install-X means to cd to X # and make install. .PHONY: $(INSTALL_TARGET_MODULES) -$(INSTALL_TARGET_MODULES): install-dirs - @dir=`echo $@ | sed -e 's/install-//'`; \ - if [ -f ./$${dir}/Makefile ] ; then \ +$(INSTALL_TARGET_MODULES): installdirs + @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); \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ + (cd $(TARGET_SUBDIR)/$${dir}; \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) install); \ else \ true; \ fi @@ -904,7 +1366,8 @@ $(ALL_X11_MODULES): @dir=`echo $@ | sed -e 's/all-//'`; \ if [ -f ./$${dir}/Makefile ] ; then \ r=`pwd`; export r; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ (cd $${dir}; \ $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all); \ else \ @@ -918,7 +1381,8 @@ $(CHECK_X11_MODULES): @dir=`echo $@ | sed -e 's/check-//'`; \ if [ -f ./$${dir}/Makefile ] ; then \ r=`pwd`; export r; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ (cd $${dir}; \ $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check); \ else \ @@ -928,11 +1392,12 @@ $(CHECK_X11_MODULES): # This rule is used to install the modules which use X11_FLAGS_TO_PASS. # To build a target install-X means to cd to X and make install. .PHONY: $(INSTALL_X11_MODULES) -$(INSTALL_X11_MODULES): +$(INSTALL_X11_MODULES): installdirs @dir=`echo $@ | sed -e 's/install-//'`; \ if [ -f ./$${dir}/Makefile ] ; then \ r=`pwd`; export r; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ (cd $${dir}; \ $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install); \ else \ @@ -944,17 +1409,30 @@ $(INSTALL_X11_MODULES): all-gcc: @if [ -f ./gcc/Makefile ] ; then \ r=`pwd`; export r; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) all); \ else \ true; \ fi +.PHONY: all-bootstrap +all-bootstrap: + @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) bootstrap); \ + else \ + true; \ + fi + .PHONY: check-gcc check-gcc: @if [ -f ./gcc/Makefile ] ; then \ r=`pwd`; export r; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) check); \ else \ true; \ @@ -964,7 +1442,8 @@ check-gcc: install-gcc: @if [ -f ./gcc/Makefile ] ; then \ r=`pwd`; export r; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) install); \ else \ true; \ @@ -975,11 +1454,12 @@ install-gcc: # This rule is used to install the modules which use FLAGS_TO_PASS. # To build a target install-X means to cd to X and make install. .PHONY: install-dosrel -install-dosrel: install-dirs info +install-dosrel: installdirs info @dir=`echo $@ | sed -e 's/install-//'`; \ if [ -f ./$${dir}/Makefile ] ; then \ r=`pwd`; export r; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) install); \ else \ true; \ @@ -989,51 +1469,91 @@ install-dosrel-fake: # This is a list of inter-dependencies among modules. -all-autoconf: all-m4 +all-apache: +all-ash: +all-autoconf: all-m4 all-texinfo +all-automake: +all-bash: all-bfd: -all-binutils: all-libiberty all-opcodes all-bfd all-flex all-byacc +all-binutils: all-libiberty all-opcodes all-bfd all-flex all-bison all-byacc +all-bison: all-texinfo all-byacc: -all-cvs: +all-cvssrc: +configure-target-cygmon: $(ALL_GCC) +all-target-cygmon: configure-target-cygmon all-gas all-ld all-gcc all-target-libiberty all-target-newlib all-target-libio +all-db: all-dejagnu: all-tcl all-expect all-tk all-diff: all-libiberty all-emacs: -all-emacs19: all-byacc +all-emacs19: all-bison all-byacc all-etc: +configure-target-examples: $(ALL_GCC) +all-target-examples: configure-target-examples all-expect: all-tcl all-tk all-fileutils: all-libiberty +all-findutils: all-find: -all-flex: all-libiberty all-byacc +all-flex: all-libiberty all-bison 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-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_GCC = all-gcc +all-gcc: all-bison all-byacc all-binutils all-gas all-ld +all-bootstrap: all-libiberty all-bison all-byacc all-binutils all-gas all-ld +GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui +# start-sanitize-ide +GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui all-libide all-libidetcl +# end-sanitize-ide +all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK) +all-gettext: +all-gnuserv: +configure-target-gperf: $(ALL_GCC) +all-target-gperf: configure-target-gperf all-target-libiberty all-target-libstdc++ +all-gprof: all-libiberty all-bfd all-opcodes all-grep: all-libiberty -all-gui: all-gdb all-libproc all-librx +all-grez: all-libiberty all-bfd all-opcodes +all-gui: all-gdb all-libproc all-target-librx +all-guile: all-gzip: all-libiberty all-hello: all-libiberty +# start-sanitize-ide +all-ilu: +# end-sanitize-ide all-indent: +all-inet: all-tcl all-send-pr all-perl +all-intl: all-ispell: all-emacs19 -all-ld: all-libiberty all-bfd all-byacc all-flex -configure-libg++: all-gcc -all-libg++: configure-libg++ all-gas all-ld all-gcc all-xiberty all-newlib all-libio all-librx all-libstdc++ -configure-libgloss: all-gcc -all-libgloss: configure-libgloss -configure-libio: all-gcc -all-libio: configure-libio all-gas all-ld all-gcc all-xiberty all-newlib +all-itcl: all-tcl all-tk +# start-sanitize-ide +all-jstools: all-tcl all-tk all-tix all-libgui all-libide all-libidetcl +# end-sanitize-ide +all-ld: all-libiberty all-bfd all-opcodes all-bison all-byacc all-flex +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 +check-target-libio: all-target-libstdc++ +all-libgui: all-tcl all-tk all-itcl all-libiberty: -configure-librx: all-gcc all-newlib -all-librx: configure-librx -configure-libstdc++: all-gcc -all-libstdc++: configure-libstdc++ all-gas all-ld all-gcc all-xiberty all-newlib all-libio +# start-sanitize-ide +all-libide: all-ilu +all-libidetcl: all-tcl all-tk all-itcl all-ilu all-libgui all-libide +# end-sanitize-ide +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-libtool: all-m4: all-libiberty all-make: all-libiberty all-mmalloc: -configure-newlib: all-gcc -all-newlib: configure-newlib all-binutils all-gas all-gcc -all-opcodes: all-bfd -all-patch: +configure-target-newlib: $(ALL_GCC) +all-target-newlib: configure-target-newlib all-binutils all-gas all-gcc +all-opcodes: all-bfd all-libiberty +all-patch: all-libiberty +all-perl: all-prms: all-libiberty all-rcs: all-readline: @@ -1041,46 +1561,39 @@ all-recode: all-libiberty all-sed: all-libiberty all-send-pr: all-prms all-shellutils: -all-sim: all-libiberty all-bfd +all-sim: all-libiberty all-bfd all-opcodes all-readline +all-snavigator: all-tcl all-tk all-tix all-itcl all-db all-grep all-tar: all-libiberty all-tcl: all-tclX: all-tcl all-tk all-tk: all-tcl all-texinfo: all-libiberty all-textutils: -all-tgas: all-libiberty all-bfd +all-tgas: all-libiberty all-bfd all-opcodes all-time: +all-tix: all-tcl all-tk +# start-sanitize-ide +all-vmake: all-tcl all-tk all-itcl all-tix all-libgui all-libide all-libidetcl +# end-sanitize-ide all-wdiff: -all-winsup: all-newlib -configure-winsup: configure-newlib +all-target-winsup: all-target-newlib all-target-libiberty all-target-libio configure-target-winsup +configure-target-winsup: configure-target-newlib all-uudecode: all-libiberty -configure-xiberty: all-gcc -all-xiberty: configure-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 +all-target: $(ALL_TARGET_MODULES) +install-target: $(INSTALL_TARGET_MODULES) +# start-sanitize-gdbtk +install-gdbtk: install-tcl install-tk install-itcl install-tix install-libgui install-gdb +#end-sanitize-gdbtk ### other supporting targets MAKEDIRS= \ $(prefix) \ - $(exec_prefix) \ - $(tooldir) - -.PHONY: install-dirs -install-dirs: - @for i in $(MAKEDIRS) ; do \ - echo Making $$i... ; \ - parent=`echo $$i | sed -e 's@/[^/]*$$@@' | sed -e 's@^$$@/@'`; \ - if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi ; \ - if [ ! -d $$i ] ; then \ - if mkdir $$i ; then \ - true ; \ - else \ - exit 1 ; \ - fi ; \ - else \ - true ; \ - fi ; \ - done - + $(exec_prefix) +.PHONY: installdirs +installdirs: mkinstalldirs + $(SHELL) $(srcdir)/mkinstalldirs $(MAKEDIRS) dir.info: do-install-info if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \ @@ -1116,38 +1629,27 @@ 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 \ - mpw-README mpw-build.in mpw-config.in mpw-configure \ - COPYING COPYING.LIB install.sh + mpw-README mpw-build.in mpw-config.in mpw-configure mpw-install \ + COPYING COPYING.LIB install-sh config-ml.in symlink-tree \ + mkinstalldirs ltconfig ltmain.sh missing ylwrap # 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 -ETC_SUPPORT_PFX=configure.info standards.info cfg-paper.info +ETC_SUPPORT= Makefile.in configure configure.in standards.texi \ + make-stds.texi standards.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 -# Files where "byacc" (Cygnus version) should be changed to "bison -y" (FSF). -DISTBISONFILES= binutils/Makefile.in gas/Makefile.in gdb/Makefile.in .PHONY: taz taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \ texinfo/texinfo.tex texinfo/gpl.texinfo texinfo/lgpl.texinfo - # Make sure "diststuff" files get built properly. - for f in $(DISTBISONFILES) ; do \ - if [ -r $$f ]; then \ - sed '/^BISON *=.*$$/s/.*/BISON = bison -y/' <$$f >tmp ; \ - mv -f tmp $$f ; \ - else true; fi ; \ - done - # Take out texinfo from a few places; make simple BISON=bison line. + # Take out texinfo from a few places. sed -e '/^all\.normal: /s/\all-texinfo //' \ -e '/^ install-texinfo /d' \ - -e '/^BISON = /,/^$$/d' \ - -e '/^# BISON:/s/.*/BISON = bison -y/' \ tmp mv -f tmp Makefile.in # @@ -1155,15 +1657,19 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \ @if [ -f .Sanitize ] ; then echo "RUN Sanitize FIRST!" ; false ; fi ; $(end-sanitize-Sanitize) ./configure sun4 + [ -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)" ; \ for d in $$dirs ; do \ if [ -d $$d ]; then \ - if grep '^diststuff:' $$d/Makefile >/dev/null ; then \ - (cd $$d ; $(MAKE) diststuff ) || exit 1 ; \ + 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 ; \ + (cd $$d ; $(MAKE) info ) || exit 1 ; \ fi ; \ if [ -d $$d/proto-$$d.dir ]; then \ ln -s ../$$d/proto-$$d.dir proto-toplev/$$d ; \ @@ -1172,15 +1678,13 @@ 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 \ ln -s ../../etc/$$i . ; \ - done ; \ - for i in $(ETC_SUPPORT_PFX); do \ - ln -s ../../etc/$$i* . ; \ done) # # Take out texinfo from configurable dirs @@ -1189,29 +1693,40 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \ proto-toplev/configure.in # mkdir proto-toplev/texinfo - ln -s ../../texinfo/texinfo.tex proto-toplev/texinfo/ - ln -s ../../texinfo/gpl.texinfo proto-toplev/texinfo/ - ln -s ../../texinfo/lgpl.texinfo proto-toplev/texinfo/ - ln -s ../../texinfo/tex3patch proto-toplev/texinfo/ + ln -s ../../texinfo/texinfo.tex proto-toplev/texinfo/ + ln -s ../../texinfo/gpl.texinfo proto-toplev/texinfo/ + ln -s ../../texinfo/lgpl.texinfo proto-toplev/texinfo/ + if test -r texinfo/util/tex3patch ; then \ + mkdir proto-toplev/texinfo/util && \ + ln -s ../../../texinfo/util/tex3patch proto-toplev/texinfo/util ; \ + else true; fi chmod og=u `find . -print` - (VER=`sed <$(TOOL)/Makefile.in -n 's/^VERSION *= *//p'`; \ - echo "==> Making $(TOOL)-$$VER.tar.gz"; \ - rm -f $(TOOL)-$$VER; ln -s proto-toplev $(TOOL)-$$VER; \ - tar cfh - $(TOOL)-$$VER \ - | $(GZIPPROG) -v -9 >$(TOOL)-$$VER.tar.gz ) + if grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \ + ver=`sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'`; \ + else \ + ver=`sed <$(TOOL)/Makefile.in -n 's/^VERSION *= *//p'`; \ + fi; \ + $(MAKE) -f Makefile.in do-tar-gz TOOL=$(TOOL) VER=$$ver + +do-tar-gz: + echo "==> Making $(TOOL)-$(VER).tar.gz" + -rm -f $(TOOL)-$(VER) + ln -s proto-toplev $(TOOL)-$(VER) + tar cfh $(TOOL)-$(VER).tar $(TOOL)-$(VER) + $(GZIPPROG) -v -9 $(TOOL)-$(VER).tar TEXINFO_SUPPORT= texinfo/texinfo.tex texinfo/gpl.texinfo texinfo/lgpl.texinfo DIST_SUPPORT= $(DEVO_SUPPORT) $(TEXINFO_SUPPORT) .PHONY: gas.tar.gz -GAS_SUPPORT_DIRS= bfd include libiberty opcodes +GAS_SUPPORT_DIRS= bfd include libiberty opcodes setup.com makefile.vms gas.tar.gz: $(DIST_SUPPORT) $(GAS_SUPPORT_DIRS) gas $(MAKE) -f Makefile.in taz TOOL=gas \ SUPPORT_FILES="$(GAS_SUPPORT_DIRS)" # The FSF "binutils" release includes gprof and ld. .PHONY: binutils.tar.gz -BINUTILS_SUPPORT_DIRS= bfd gas include libiberty opcodes ld gprof +BINUTILS_SUPPORT_DIRS= bfd gas include libiberty opcodes ld gprof setup.com makefile.vms binutils.tar.gz: $(DIST_SUPPORT) $(BINUTILS_SUPPORT_DIRS) binutils $(MAKE) -f Makefile.in taz TOOL=binutils \ SUPPORT_FILES="$(BINUTILS_SUPPORT_DIRS) makeall.bat configure.bat" @@ -1223,7 +1738,7 @@ gas+binutils.tar.gz: $(DIST_SUPPORT) $(GASB_SUPPORT_DIRS) gas SUPPORT_FILES="$(GASB_SUPPORT_DIRS) makeall.bat configure.bat" .PHONY: libg++.tar.gz -LIBGXX_SUPPORT_DIRS=include libstdc++ 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)" @@ -1248,15 +1763,12 @@ NEWLIB_SUPPORT_DIRS=libgloss # 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. +# The problem isn't solvable however without a lot of extra work because +# target libraries are built in subdir $(target_alias) which gets nuked during +# the make distclean. For now punt on the issue of shipping newlib info files +# with newlib net releases and wait for a day when some native target (sun4?) +# supports newlib (if only minimally). 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" newlib