X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=Makefile.in;h=ea6efdd7f47ea4b16cda1aa88d8d610dc6e490af;hb=a4e879a1a11f5753c5d998547c6e5f2e024490f5;hp=a923015eaf67a407ded5e0625b49e4aaa42d5bba;hpb=34b3298baa2e3cd3d35ac1a6b195ad445d11bf84;p=deliverable%2Fbinutils-gdb.git

diff --git a/Makefile.in b/Makefile.in
index a923015eaf..ea6efdd7f4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -54,10 +54,10 @@ AR = ar
 AR_FLAGS = rc
 CC = cc
 CFLAGS = -g
-$(start-sanitize-chill)
+# start-sanitize-chill
 CHILLFLAGS = $(CFLAGS)
 CHILL_LIB = -lchill
-$(end-sanitize-chill)
+# end-sanitize-chill
 CXX = gcc
 CXXFLAGS = -g -O
 RANLIB = ranlib
@@ -106,7 +106,7 @@ CC_FOR_TARGET = ` \
     fi; \
   fi`
 
-$(start-sanitize-chill)
+# start-sanitize-chill
 CHILL_FOR_TARGET = ` \
   if [ -f $${rootme}/gcc/Makefile ] ; then \
     echo $${rootme}/gcc/xgcc -B$${rootme}/gcc/ -L$${rootme}/chillrt/; \
@@ -118,12 +118,7 @@ CHILL_FOR_TARGET = ` \
     fi; \
   fi`
 
-## This is ugly, but I don't want GNU make to put these variables in
-## the environment.  Older makes will see this as a set of targets
-## with no dependencies and no actions.
-unexport CHILLFLAGS CHILL_LIB CHILL_FOR_TARGET :
-
-$(end-sanitize-chill)
+# end-sanitize-chill
 
 CXX_FOR_TARGET = ` \
   if [ -f $${rootme}/gcc/Makefile ] ; then \
@@ -192,7 +187,7 @@ XTRAFLAGS = ` \
      echo ; \
   fi`
 
-PRMS = all-prms
+PRMS = install-prms
 
 #### host and target specific makefile fragments come in here.
 ###
@@ -207,11 +202,11 @@ BASE_FLAGS_TO_PASS = \
 	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
 	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
 	"CFLAGS=$(CFLAGS)" \
-$(start-sanitize-chill)\
+	$(start-sanitize-chill)\
 	"CHILLFLAGS=$(CHILLFLAGS)" \
 	"CHILL_FOR_TARGET=$(CHILL_FOR_TARGET)" \
 	"CHILL_LIB=$(CHILL_LIB)" \
-$(end-sanitize-chill)\
+	$(end-sanitize-chill)\
 	"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
 	"CXXFLAGS=$(CXXFLAGS)" \
 	"CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
@@ -254,9 +249,9 @@ X11_FLAGS_TO_PASS = \
 
 # Shell case of subdirectories which are built with the target environment.
 TARGET_LIBS=libg++ | xiberty | newlib
-$(start-sanitize-chill)
+# start-sanitize-chill
 TARGET_LIBS=libg++ | xiberty | newlib | chillrt
-$(end-sanitize-chill)
+# end-sanitize-chill
 
 # Flags to pass down to makes which are built with the target environment.
 # The double $ decreases the length of the command line; the variables
@@ -291,12 +286,19 @@ GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS)
 # The first rule in the file had better be this one.  Don't put any above it.
 all:	$(ALL)
 
-.PHONY: all check dvi info install-info install-info-dirs
-.PHONY: do-info do-check do-dvi do-install-info
+.PHONY: all check installcheck dvi info install-info install-info-dirs
+.PHONY: do-info do-check do-installcheck do-dvi do-install-info
 .PHONY: do-clean do-mostlyclean do-distclean do-realclean
 .NOEXPORT:
 MAKEOVERRIDES=
 
