X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=Makefile.in;h=04b4896735bfe1a4869e3489c0d94fc894bc53c1;hb=19bc147e8593898758ab581387413ef6be99a7c4;hp=29eccd4097993887c0b1f3930202119a51e71e49;hpb=6b4f31d97f6cffa52ce5a887825256c573390b7c;p=deliverable%2Fbinutils-gdb.git

diff --git a/Makefile.in b/Makefile.in
index 29eccd4097..04b4896735 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -105,10 +105,18 @@ GZIPPROG = gzip
 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 ${DEFAULT_YACC} ; \
+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 ] ; \
@@ -182,7 +190,7 @@ CC_FOR_TARGET = ` \
   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/newlib/ -L$$r/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
+        echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/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; \
@@ -237,8 +245,8 @@ CXX_FOR_TARGET = ` \
   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); \
@@ -248,8 +256,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); \
@@ -303,8 +311,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); \
@@ -360,7 +368,7 @@ BASE_FLAGS_TO_PASS = \
 	"RUNTEST=$(RUNTEST)" \
 	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
 	"WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \
-	"YACC=$(BISON)" \
+	"YACC=$(YACC)" \
 	"exec_prefix=$(exec_prefix)" \
 	"prefix=$(prefix)" \
 	"tooldir=$(tooldir)" 
@@ -434,15 +442,15 @@ EXTRA_GCC_FLAGS = \
 	'RANLIB=$$(RANLIB_FOR_TARGET)' \
 	'WINDRES=$$(WINDRES_FOR_TARGET)' \
 	"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
-	"`if test x"$(LANGUAGES)" != x; then echo "LANGUAGES=$(LANGUAGES)"; else echo "XFOO=bar"; fi`" \
-	"`if test x"$(STMP_FIXPROTO)" != x; then echo "STMP_FIXPROTO=$(STMP_FIXPROTO)"; else echo "XFOO=bar"; fi`" \
-	"`if test x"$(LIMITS_H_TEST)" != x; then echo "LIMITS_H_TEST=$(LIMITS_H_TEST)"; else echo "XFOO=bar"; fi`" \
-	"`if test x"$(LIBGCC1_TEST)" != x; then echo "LIBGCC1_TEST=$(LIBGCC1_TEST)"; else echo "XFOO=bar"; fi`" \
-	"`if test x"$(LIBGCC2_CFLAGS)" != x; then echo "LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)"; else echo "XFOO=bar"; fi`" \
-	"`if test x"$(LIBGCC2_DEBUG_CFLAGS)" != x; then echo "LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)"; else echo "XFOO=bar"; fi`" \
-	"`if test x"$(LIBGCC2_INCLUDES)" != x; then echo "LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)"; else echo "XFOO=bar"; fi`" \
-	"`if test x"$(ENQUIRE)" != x; then echo "ENQUIRE=$(ENQUIRE)"; else echo "XFOO=bar"; fi`" \
-	"`if test x"$(BOOT_CFLAGS)" != x; then echo "BOOT_CFLAGS=$(BOOT_CFLAGS)"; else echo "XFOO=bar"; fi`"
+	"`if test x'$(LANGUAGES)' != x; then echo 'LANGUAGES=$(LANGUAGES)'; else echo 'XFOO=bar'; fi`" \
+	"`if test x'$(STMP_FIXPROTO)' != x; then echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)'; else echo 'XFOO=bar'; fi`" \
+	"`if test x'$(LIMITS_H_TEST)' != x; then echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)'; else echo 'XFOO=bar'; fi`" \
+	"`if test x'$(LIBGCC1_TEST)' != x; then echo 'LIBGCC1_TEST=$(LIBGCC1_TEST)'; else echo 'XFOO=bar'; fi`" \
+	"`if test x'$(LIBGCC2_CFLAGS)' != x; then echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)'; else echo 'XFOO=bar'; fi`" \
+	"`if test x'$(LIBGCC2_DEBUG_CFLAGS)' != x; then echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)'; else echo 'XFOO=bar'; fi`" \
+	"`if test x'$(LIBGCC2_INCLUDES)' != x; then echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)'; else echo 'XFOO=bar'; fi`" \
+	"`if test x'$(ENQUIRE)' != x; then echo 'ENQUIRE=$(ENQUIRE)'; else echo 'XFOO=bar'; fi`" \
+	"`if test x'$(BOOT_CFLAGS)' != x; then echo 'BOOT_CFLAGS=$(BOOT_CFLAGS)'; else echo 'XFOO=bar'; fi`"
 
 GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS)
 
@@ -455,6 +463,7 @@ ALL_MODULES = \
 	all-bash \
 	all-bfd \
 	all-binutils \
+	all-bison \
 	all-byacc \
 	all-cvs \
 	all-db \
