From 041038455c50ba7e356401b718f93574e168ecfc Mon Sep 17 00:00:00 2001 From: David Edelsohn Date: Fri, 23 Jun 1995 00:25:15 +0000 Subject: [PATCH] (newlib.tar.gz): Configure newlib subdir so .info files are made. --- Makefile.in | 55 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4a9f5bc..bfa117c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -42,6 +42,7 @@ man9dir = $(mandir)/man9 infodir = $(prefix)/info includedir = $(prefix)/include docdir = $(datadir)/doc +GDB_NLM_DEPS = SHELL = /bin/sh @@ -69,6 +70,8 @@ CFLAGS = -g LIBCFLAGS = $(CFLAGS) CFLAGS_FOR_TARGET = $(CFLAGS) LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) +PICFLAG = +PICFLAG_FOR_TARGET = # start-sanitize-chill CHILLFLAGS = $(CFLAGS) @@ -157,7 +160,7 @@ CC_FOR_TARGET = ` \ # 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); \ @@ -259,11 +262,13 @@ BASE_FLAGS_TO_PASS = \ "LEX=$(LEX)" \ "LIBCFLAGS=$(LIBCFLAGS)" \ "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ - "LIBCXXFLAGS=$(LIBCFLAGS)" \ - "LIBCXXFLAGS_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)" \ @@ -308,6 +313,7 @@ EXTRA_TARGET_FLAGS = \ '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) @@ -348,7 +354,6 @@ ALL_MODULES = \ all-flex \ all-gas \ all-gawk \ - all-gdb \ all-gprof \ all-grep \ all-gzip \ @@ -404,7 +409,6 @@ CROSS_CHECK_MODULES = \ check-find \ check-gas \ check-gawk \ - check-gdb \ check-gprof \ check-grep \ check-gzip \ @@ -454,8 +458,6 @@ INSTALL_MODULES = \ install-flex \ install-gas \ install-gawk \ - install-gdb \ - install-glob \ install-gprof \ install-grep \ install-gzip \ @@ -491,6 +493,7 @@ INSTALL_MODULES = \ ALL_X11_MODULES = \ all-emacs \ all-emacs19 \ + all-gdb \ all-expect \ all-gash \ all-tclX \ @@ -500,6 +503,7 @@ ALL_X11_MODULES = \ # compiled using $(X11_FLAGS_TO_PASS). CHECK_X11_MODULES = \ check-emacs \ + check-gdb \ check-expect \ check-gash \ check-tclX \ @@ -510,6 +514,7 @@ CHECK_X11_MODULES = \ INSTALL_X11_MODULES = \ install-emacs \ install-emacs19 \ + install-gdb \ install-expect \ install-gash \ install-tclX \ @@ -659,12 +664,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) ; \ @@ -714,13 +727,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; \ @@ -922,9 +934,8 @@ 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-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-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 @@ -933,7 +944,7 @@ all-hello: all-libiberty all-indent: all-ispell: all-emacs19 all-ld: all-libiberty all-bfd all-byacc all-flex -all-libg++: all-gas all-ld all-gcc all-xiberty all-newlib all-libio all-librx +all-libg++: all-gas all-ld all-gcc all-xiberty all-newlib all-libio all-librx all-libstdc++ all-libio: all-gas all-ld all-gcc all-xiberty all-newlib all-libiberty: all-libstdc++: all-gas all-ld all-gcc all-xiberty all-newlib all-libio @@ -1081,8 +1092,7 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \ if [ -d $$d ]; then \ case " $$p " in \ *" $$d "*) \ - echo making diststuff in $$d ; \ - (cd $$d ; pwd ; $(MAKE) diststuff ) || exit 1 ;; \ + (cd $$d ; $(MAKE) diststuff ) || exit 1 ;; \ esac ; \ if [ -d $$d/proto-$$d.dir ]; then \ ln -s ../$$d/proto-$$d.dir proto-toplev/$$d ; \ @@ -1102,10 +1112,9 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \ ln -s ../../etc/$$i* . ; \ 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 @@ -1154,14 +1163,20 @@ 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 gdb.tar.gz: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb $(MAKE) -f Makefile.in taz TOOL=gdb \ SUPPORT_FILES="$(GDB_SUPPORT_DIRS)" .PHONY: newlib.tar.gz NEWLIB_SUPPORT_DIRS= +# taz configures for the sun4 target which won't configure newlib. +# compensate here by configuring newlib for a simple (no multilib support) +# cross target (sparc64). newlib.tar.gz: $(DIST_SUPPORT) $(NEWLIB_SUPPORT_DIRS) newlib + rootme=`pwd` ; \ + cd newlib && ../configure --srcdir $$rootme/newlib \ + --host sun4 --target sparc64-elf $(MAKE) -f Makefile.in taz TOOL=newlib \ SUPPORT_FILES="$(NEWLIB_SUPPORT_DIRS)" \ DEVO_SUPPORT="$(DEVO_SUPPORT) COPYING.NEWLIB" \ -- 2.7.4