X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.in;h=a5a01154a117a56dfee2d29e2e4da39677584083;hb=de9df5fa1def74173d23f492497ab1c59098f78f;hp=334a7741524b95f89f3e5ecefc7e063011ca4e6f;hpb=309dca2a1ebbe8270ab000f2cd4b145923eb43b2;p=deliverable%2Fbinutils-gdb.git diff --git a/Makefile.in b/Makefile.in index 334a774152..a5a01154a1 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # srcdir = . @@ -28,7 +28,7 @@ tooldir = $(exec_prefix)/$(target) program_transform_name = -datadir = $(prefix)/lib +datadir = $(prefix)/share mandir = $(prefix)/man man1dir = $(mandir)/man1 man2dir = $(mandir)/man2 @@ -41,12 +41,11 @@ 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 = $$s/install.sh -c INSTALL_PROGRAM = $(INSTALL) INSTALL_DATA = $(INSTALL) -m 644 INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)' @@ -86,19 +85,26 @@ CXXFLAGS_FOR_TARGET = $(CXXFLAGS) LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates RANLIB = ranlib + +DLLTOOL = dlltool + NM = nm # Not plain GZIP, since gzip looks there for extra command-line options. GZIPPROG = gzip +# These values are substituted by configure. +DEFAULT_YACC = yacc +DEFAULT_LEX = lex + # 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 ; \ + 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 ; \ @@ -117,8 +123,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` @@ -135,11 +141,25 @@ OTHERS = 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. +# 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_MODULES) \ @@ -150,9 +170,13 @@ INSTALL_TARGET = install-dirs \ CC_FOR_TARGET = ` \ - if [ -f $$r/gcc/Makefile ] ; then \ + if [ -f $$r/gcc/xgcc ] ; then \ 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; \ + if [ -f $$r/$(TARGET_SUBDIR)/winsup/Makefile ] ; then \ + echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/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; \ @@ -164,9 +188,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 \ @@ -179,9 +209,13 @@ CHILL_FOR_TARGET = ` \ # end-sanitize-chill CXX_FOR_TARGET = ` \ - if [ -f $$r/gcc/Makefile ] ; then \ + if [ -f $$r/gcc/xgcc ] ; then \ 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; \ + if [ -f $$r/$(TARGET_SUBDIR)/winsup/Makefile ] ; then \ + echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/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; \ @@ -283,7 +317,6 @@ 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)" \ @@ -296,6 +329,7 @@ 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)" \ @@ -318,10 +352,12 @@ EXTRA_HOST_FLAGS = \ 'AS=$(AS)' \ 'CC=$(CC)' \ 'CXX=$(CXX)' \ + 'DLLTOOL=$(DLLTOOL)' \ 'NM=$(NM)' \ - 'RANLIB=$(RANLIB)' + 'RANLIB=$(RANLIB)' -FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) + +FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(HOST_FLAGS) # Flags that are concerned with the location of the X11 include files # and library files @@ -362,23 +398,44 @@ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) # If any variables are added here, they must be added to do-*, below. # The HOST_* variables are a special case, which are used for the gcc # cross-building scheme. +# The condition for setting GCC_FOR_TARGET is so that if CC_FOR_TARGET +# is overridden on the command line we use that value for +# GCC_FOR_TARGET, and, if it is not, we use the value of +# GCC_FOR_TARGET. We do this because the default value of +# CC_FOR_TARGET depends on gcc/xgcc, which won't exist when we first +# go into the gcc directory. FIXME: The test won't work correctly for +# older non-Posix make programs that do not set MAKEFLAGS; in that +# case, overriding CC_FOR_TARGET on the command line will not affect +# GCC_FOR_TARGET. EXTRA_GCC_FLAGS = \ 'AR=$$(AR_FOR_TARGET)' \ '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)' \ + 'GCC_FOR_TARGET=$(GCC_FOR_TARGET)' \ + `if test x"$(LANGUAGES)" != x; then echo "LANGUAGES=$(LANGUAGES)"; fi` \ + `if test x"$(STMP_FIXPROTO)" != x; then echo "STMP_FIXPROTO=$(STMP_FIXPROTO)"; fi` \ + `if test x"$(LIMITS_H_TEST)" != x; then echo "LIMITS_H_TEST=$(LIMITS_H_TEST)"; fi` \ + `if test x"$(LIBGCC1_TEST)" != x; then echo "LIBGCC1_TEST=$(LIBGCC1_TEST)"; fi` \ + `if test x"$(LIBGCC2_CFLAGS)" != x; then echo "LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)"; fi` \ + `if test x"$(LIBGCC2_INCLUDES)" != x; then echo "LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)"; fi` \ + `if test x"$(ENQUIRE)" != x; then echo "ENQUIRE=$(ENQUIRE)"; fi` \ + `if test x"$(BOOT_CFLAGS)" != x; then echo "BOOT_CFLAGS=$(BOOT_CFLAGS)"; fi` 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-autoconf \ + all-bash \ all-bfd \ all-binutils \ all-byacc \ @@ -394,9 +451,11 @@ ALL_MODULES = \ all-gawk \ all-gprof \ all-grep \ + all-grez \ all-gzip \ all-hello \ all-indent \ + all-inet \ all-ispell \ all-ld \ all-libiberty \ @@ -405,6 +464,7 @@ ALL_MODULES = \ all-mmalloc \ all-opcodes \ all-patch \ + all-perl \ all-prms \ all-rcs \ all-readline \ @@ -423,8 +483,6 @@ ALL_MODULES = \ all-uudecode \ 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). # @@ -436,7 +494,9 @@ NATIVE_CHECK_MODULES = \ check-flex CROSS_CHECK_MODULES = \ + check-apache \ check-autoconf \ + check-bash \ check-bfd \ check-binutils \ check-cvs \ @@ -452,6 +512,7 @@ CROSS_CHECK_MODULES = \ check-gzip \ check-hello \ check-indent \ + check-inet \ check-ispell \ check-ld \ check-libiberty \ @@ -460,6 +521,7 @@ CROSS_CHECK_MODULES = \ check-mmcheckoc \ check-opcodes \ check-patch \ + check-perl \ check-prms \ check-rcs \ check-readline \ @@ -482,7 +544,9 @@ 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). INSTALL_MODULES = \ + install-apache \ install-autoconf \ + install-bash \ install-bfd \ install-binutils \ install-byacc \ @@ -498,9 +562,11 @@ INSTALL_MODULES = \ install-gawk \ install-gprof \ install-grep \ + install-grez \ install-gzip \ install-hello \ install-indent \ + install-inet \ install-ispell \ install-ld \ install-libiberty \ @@ -509,6 +575,7 @@ INSTALL_MODULES = \ install-mmalloc \ install-opcodes \ install-patch \ + install-perl \ install-prms \ install-rcs \ install-readline \ @@ -534,6 +601,7 @@ ALL_X11_MODULES = \ all-gdb \ all-expect \ all-gash \ + all-guile \ all-tclX \ all-tk @@ -542,6 +610,7 @@ ALL_X11_MODULES = \ CHECK_X11_MODULES = \ check-emacs \ check-gdb \ + check-guile \ check-expect \ check-gash \ check-tclX \ @@ -553,6 +622,7 @@ INSTALL_X11_MODULES = \ install-emacs \ install-emacs19 \ install-gdb \ + install-guile \ install-expect \ install-gash \ install-tclX \ @@ -560,7 +630,6 @@ INSTALL_X11_MODULES = \ # This is a list of the targets for all of the modules which are compiled # using $(TARGET_FLAGS_TO_PASS). -# RENAME these all-xinberty should be all-target-libiberty ALL_TARGET_MODULES = \ all-target-libio \ all-target-libstdc++ \ @@ -569,7 +638,8 @@ ALL_TARGET_MODULES = \ all-target-newlib \ all-target-winsup \ all-target-libgloss \ - all-target-libiberty + all-target-libiberty \ + all-target-examples # This is a list of the configure targets for all of the modules which # are compiled using the target tools. @@ -581,7 +651,8 @@ CONFIGURE_TARGET_MODULES = \ configure-target-newlib \ configure-target-winsup \ configure-target-libgloss \ - configure-target-libiberty + configure-target-libiberty \ + configure-target-examples # This is a list of the check targets for all of the modules which are # compiled using $(TARGET_FLAGS_TO_PASS). @@ -595,7 +666,6 @@ CHECK_TARGET_MODULES = \ # 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-target-libio \ install-target-libstdc++ \ @@ -605,6 +675,81 @@ INSTALL_TARGET_MODULES = \ install-target-libgloss \ install-target-libiberty +# This is a list of the targets for which we can do a clean-{target}. +CLEAN_MODULES = \ + clean-apache \ + clean-autoconf \ + clean-bash \ + clean-bfd \ + clean-binutils \ + clean-byacc \ + clean-cvs \ + clean-dejagnu \ + clean-diff \ + clean-dosutils \ + clean-etc \ + clean-fileutils \ + clean-find \ + clean-flex \ + clean-gas \ + clean-gawk \ + clean-gprof \ + clean-grep \ + clean-grez \ + clean-gzip \ + clean-hello \ + clean-indent \ + clean-inet \ + clean-ispell \ + clean-ld \ + clean-libiberty \ + 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-tar \ + clean-tcl \ + clean-texinfo \ + clean-textutils \ + clean-tgas \ + clean-time \ + clean-uudecode \ + 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-examples + +# 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 + # The first rule in the file had better be this one. Don't put any above it. all: all.normal .PHONY: all @@ -638,40 +783,47 @@ DO_X = \ $(DO_X): @target=`echo $@ | sed -e 's/^do-//'`; \ r=`pwd`; export r; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ for i in $(SUBDIRS) -dummy-; do \ if [ -f ./$$i/Makefile ]; then \ case $$i in \ 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 NM RANLIB DLLTOOL; \ if (cd ./$$i; \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" \ $${target}); \ then true; else exit 1; fi; \ else true; fi; \ - done;\ + 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'|"`; \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'|"`; \ done; \ - export AR AS CC CXX NM RANLIB; \ + export AR AS CC CXX NM RANLIB DLLTOOL; \ if (cd $(TARGET_SUBDIR)/$$i; \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" \ $${target}); \ then true; else exit 1; fi; \ else true; fi; \ @@ -687,7 +839,7 @@ installcheck: do-installcheck dvi: do-dvi 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 @@ -697,6 +849,9 @@ 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;" @@ -709,6 +864,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 @@ -744,12 +927,18 @@ 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 @@ -773,7 +962,8 @@ 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; \ @@ -791,7 +981,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; \ @@ -807,7 +998,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; \ @@ -818,7 +1010,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; \ @@ -831,7 +1024,8 @@ $(INSTALL_MODULES): install-dirs @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; \ @@ -842,27 +1036,91 @@ $(INSTALL_MODULES): install-dirs .PHONY: $(CONFIGURE_TARGET_MODULES) $(CONFIGURE_TARGET_MODULES): @dir=`echo $@ | sed -e 's/configure-target-//'`; \ - if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \ + 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 \ [ -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; \ NM="$(NM_FOR_TARGET)"; export NM; \ RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \ + echo Configuring in $(TARGET_SUBDIR)/$${dir}; \ cd $(TARGET_SUBDIR)/$${dir}; \ - $${srcroot}/configure $(CONFIG_ARGUMENTS) --srcdir=$${srcroot}/$${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 @@ -874,7 +1132,8 @@ $(ALL_TARGET_MODULES): @dir=`echo $@ | sed -e 's/all-target-//'`; \ if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \ r=`pwd`; export r; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ (cd $(TARGET_SUBDIR)/$${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) all); \ else \ true; \ @@ -887,7 +1146,8 @@ $(CHECK_TARGET_MODULES): @dir=`echo $@ | sed -e 's/check-target-//'`; \ if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \ r=`pwd`; export r; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ (cd $(TARGET_SUBDIR)/$${dir};$(MAKE) $(TARGET_FLAGS_TO_PASS) check);\ else \ true; \ @@ -901,7 +1161,8 @@ $(INSTALL_TARGET_MODULES): install-dirs @dir=`echo $@ | sed -e 's/install-target-//'`; \ if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \ r=`pwd`; export r; \ - srcroot=`cd $(srcdir); pwd`; export srcroot; \ + s=`cd $(srcdir); pwd`; export s; \ + $(SET_LIB_PATH) \ (cd $(TARGET_SUBDIR)/$${dir}; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install); \ else \ @@ -915,7 +1176,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 \ @@ -929,7 +1191,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 \ @@ -943,7 +1206,8 @@ $(INSTALL_X11_MODULES): @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 \ @@ -955,17 +1219,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; \ @@ -975,7 +1252,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; \ @@ -990,7 +1268,8 @@ install-dosrel: install-dirs 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; \ @@ -1000,7 +1279,9 @@ install-dosrel-fake: # This is a list of inter-dependencies among modules. +all-apache: all-autoconf: all-m4 +all-bash: all-bfd: all-binutils: all-libiberty all-opcodes all-bfd all-flex all-byacc all-byacc: @@ -1010,6 +1291,8 @@ all-diff: all-libiberty all-emacs: all-emacs19: 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-find: @@ -1019,19 +1302,24 @@ all-gash: all-tcl all-gawk: 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-bootstrap: all-libiberty all-byacc all-binutils all-gas all-ld +GDB_TK = all-tk all-tcl +all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK) +all-gprof: all-libiberty all-bfd all-opcodes all-grep: all-libiberty +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 all-indent: +all-inet: all-tcl all-send-pr all-perl all-ispell: all-emacs19 -all-ld: all-libiberty all-bfd all-byacc all-flex -configure-target-libg++: $(ALL_GCC) +all-ld: all-libiberty all-bfd all-opcodes 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 +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: @@ -1044,8 +1332,9 @@ all-make: all-libiberty all-mmalloc: configure-target-newlib: $(ALL_GCC) all-target-newlib: configure-target-newlib all-binutils all-gas all-gcc -all-opcodes: all-bfd -all-patch: +all-opcodes: all-bfd all-libiberty +all-patch: all-libiberty +all-perl: all-prms: all-libiberty all-rcs: all-readline: @@ -1053,29 +1342,29 @@ 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-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-wdiff: -all-target-winsup: all-target-newlib configure-target-winsup +all-target-winsup: all-target-newlib all-target-libiberty configure-target-winsup configure-target-winsup: configure-target-newlib all-uudecode: all-libiberty 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) ### other supporting targets MAKEDIRS= \ $(prefix) \ - $(exec_prefix) \ - $(tooldir) - + $(exec_prefix) .PHONY: install-dirs install-dirs: @for i in $(MAKEDIRS) ; do \ @@ -1129,12 +1418,12 @@ Makefile: Makefile.in configure.in $(host_makefile_frag) $(target_makefile_frag) 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 cfg-ml-com.in cfg-ml-pos.in + 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 \ +ETC_SUPPORT= Makefile.in cfg-paper.texi configure configure.in configure.man \ configure.texi standards.texi make-stds.texi \ configure.info* standards.info* cfg-paper.info* @@ -1169,7 +1458,7 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \ ./configure sun4 [ -z "$(CONFIGURE_TARGET_MODULES)" ] \ || $(MAKE) $(CONFIGURE_TARGET_MODULES) ALL_GCC="" \ - CC_FOR_TARGET="$(CC) CXX_FOR_TARGET="$(CXX)" + 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)" ; \ @@ -1203,29 +1492,36 @@ 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 ) + $(MAKE) -f Makefile.in do-tar-gz TOOL=$(TOOL) \ + VER=`sed <$(TOOL)/Makefile.in -n 's/^VERSION *= *//p'` + +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 make-all.com setup.com 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 make-all.com setup.com 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" @@ -1262,15 +1558,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