+# start-sanitize-chill
+## This is ugly, but I don't want GNU make to put these variables in
+## the environment.  Older makes will see this as a set of targets
+## with no dependencies and no actions.
+unexport CHILLFLAGS CHILL_LIB CHILL_FOR_TARGET :
+# end-sanitize-chill
+
 # Do a target for all the subdirectories.  A ``make do-X'' will do a
 # ``make X'' in all subdirectories (because, in general, there is a
 # dependency (below) of X upon do-X, a ``make X'' will also do this,
@@ -304,7 +306,7 @@ MAKEOVERRIDES=
 # This target ensures that $(BASE_FLAGS_TO_PASS) appears only once,
 # because it is so large that it can easily overflow the command line
 # length limit on some systems.
-do-info do-check do-dvi do-install-info do-clean do-mostlyclean do-distclean do-realclean:
+do-info do-check do-installcheck do-dvi do-install-info do-clean do-mostlyclean do-distclean do-realclean:
 	@target=`echo $@ | sed -e 's/^do-//'`; \
 	rootme=`pwd`; export rootme; \
 	srcroot=`cd $(srcdir); pwd`; export srcroot; \
@@ -339,6 +341,7 @@ do-info do-check do-dvi do-install-info do-clean do-mostlyclean do-distclean do-
 
 info: do-info
 check: do-check
+installcheck: do-installcheck
 dvi: do-dvi
 
 install-info: install-info-dirs do-install-info dir.info
@@ -358,7 +361,7 @@ all.normal: all-m4 all-autoconf all-libiberty all-mmalloc all-texinfo \
 	$(start-sanitize-chill) \
 	all-chillrt \
 	$(end-sanitize-chill) \
-	all-gprof all-prms all-send-pr all-libm all-deja-gnu \
+	all-gprof all-prms all-send-pr all-libm all-dejagnu \
 	all-fileutils all-find all-gawk all-sed all-shellutils \
 	all-textutils all-time all-wdiff all-uudecode \
 	all-hello all-tar all-gzip all-indent all-recode
@@ -370,7 +373,7 @@ all.cross: all-libiberty all-mmalloc all-gas all-byacc all-flex all-ld \
 	$(start-sanitize-chill) \
 	all-chillrt \
 	$(end-sanitize-chill) \
-	all-deja-gnu
+	all-dejagnu
 
 .PHONY: clean distclean mostlyclean realclean local-clean local-distclean
 
@@ -411,7 +414,7 @@ install-no-fixedincludes: install-dirs gcc-no-fixedincludes \
 	install-chillrt \
 	$(end-sanitize-chill) \
 	install-cvs \
-	install-deja-gnu \
+	install-dejagnu \
 	install-diff \
 	install-emacs \
 	install-etc \
@@ -484,7 +487,7 @@ install.cross: install-dirs install-libiberty install-mmalloc \
 	$(start-sanitize-chill) \
 	install-chillrt \
 	$(end-sanitize-chill) \
-	install-gcc install-etc install-deja-gnu
+	install-gcc install-etc install-dejagnu
 
 ### gzip
 all-gzip: all-libiberty
@@ -572,19 +575,19 @@ install-tar: force
 	fi
 
 
-### deja-gnu
-all-deja-gnu: force
-	@if [ -f ./deja-gnu/Makefile ] ; then \
+### dejagnu
+all-dejagnu: force
+	@if [ -f ./dejagnu/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
-		(cd ./deja-gnu; $(MAKE) $(FLAGS_TO_PASS) all) ; \
+		(cd ./dejagnu; $(MAKE) $(FLAGS_TO_PASS) all) ; \
 	else \
 		true ; \
 	fi
 
-install-deja-gnu: force
-	@if [ -f ./deja-gnu/Makefile ] ; then \
+install-dejagnu: force
+	@if [ -f ./dejagnu/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
-		(cd ./deja-gnu;	$(MAKE) $(FLAGS_TO_PASS) install) ; \
+		(cd ./dejagnu;	$(MAKE) $(FLAGS_TO_PASS) install) ; \
 	else \
 		true ; \
 	fi