X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=Makefile.in;h=f3a841aa86611d8b34db10dd0469e2a00e42c719;hb=93f967158fdb53e468173f0a4947b3dd06442983;hp=860e1d1d8b409797cc47b2a08e43af4980317666;hpb=97b951fb4f2c7ca630fb13844c8cafe7ad9800a7;p=deliverable%2Fbinutils-gdb.git

diff --git a/Makefile.in b/Makefile.in
index 860e1d1d8b..f3a841aa86 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,7 @@
 #
 # Makefile for directory with subdirs to build.
-#   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 1997 Free Software Foundation
+#   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 1998
+#   Free Software Foundation
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -186,10 +187,10 @@ REALLY_SET_LIB_PATH = \
 
 ALL = all.normal
 INSTALL_TARGET = installdirs \
+	install-gcc \
 	$(INSTALL_MODULES) \
 	$(INSTALL_TARGET_MODULES) \
 	$(INSTALL_X11_MODULES) \
-	install-gcc \
 	$(INSTALL_DOSREL)
 
 
@@ -197,7 +198,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/$(TARGET_SUBDIR)/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
+        echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/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; \
@@ -236,7 +237,7 @@ CXX_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/$(TARGET_SUBDIR)/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; \
@@ -370,6 +371,7 @@ BASE_FLAGS_TO_PASS = \
 	"PICFLAG=$(PICFLAG)" \
 	"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
 	"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
+	"RPATH_ENVVAR=$(RPATH_ENVVAR)" \
 	"SHELL=$(SHELL)" \
 	"EXPECT=$(EXPECT)" \
 	"RUNTEST=$(RUNTEST)" \
@@ -383,6 +385,7 @@ BASE_FLAGS_TO_PASS = \
 	"infodir=$(infodir)" \
 	"libdir=$(libdir)" \
 	"libexecdir=$(libexecdir)" \
+	"lispdir=$(lispdir)" \
 	"localstatedir=$(localstatedir)" \
 	"mandir=$(mandir)" \
 	"oldincludedir=$(oldincludedir)" \
@@ -461,15 +464,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`"
+	"`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'LIBGCC1_TEST=$(LIBGCC1_TEST)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'ENQUIRE=$(ENQUIRE)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'BOOT_CFLAGS=$(BOOT_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \
 
 GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS)
 
@@ -477,6 +480,7 @@ GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS)
 # using $(FLAGS_TO_PASS).
 ALL_MODULES = \
 	all-apache \
+	all-ash \
 	all-autoconf \
 	all-automake \
 	all-bash \
@@ -496,6 +500,7 @@ ALL_MODULES = \
 	all-flex \
 	all-gas \
 	all-gawk \
+	all-gettext \
 	all-gnuserv \
 	all-gprof \
 	all-grep \
@@ -507,14 +512,20 @@ ALL_MODULES = \
 	$(end-sanitize-ide) \
 	all-indent \
 	all-inet \
+	all-intl \
 	all-ispell \
 	all-itcl \
 	$(start-sanitize-ide) \
 	all-jstools \
 	$(end-sanitize-ide) \
 	all-ld \
+	all-libgui \
 	all-libiberty \
+	$(start-sanitize-ide) \
 	all-libide \
+	all-libidetcl \
+	$(end-sanitize-ide) \
+	all-libtool \
 	all-m4 \
 	all-make \
 	all-mmalloc \
@@ -530,7 +541,7 @@ ALL_MODULES = \
 	all-send-pr \
 	all-shellutils \
 	all-sim \
-	all-sn \
+	all-snavigator \
 	all-tar \
 	all-tcl \
 	all-texinfo \
@@ -556,6 +567,7 @@ NATIVE_CHECK_MODULES = \
 
 CROSS_CHECK_MODULES = \
 	check-apache \
+	check-ash \
 	check-autoconf \
 	check-automake \
 	check-bash \
@@ -571,6 +583,7 @@ CROSS_CHECK_MODULES = \
 	check-find \
 	check-gas \
 	check-gawk \
+	check-gettext \
 	check-gnuserv \
 	check-gprof \
 	check-grep \
@@ -581,14 +594,20 @@ CROSS_CHECK_MODULES = \
 	$(end-sanitize-ide) \
 	check-indent \
 	check-inet \
+	check-intl \
 	check-ispell \
 	check-itcl \
 	$(start-sanitize-ide) \
 	check-jstools \
 	$(end-sanitize-ide) \
 	check-ld \
+	check-libgui \
 	check-libiberty \
+	$(start-sanitize-ide) \
 	check-libide \
+	check-libidetcl \
+	$(end-sanitize-ide) \
+	check-libtool \
 	check-m4 \
 	check-make \
 	check-mmcheckoc \
@@ -602,7 +621,7 @@ CROSS_CHECK_MODULES = \
 	check-sed \
 	check-send-pr \
 	check-shellutils \
-	check-sn \
+	check-snavigator \
 	check-sim \
 	check-tar \
 	check-tcl \
@@ -623,8 +642,11 @@ CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES)
 # We put install-opcodes before install-binutils because the installed
 # binutils might be on PATH, and they might need the shared opcodes
 # library.
+# We put install-tcl before install-itcl because itcl wants to run a
+# program on installation which uses the Tcl libraries.
 INSTALL_MODULES = \
 	install-apache \
+	install-ash \
 	install-autoconf \
 	install-automake \
 	install-bash \
@@ -645,6 +667,7 @@ INSTALL_MODULES = \
 	install-flex \
 	install-gas \
 	install-gawk \
+	install-gettext \
 	install-gnuserv \
 	install-gprof \
 	install-grep \
@@ -656,14 +679,21 @@ INSTALL_MODULES = \
 	$(end-sanitize-ide) \
 	install-indent \
 	install-inet \