@@ -481,6 +490,9 @@ ALL_MODULES = \
 	all-inet \
 	all-ispell \
 	all-itcl \
+	$(start-sanitize-ide) \
+	all-jstools \
+	$(end-sanitize-ide) \
 	all-ld \
 	all-libiberty \
 	$(start-sanitize-ide) \
@@ -521,6 +533,7 @@ 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
 
@@ -553,6 +566,9 @@ CROSS_CHECK_MODULES = \
 	check-inet \
 	check-ispell \
 	check-itcl \
+	$(start-sanitize-ide) \
+	check-jstools \
+	$(end-sanitize-ide) \
 	check-ld \
 	check-libiberty \
 	$(start-sanitize-ide) \
@@ -600,6 +616,7 @@ INSTALL_MODULES = \
 	install-bfd \
 	install-opcodes \
 	install-binutils \
+	install-bison \
 	install-byacc \
 	install-cvs \
 	install-db \
@@ -626,6 +643,9 @@ INSTALL_MODULES = \
 	install-inet \
 	install-ispell \
 	install-itcl \
+	$(start-sanitize-ide) \
+	install-jstools \
+	$(end-sanitize-ide) \
 	install-ld \
 	install-libiberty \
 	$(start-sanitize-ide) \
@@ -754,6 +774,7 @@ CLEAN_MODULES = \
 	clean-bash \
 	clean-bfd \
 	clean-binutils \
+	clean-bison \
 	clean-byacc \
 	clean-cvs \
 	clean-db \
@@ -780,6 +801,9 @@ CLEAN_MODULES = \
 	clean-inet \
 	clean-ispell \
 	clean-itcl \
+	$(start-sanitize-ide) \
+	clean-jstools \
+	$(end-sanitize-ide) \
 	clean-ld \
 	clean-libiberty \
 	$(start-sanitize-ide) \
@@ -1295,7 +1319,7 @@ $(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; \
@@ -1373,18 +1397,19 @@ install-dosrel-fake:
 
 # This is a list of inter-dependencies among modules.
 all-apache:
-all-autoconf: all-m4
+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-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
@@ -1392,15 +1417,15 @@ 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-gcc
-all-gcc: all-byacc all-binutils all-gas all-ld
-all-bootstrap: all-libiberty all-byacc all-binutils all-gas all-ld
+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-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
+all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
 all-gnuserv:
 configure-target-gperf: $(ALL_GCC)
 all-target-gperf: configure-target-gperf all-target-libiberty all-target-libg++
@@ -1418,7 +1443,10 @@ all-indent:
 all-inet: all-tcl all-send-pr all-perl
 all-ispell: all-emacs19
 all-itcl: all-tcl all-tk
-all-ld: all-libiberty all-bfd all-opcodes all-byacc all-flex
+# start-sanitize-ide
+all-jstools: all-tcl all-tk all-libide
+# 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)
@@ -1448,8 +1476,8 @@ all-recode: all-libiberty
 all-sed: all-libiberty
 all-send-pr: all-prms
 all-shellutils:
-all-sim: all-libiberty all-bfd all-opcodes
-all-sn: all-tcl all-tk all-itcl all-db all-grep
+all-sim: all-libiberty all-bfd all-opcodes all-readline
+all-sn: all-tcl all-tk all-tix all-itcl all-db all-grep
 all-tar: all-libiberty
 all-tcl:
 all-tclX: all-tcl all-tk
@@ -1460,7 +1488,7 @@ 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-libide
+all-vmake: all-tcl all-tk all-itcl all-libide all-tix
 # end-sanitize-ide
 all-wdiff:
 all-target-winsup: all-target-newlib all-target-libiberty all-target-librx all-target-libio configure-target-winsup 
@@ -1469,6 +1497,7 @@ 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-itcl: install-tcl
 install-target: $(INSTALL_TARGET_MODULES)
 
 ### other supporting targets
@@ -1535,8 +1564,6 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \
 	# Take out texinfo from a few places; make simple BISON=bison line.
 	sed -e '/^all\.normal: /s/\all-texinfo //' \
 	    -e '/^	install-texinfo /d' \
-	    -e '/^BISON = `if/,/^$$/d' \
-	    -e '/^# BISON:/s/.*/BISON = $(DEFAULT_YACC)/' \
 	<Makefile.in >tmp
 	mv -f tmp Makefile.in
 	#
@@ -1588,8 +1615,12 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \
 	  ln -s ../../../texinfo/util/tex3patch	proto-toplev/texinfo/util ; \
 	else true; fi
 	chmod og=u `find . -print`
-	$(MAKE) -f Makefile.in do-tar-gz TOOL=$(TOOL) \
-		VER=`sed <$(TOOL)/Makefile.in -n 's/^VERSION *= *//p'`
+	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"