X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=Makefile.in;h=7802d6c9e8afcde0a75d70b6c079bc17683f32d3;hb=3032863605b618e148942c75b251f41616b5db25;hp=2d3a59043d86de12c80f3c198e34337f4661d8d3;hpb=5148923360989fb54088f499e4b4cefd14088f9a;p=deliverable%2Fbinutils-gdb.git

diff --git a/Makefile.in b/Makefile.in
index 2d3a59043d..7802d6c9e8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -49,6 +49,7 @@ INSTALL = install -c
 INSTALL_PROGRAM = $(INSTALL)
 INSTALL_DATA = $(INSTALL)
 
+AS = as
 AR = ar
 AR_FLAGS = qc
 CFLAGS = -g
@@ -68,6 +69,10 @@ MAKEINFO = `if [ -f $${rootme}/texinfo/C/makeinfo ] ; \
 	then echo $${rootme}/texinfo/C/makeinfo ; \
 	else echo makeinfo ; fi`
 
+# C compiler to use to create programs which must be run in the build
+# environment.
+CC_FOR_BUILD = $(CC)
+
 SUBDIRS = libiberty mmalloc glob readline opcodes bfd gdb  binutils ld gas tgas gcc libg++ newlib
 OTHERS = 
 
@@ -88,6 +93,17 @@ CC_FOR_TARGET = ` \
     fi; \
   fi`
 
+AS_FOR_TARGET = ` \
+  if [ -f $${rootme}/gas/Makefile ] ; then \
+    echo $${rootme}/gas/as.new ; \
+  else \
+    if [ "$(host_cpu)-$(host_vendor)-$(host_os)" = "$(target_cpu)-$(target_vendor)-$(target_os)" ] ; then \
+      echo $(AS); \
+    else \
+       t='$(program_transform_name)'; echo as | sed -e '' $$t ; \
+    fi \
+  fi`
+
 AR_FOR_TARGET = ` \
   if [ -f $${rootme}/binutils/Makefile ] ; then \
     echo $${rootme}/binutils/ar ; \
@@ -123,10 +139,10 @@ NM_FOR_TARGET = ` \
 
 XTRAFLAGS = ` \
   if [ -f $${rootme}/gcc/Makefile ] ; then \
-    if [ "$(host_cpu)-$(host_vendor)-$(host_os)" = "$(target_cpu)-$(target_vendor)-$(target_os)" ] ; then \
-      echo -I$${rootme}/gcc/include ; \
+    if [ -f $${rootme}/newlib/Makefile ] ; then \
+      echo -I$${rootme}/newlib/targ-include -I$${srcroot}/newlib/libc/include -I$${rootme}/gcc/include -nostdinc ; \
     else \
-      echo -I$${rootme}/gcc/include -I$${srcroot}/newlib/libc/include ; \
+      echo -I$${rootme}/gcc/include ; \
     fi ; \
   else \
      echo ; \
@@ -152,7 +168,8 @@ FLAGS_TO_PASS = \
 	"MAKEINFO=$(MAKEINFO)" \
 	"INSTALL=$(INSTALL)" \
 	"INSTALL_DATA=$(INSTALL_DATA)" \
-	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)"
+	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+	"CC_FOR_BUILD=$(CC_FOR_BUILD)"
 
 # Flags to pass down to makes which are built with the target
 # environment (e.g. libg++, xiberty, newlib).
@@ -170,7 +187,9 @@ TARGET_FLAGS_TO_PASS = \
 	"INSTALL=$(INSTALL)" \
 	"INSTALL_DATA=$(INSTALL_DATA)" \
 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
 	"CC=$(CC_FOR_TARGET)" \
+	"AS=$(AS_FOR_TARGET)" \
 	"AR=$(AR_FOR_TARGET)" \
 	"RANLIB=$(RANLIB_FOR_TARGET)" \
 	"NM=$(NM_FOR_TARGET)" \
@@ -189,7 +208,7 @@ check:
 
 clean-info:
 	@rootme='pwd' ; export rootme ; $(MAKE) $(FLAGS_TO_PASS) DO=clean-info "DODIRS=$(SUBDIRS)" subdir_do
-	
+
 install-info: install-info-dirs force
 	-parent=`echo $(infodir)|sed -e 's@/[^/]*$$@@'`; \
 	if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi
@@ -220,7 +239,7 @@ clean: clean-autoconf clean-libiberty clean-mmalloc clean-texinfo \
 	clean-gcc clean-readline clean-glob clean-gdb \
 	clean-make clean-diff clean-grep clean-rcs \
 	clean-cvs clean-patch clean-emacs clean-ispell \
-	clean-libg++ clean-gprof clean-send_pr clean-libm
+	clean-libg++ clean-gprof clean-send_pr clean-libm clean-xiberty
 	-rm -rf *.a TEMP errs core *.o *~ \#* TAGS *.E
 
 clean-stamps:
@@ -239,7 +258,7 @@ install.all: install-no-fixedincludes
 	else \
 		true ; \
 	fi
- 
+
 install-no-fixedincludes: install-dirs gcc-no-fixedincludes \
 	install-autoconf \
 	install-bfd \
@@ -364,6 +383,37 @@ install-libiberty: force
 		true ; \
 	fi
 
+### xiberty
+all-xiberty: all-gcc all-newlib
+	@if [ -f ./xiberty/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		srcroot=`cd $(srcdir); pwd`; export srcroot ; \
+		(cd ./xiberty; \
+		$(MAKE) $(FLAGS_TO_PASS) all) ; \
+	else \
+		true ; \
+	fi
+
+clean-xiberty: force
+	@if [ -f ./xiberty/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		srcroot=`cd $(srcdir); pwd`; export srcroot ; \
+		(cd ./xiberty; \
+		$(MAKE) $(FLAGS_TO_PASS) clean) ; \
+	else \
+		true ; \
+	fi
+
+install-xiberty: force
+	@if [ -f ./xiberty/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		srcroot=`cd $(srcdir); pwd`; export srcroot ; \
+		(cd ./xiberty; \
+		$(MAKE) $(FLAGS_TO_PASS) install) ; \
+	else \
+		true ; \
+	fi
+
 ### mmalloc
 all-mmalloc: force
 	@if [ -f ./mmalloc/Makefile ] ; then \
@@ -1224,8 +1274,8 @@ Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag)
 # Build GDB distributions that contain BFD, Include, Libiberty, Readline, etc
 
 DEVO_SUPPORT= README cfg-paper.texi Makefile.in configure configure.in \
-	config.sub config configure.man move-if-change
-GDB_SUPPORT_DIRS= bfd include libiberty mmalloc readline glob
+	config.sub config configure.man configure.texi move-if-change
+GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline glob
 GDB_SUPPORT_FILES= $(GDB_SUPPORT_DIRS) texinfo/fsf/texinfo.tex
 
 setup-dirs: force_update
@@ -1234,11 +1284,6 @@ setup-dirs: force_update
 	./configure -rm sun4
 	chmod og=u `find $(DEVO_SUPPORT) $(GDB_SUPPORT_FILES) -print`
 
-bfd.ilrt.tar.Z: setup-dirs
-	rm -f bfd.ilrt.tar.Z
-	tar cf - $(DEVO_SUPPORT) $(GDB_SUPPORT_FILES) \
-		| compress -v >bfd.ilrt.tar.Z
-
 gdb.tar.Z: setup-dirs
 	(cd gdb; $(MAKE) -f Makefile.in make-proto-gdb.dir)
 	$(MAKE) $(MFLAGS) -f Makefile.in make-gdb.tar.Z