+	install-intl \
 	install-ispell \
+	install-tcl \
 	install-itcl \
 	$(start-sanitize-ide) \
 	install-jstools \
 	$(end-sanitize-ide) \
 	install-ld \
+	install-libgui \
 	install-libiberty \
+	$(start-sanitize-ide) \
 	install-libide \
+	install-libidetcl \
+	$(end-sanitize-ide) \
+	install-libtool \
 	install-m4 \
 	install-make \
 	install-mmalloc \
@@ -677,9 +707,8 @@ INSTALL_MODULES = \
 	install-send-pr \
 	install-shellutils \
 	install-sim \
-	install-sn \
+	install-snavigator \
 	install-tar \
-	install-tcl \
 	install-texinfo \
 	install-textutils \
 	install-tgas \
@@ -784,6 +813,7 @@ INSTALL_TARGET_MODULES = \
 # This is a list of the targets for which we can do a clean-{target}.
 CLEAN_MODULES = \
 	clean-apache \
+	clean-ash \
 	clean-autoconf \
 	clean-automake \
 	clean-bash \
@@ -803,6 +833,7 @@ CLEAN_MODULES = \
 	clean-flex \
 	clean-gas \
 	clean-gawk \
+	clean-gettext \
 	clean-gnuserv \
 	clean-gprof \
 	clean-grep \
@@ -814,14 +845,20 @@ CLEAN_MODULES = \
 	$(end-sanitize-ide) \
 	clean-indent \
 	clean-inet \
+	clean-intl \
 	clean-ispell \
 	clean-itcl \
 	$(start-sanitize-ide) \
 	clean-jstools \
 	$(end-sanitize-ide) \
 	clean-ld \
+	clean-libgui \
 	clean-libiberty \
+	$(start-sanitize-ide) \
 	clean-libide \
+	clean-libidetcl \
+	$(end-sanitize-ide) \
+	clean-libtool \
 	clean-m4 \
 	clean-make \
 	clean-mmalloc \
@@ -837,7 +874,7 @@ CLEAN_MODULES = \
 	clean-send-pr \
 	clean-shellutils \
 	clean-sim \
-	clean-sn \
+	clean-snavigator \
 	clean-tar \
 	clean-tcl \
 	clean-texinfo \
@@ -1433,6 +1470,7 @@ install-dosrel-fake:
 
 # This is a list of inter-dependencies among modules.
 all-apache:
+all-ash:
 all-autoconf: all-m4 all-texinfo
 all-automake:
 all-bash:
@@ -1462,8 +1500,12 @@ all-gawk:
 ALL_GCC = all-gcc
 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-libide
+GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui
+# start-sanitize-ide
+GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui all-libide all-libidetcl
+# end-sanitize-ide
 all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
+all-gettext:
 all-gnuserv:
 configure-target-gperf: $(ALL_GCC)
 all-target-gperf: configure-target-gperf all-target-libiberty all-target-libstdc++
@@ -1479,10 +1521,11 @@ all-ilu:
 # end-sanitize-ide
 all-indent:
 all-inet: all-tcl all-send-pr all-perl
+all-intl:
 all-ispell: all-emacs19
 all-itcl: all-tcl all-tk
 # start-sanitize-ide
-all-jstools: all-tcl all-tk all-tix all-libide
+all-jstools: all-tcl all-tk all-tix all-libgui all-libide all-libidetcl
 # 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
@@ -1492,12 +1535,17 @@ 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
 check-target-libio: all-target-libstdc++
+all-libgui: all-tcl all-tk all-itcl
 all-libiberty:
-all-libide: all-tcl all-tk all-itcl all-ilu
+# start-sanitize-ide
+all-libide: all-ilu
+all-libidetcl: all-tcl all-tk all-itcl all-ilu all-libgui all-libide
+# end-sanitize-ide
 configure-target-librx: $(ALL_GCC) configure-target-newlib
 all-target-librx: configure-target-librx
 configure-target-libstdc++: $(ALL_GCC)
 all-target-libstdc++: configure-target-libstdc++ all-gas all-ld all-gcc all-target-libiberty all-target-newlib all-target-libio
+all-libtool:
 all-m4: all-libiberty
 all-make: all-libiberty
 all-mmalloc:
@@ -1514,7 +1562,7 @@ all-sed: all-libiberty
 all-send-pr: all-prms
 all-shellutils:
 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-snavigator: all-tcl all-tk all-tix all-itcl all-db all-grep
 all-tar: all-libiberty
 all-tcl:
 all-tclX: all-tcl all-tk
@@ -1525,18 +1573,19 @@ 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-tix all-libide
+all-vmake: all-tcl all-tk all-itcl all-tix all-libgui all-libide all-libidetcl
 # end-sanitize-ide
 all-wdiff:
-all-target-winsup: all-target-newlib all-target-libiberty all-target-librx all-target-libio configure-target-winsup 
+all-target-winsup: all-target-newlib all-target-libiberty all-target-libio 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-itcl: install-tcl
 install-target: $(INSTALL_TARGET_MODULES)
-
+# start-sanitize-gdbtk
+install-gdbtk: install-tcl install-tk install-itcl install-tix install-libgui install-gdb
+#end-sanitize-gdbtk
 ### other supporting targets
 
 MAKEDIRS= \
@@ -1598,7 +1647,7 @@ SUPPORT_FILES = list-of-support-files-for-tool-in-question
 
 taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \
   texinfo/texinfo.tex texinfo/gpl.texinfo texinfo/lgpl.texinfo
-	# Take out texinfo from a few places; make simple BISON=bison line.
+	# Take out texinfo from a few places.
 	sed -e '/^all\.normal: /s/\all-texinfo //' \
 	    -e '/^	install-texinfo /d' \
 	<Makefile.in >tmp