(patch) configure-configure -> Makefile-Makefile

Nathanael Nerode
2002-12-09T00:12:17Z

OK, this converts a bunch of the configure-configure dependencies to
Makefile-Makefile dependencies. It leaves the ones which require 'maybe'ing.

It also blows away support for tix and qthreads, both of which are apparently
not used by anything anymore (tix quite recently, qthreads a long time ago).
The reason those two got the treatment was that they had configure-configure
dependencies. >:-)>

Tested on i686-pc-linux-gnu. Doesn't make anything worse, at any rate, and
seems to make rebuilding based on small configuration changes better. :-/

I'll try to get the remaining configure-configure cases (a bunch of
dependences on tk, and one giant mondo set of dependenced for gcc) soon.
But as it is the only danger is failed partial reconfigures.

* Makefile.def, Makefile.tpl, configure.in: Drop tix, qthreads.
* Makefile.tpl: Replace configure-*:configure-* with
*/Makefile:*/Makefile.
* Makefile.in: Regenerated.

Index: Makefile.def
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.def,v
retrieving revision 1.2.2.7
diff -u -r1.2.2.7 Makefile.def
--- Makefile.def 23 Nov 2002 22:21:45 -0000 1.2.2.7
+++ Makefile.def 8 Dec 2002 23:57:15 -0000
@@ -68,7 +68,6 @@
host_modules= { module= guile; with_x=true; };
host_modules= { module= tclX; with_x=true; };
host_modules= { module= tk; with_x=true; };
-host_modules= { module= tix; with_x=true; };
host_modules= { module= libtermcap; no_check=true; no_clean=true; };
host_modules= { module= utils; no_check=true; };

@@ -86,7 +85,6 @@
target_modules = { module= libjava; raw_cxx=true; };
target_modules = { module= zlib; };
target_modules = { module= boehm-gc; };
-target_modules = { module= qthreads; };
target_modules = { module= rda; };

// These are (some of) the targets to be done in each subdirectory.
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.in,v
retrieving revision 1.111.4.26
diff -u -r1.111.4.26 Makefile.in
--- Makefile.in 8 Dec 2002 22:39:49 -0000 1.111.4.26
+++ Makefile.in 8 Dec 2002 23:57:29 -0000
@@ -608,7 +608,6 @@
clean-target-libjava \
clean-target-zlib \
clean-target-boehm-gc \
- clean-target-qthreads \
clean-target-rda

# All of the x11 modules that can be cleaned
@@ -617,8 +616,7 @@
clean-expect \
clean-guile \
clean-tclX \
- clean-tk \
- clean-tix
+ clean-tk

# The target built for a native build.
# This list only includes modules actually being configured and built.
@@ -5712,74 +5710,6 @@
(cd tk; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)

-.PHONY: configure-tix maybe-configure-tix
-maybe-configure-tix:
-configure-tix: tix/Makefile
-
-tix/Makefile: config.status
- @[ -d tix ] || mkdir tix; \
- r=`${PWD}`; export r; \
- s=`cd $(srcdir); ${PWD}`; export s; \
- CC="$(CC)"; export CC; \
- CFLAGS="$(CFLAGS)"; export CFLAGS; \
- CXX="$(CXX)"; export CXX; \
- CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
- if [ z$(build_canonical) != z$(host_canoncial) ] ; then \
- AR="$(AR)"; export AR; \
- AS="$(AS)"; export AS; \
- CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
- DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
- LD="$(LD)"; export LD; \
- NM="$(NM)"; export NM; \
- RANLIB="$(RANLIB)"; export RANLIB; \
- WINDRES="$(WINDRES)"; export WINDRES; \
- OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
- OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
- fi; \
- echo Configuring in tix; \
- cd tix || exit 1; \
- case $(srcdir) in \
- \.) \
- srcdiroption="--srcdir=."; \
- libsrcdir=".";; \
- /* | [A-Za-z]:[\\/]*) \
- srcdiroption="--srcdir=$(srcdir)/tix"; \
- libsrcdir="$$s/tix";; \
- *) \
- srcdiroption="--srcdir=../$(srcdir)/tix"; \
- libsrcdir="$$s/tix";; \
- esac; \
- $(SHELL) $${libsrcdir}/configure \
- $(HOST_CONFIGARGS) $${srcdiroption} \
- || exit 1
-
-.PHONY: all-tix maybe-all-tix
-maybe-all-tix:
-all-tix: configure-tix
- @r=`${PWD}`; export r; \
- s=`cd $(srcdir); ${PWD}`; export s; \
- $(SET_LIB_PATH) \
- (cd tix; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
-
-
-.PHONY: check-tix
-check-tix:
- @r=`${PWD}`; export r; \
- s=`cd $(srcdir); ${PWD}`; export s; \
- $(SET_LIB_PATH) \
- (cd tix; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
-
-
-
-.PHONY: install-tix maybe-install-tix
-maybe-install-tix:
-install-tix: installdirs
- @r=`${PWD}`; export r; \
- s=`cd $(srcdir); ${PWD}`; export s; \
- $(SET_LIB_PATH) \
- (cd tix; $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
-
-
.PHONY: configure-libtermcap maybe-configure-libtermcap
maybe-configure-libtermcap:
configure-libtermcap: libtermcap/Makefile
@@ -7281,105 +7211,6 @@
$(MAKE) $(TARGET_FLAGS_TO_PASS) install)

-.PHONY: configure-target-qthreads maybe-configure-target-qthreads
-maybe-configure-target-qthreads:
-configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/Makefile
-
-# Don't manually override CC_FOR_TARGET at make time; get it set right
-# at configure time. Otherwise multilibs may be wrong.
-$(TARGET_SUBDIR)/qthreads/multilib.out: maybe-all-gcc
- @[ -d $(TARGET_SUBDIR)/qthreads ] || mkdir $(TARGET_SUBDIR)/qthreads;\
- r=`${PWD}`; export r; \
- echo "Configuring multilibs for qthreads"; \
- $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/qthreads/multilib.out 2> /dev/null
-
-$(TARGET_SUBDIR)/qthreads/Makefile: config.status $(TARGET_SUBDIR)/qthreads/multilib.out
- @[ -d $(TARGET_SUBDIR)/qthreads ] || mkdir $(TARGET_SUBDIR)/qthreads;\
- r=`${PWD}`; export r; \
- s=`cd $(srcdir); ${PWD}`; export s; \
- $(SET_LIB_PATH) \
- AR="$(AR_FOR_TARGET)"; export AR; \
- AS="$(AS_FOR_TARGET)"; export AS; \
- CC="$(CC_FOR_TARGET)"; export CC; \
- CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
- CXX="$(CXX_FOR_TARGET)"; export CXX; \
- CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
- GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
- DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
- LD="$(LD_FOR_TARGET)"; export LD; \
- LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
- NM="$(NM_FOR_TARGET)"; export NM; \
- RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
- WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
- echo Configuring in $(TARGET_SUBDIR)/qthreads; \
- cd "$(TARGET_SUBDIR)/qthreads" || exit 1; \
- case $(srcdir) in \
- /* | [A-Za-z]:[\\/]*) \
- topdir=$(srcdir) ;; \
- *) \
- case "$(TARGET_SUBDIR)" in \
- .) topdir="../$(srcdir)" ;; \
- *) topdir="../../$(srcdir)" ;; \
- esac ;; \
- esac; \
- if [ "$(srcdir)" = "." ] ; then \
- if [ "$(TARGET_SUBDIR)" != "." ] ; then \
- if $(SHELL) $$s/symlink-tree $${topdir}/qthreads "no-such-file" ; then \
- if [ -f Makefile ]; then \
- if $(MAKE) distclean; then \
- true; \
- else \
- exit 1; \
- fi; \
- else \
- true; \
- fi; \
- else \
- exit 1; \
- fi; \
- else \
- true; \
- fi; \
- srcdiroption="--srcdir=."; \
- libsrcdir="."; \
- else \
- srcdiroption="--srcdir=$${topdir}/qthreads"; \
- libsrcdir="$$s/qthreads"; \
- fi; \
- rm -f no-such-file || : ; \
- CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
- $(TARGET_CONFIGARGS) $${srcdiroption} \
- --with-target-subdir="$(TARGET_SUBDIR)" \
- || exit 1
-
-.PHONY: all-target-qthreads maybe-all-target-qthreads
-maybe-all-target-qthreads:
-all-target-qthreads: configure-target-qthreads
- @r=`${PWD}`; export r; \
- s=`cd $(srcdir); ${PWD}`; export s; \
- $(SET_LIB_PATH) \
- (cd $(TARGET_SUBDIR)/qthreads; \
- $(MAKE) $(TARGET_FLAGS_TO_PASS) all)
-
-.PHONY: check-target-qthreads
-check-target-qthreads:
- @r=`${PWD}`; export r; \
- s=`cd $(srcdir); ${PWD}`; export s; \
- $(SET_LIB_PATH) \
- (cd $(TARGET_SUBDIR)/qthreads; \
- $(MAKE) $(TARGET_FLAGS_TO_PASS) check)
-
-
-.PHONY: install-target-qthreads maybe-install-target-qthreads
-maybe-install-target-qthreads:
-install-target-qthreads: installdirs
- @r=`${PWD}`; export r; \
- s=`cd $(srcdir); ${PWD}`; export s; \
- $(SET_LIB_PATH) \
- (cd $(TARGET_SUBDIR)/qthreads; \
- $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
-
-
.PHONY: configure-target-rda maybe-configure-target-rda
maybe-configure-target-rda:
configure-target-rda: $(TARGET_SUBDIR)/rda/Makefile
@@ -7665,6 +7496,12 @@
# are specified by depending on a 'maybe-' target. If you're not sure,
# it's safer to use a soft dependency.

+# The exception is configure-configure dependencies. Due to bad interaction
+# between phony and real targets, configure-foo: maybe-configure-bar doesn't
+# always work correctly on rebuild, and foo/Makefile: maybe-configure-bar
+# forces unnecessary rebuilds. foo/Makefile: bar/Makefile works, but is
+# a hard dependency.
+
# Host modules specific to gcc.
# GCC needs to identify certain tools.
configure-gcc: maybe-configure-binutils maybe-configure-gas maybe-configure-ld maybe-configure-bison maybe-configure-flex
@@ -7675,16 +7512,19 @@
all-bootstrap: maybe-all-libiberty maybe-all-texinfo maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib

# Host modules specific to gdb.
-# GDB needs to know that the simulator is being built.
-configure-gdb: maybe-configure-tcl maybe-configure-tk maybe-configure-sim
+# For some architectures, GDB needs to know that the simulator is being built.
+# sim is always included with gdb, so this is safe as a hard dependency.
+gdb/Makefile: sim/Makefile
+configure-gdb: maybe-configure-tcl maybe-configure-tk
GDB_TK = @GDB_TK@
all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-readline maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK)
-install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-tix maybe-install-libgui
-libgui/Makefile: maybe-configure-tcl maybe-configure-tk
+install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-libgui
+# libgui is always packaged with tcl and tk, so this is all right.
+libgui/Makefile: tcl/Makefile tk/Makefile
all-libgui: maybe-all-tcl maybe-all-tk maybe-all-itcl

# Host modules specific to binutils.
-configure-bfd: configure-libiberty
+bfd/Makefile: libiberty/Makefile
all-bfd: maybe-all-libiberty maybe-all-intl
all-binutils: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-flex maybe-all-bison maybe-all-byacc maybe-all-intl
# We put install-opcodes before install-binutils because the installed
@@ -7698,20 +7538,24 @@

# Other host modules in the 'src' repository.
all-dejagnu: maybe-all-tcl maybe-all-expect maybe-all-tk
-configure-expect: maybe-configure-tcl maybe-configure-tk
+# Expect is always packaged with tcl.
+expect/Makefile: tcl/Makefile
+configure-expect: maybe-configure-tk
all-expect: maybe-all-tcl maybe-all-tk
-configure-itcl: maybe-configure-tcl maybe-configure-tk
+# itcl is always packaged with tcl.
+itcl/Makefile: tcl/Makefile
+configure-itcl: maybe-configure-tk
all-itcl: maybe-all-tcl maybe-all-tk
# We put install-tcl before install-itcl because itcl wants to run a
# program on installation which uses the Tcl libraries.
install-itcl: maybe-install-tcl
all-sid: maybe-all-tcl maybe-all-tk
install-sid: maybe-install-tcl maybe-install-tk
+# PowerPC sim can't build until GDB is configured.
all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-readline maybe-configure-gdb
-configure-tk: maybe-configure-tcl
+# Yep, tk is always packaged with tcl.
+tk/Makefile: tcl/Makefile
all-tk: maybe-all-tcl
-configure-tix: maybe-configure-tcl maybe-configure-tk
-all-tix: maybe-all-tcl maybe-all-tk
all-texinfo: maybe-all-libiberty

# Other host modules. Warning, these are not well tested.
@@ -7732,7 +7576,7 @@
all-recode: maybe-all-libiberty
all-sed: maybe-all-libiberty
all-send-pr: maybe-all-prms
-all-snavigator: maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-db maybe-all-grep maybe-all-libgui
+all-snavigator: maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-db maybe-all-grep maybe-all-libgui
all-tar: maybe-all-libiberty
all-tclX: maybe-all-tcl maybe-all-tk
all-uudecode: maybe-all-libiberty
@@ -7742,13 +7586,16 @@
ALL_GCC_CXX = $(ALL_GCC_C) maybe-all-target-libstdc++-v3

# Target modules specific to gcc.
-configure-target-boehm-gc: $(ALL_GCC_C) maybe-configure-target-qthreads
-configure-target-fastjar: maybe-configure-target-zlib
+configure-target-boehm-gc: $(ALL_GCC_C)
+# fastjar is always packaged with zlib.
+$(TARGET_SUBDIR)/fastjar/Makefile: $(TARGET_SUBDIR)/zlib/Makefile
all-target-fastjar: maybe-all-target-zlib maybe-all-target-libiberty
configure-target-libf2c: $(ALL_GCC_C)
all-target-libf2c: maybe-all-target-libiberty
configure-target-libffi: $(ALL_GCC_C)
-configure-target-libjava: $(ALL_GCC_C) maybe-configure-target-zlib maybe-configure-target-boehm-gc maybe-configure-target-qthreads maybe-configure-target-libffi
+# libjava is always distributed with zlib, boehm-gc, and libffi
+$(TARGET_SUBDIR)/libjava/Makefile: $(TARGET_SUBDIR)/zlib/Makefile $(TARGET_SUBDIR)/boehm-gc/Makefile $(TARGET_SUBDIR)/libffi/Makefile
+configure-target-libjava: $(ALL_GCC_C)
all-target-libjava: maybe-all-fastjar maybe-all-target-zlib maybe-all-target-boehm-gc maybe-all-target-qthreads maybe-all-target-libffi
configure-target-libobjc: $(ALL_GCC_C)
all-target-libobjc: maybe-all-target-libiberty
@@ -7769,7 +7616,6 @@
# Other target modules. Warning, these are not well tested.
configure-target-gperf: $(ALL_GCC_CXX)
all-target-gperf: maybe-all-target-libiberty maybe-all-target-libstdc++-v3
-configure-target-qthreads: $(ALL_GCC_C)

# Dependencies of maybe-foo on foo. These are used because, for example,
# all-gcc only depends on all-gas if gas is present and being configured.
Index: Makefile.tpl
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.tpl,v
retrieving revision 1.5.2.24
diff -u -r1.5.2.24 Makefile.tpl
--- Makefile.tpl 8 Dec 2002 22:39:49 -0000 1.5.2.24
+++ Makefile.tpl 8 Dec 2002 23:57:32 -0000
@@ -1270,6 +1270,12 @@
# are specified by depending on a 'maybe-' target. If you're not sure,
# it's safer to use a soft dependency.

+# The exception is configure-configure dependencies. Due to bad interaction
+# between phony and real targets, configure-foo: maybe-configure-bar doesn't
+# always work correctly on rebuild, and foo/Makefile: maybe-configure-bar
+# forces unnecessary rebuilds. foo/Makefile: bar/Makefile works, but is
+# a hard dependency.
+
# Host modules specific to gcc.
# GCC needs to identify certain tools.
configure-gcc: maybe-configure-binutils maybe-configure-gas maybe-configure-ld maybe-configure-bison maybe-configure-flex
@@ -1280,16 +1286,19 @@
all-bootstrap: maybe-all-libiberty maybe-all-texinfo maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib

# Host modules specific to gdb.
-# GDB needs to know that the simulator is being built.
-configure-gdb: maybe-configure-tcl maybe-configure-tk maybe-configure-sim
+# For some architectures, GDB needs to know that the simulator is being built.
+# sim is always included with gdb, so this is safe as a hard dependency.
+gdb/Makefile: sim/Makefile
+configure-gdb: maybe-configure-tcl maybe-configure-tk
GDB_TK = @GDB_TK@
all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-readline maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK)
-install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-tix maybe-install-libgui
-libgui/Makefile: maybe-configure-tcl maybe-configure-tk
+install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-libgui
+# libgui is always packaged with tcl and tk, so this is all right.
+libgui/Makefile: tcl/Makefile tk/Makefile
all-libgui: maybe-all-tcl maybe-all-tk maybe-all-itcl

# Host modules specific to binutils.
-configure-bfd: configure-libiberty
+bfd/Makefile: libiberty/Makefile
all-bfd: maybe-all-libiberty maybe-all-intl
all-binutils: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-flex maybe-all-bison maybe-all-byacc maybe-all-intl
# We put install-opcodes before install-binutils because the installed
@@ -1303,20 +1312,24 @@

# Other host modules in the 'src' repository.
all-dejagnu: maybe-all-tcl maybe-all-expect maybe-all-tk
-configure-expect: maybe-configure-tcl maybe-configure-tk
+# Expect is always packaged with tcl.
+expect/Makefile: tcl/Makefile
+configure-expect: maybe-configure-tk
all-expect: maybe-all-tcl maybe-all-tk
-configure-itcl: maybe-configure-tcl maybe-configure-tk
+# itcl is always packaged with tcl.
+itcl/Makefile: tcl/Makefile
+configure-itcl: maybe-configure-tk
all-itcl: maybe-all-tcl maybe-all-tk
# We put install-tcl before install-itcl because itcl wants to run a
# program on installation which uses the Tcl libraries.
install-itcl: maybe-install-tcl
all-sid: maybe-all-tcl maybe-all-tk
install-sid: maybe-install-tcl maybe-install-tk
+# PowerPC sim can't build until GDB is configured.
all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-readline maybe-configure-gdb
-configure-tk: maybe-configure-tcl
+# Yep, tk is always packaged with tcl.
+tk/Makefile: tcl/Makefile
all-tk: maybe-all-tcl
-configure-tix: maybe-configure-tcl maybe-configure-tk
-all-tix: maybe-all-tcl maybe-all-tk
all-texinfo: maybe-all-libiberty

# Other host modules. Warning, these are not well tested.
@@ -1337,7 +1350,7 @@
all-recode: maybe-all-libiberty
all-sed: maybe-all-libiberty
all-send-pr: maybe-all-prms
-all-snavigator: maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-db maybe-all-grep maybe-all-libgui
+all-snavigator: maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-db maybe-all-grep maybe-all-libgui
all-tar: maybe-all-libiberty
all-tclX: maybe-all-tcl maybe-all-tk
all-uudecode: maybe-all-libiberty
@@ -1347,13 +1360,16 @@
ALL_GCC_CXX = $(ALL_GCC_C) maybe-all-target-libstdc++-v3

# Target modules specific to gcc.
-configure-target-boehm-gc: $(ALL_GCC_C) maybe-configure-target-qthreads
-configure-target-fastjar: maybe-configure-target-zlib
+configure-target-boehm-gc: $(ALL_GCC_C)
+# fastjar is always packaged with zlib.
+$(TARGET_SUBDIR)/fastjar/Makefile: $(TARGET_SUBDIR)/zlib/Makefile
all-target-fastjar: maybe-all-target-zlib maybe-all-target-libiberty
configure-target-libf2c: $(ALL_GCC_C)
all-target-libf2c: maybe-all-target-libiberty
configure-target-libffi: $(ALL_GCC_C)
-configure-target-libjava: $(ALL_GCC_C) maybe-configure-target-zlib maybe-configure-target-boehm-gc maybe-configure-target-qthreads maybe-configure-target-libffi
+# libjava is always distributed with zlib, boehm-gc, and libffi
+$(TARGET_SUBDIR)/libjava/Makefile: $(TARGET_SUBDIR)/zlib/Makefile $(TARGET_SUBDIR)/boehm-gc/Makefile $(TARGET_SUBDIR)/libffi/Makefile
+configure-target-libjava: $(ALL_GCC_C)
all-target-libjava: maybe-all-fastjar maybe-all-target-zlib maybe-all-target-boehm-gc maybe-all-target-qthreads maybe-all-target-libffi
configure-target-libobjc: $(ALL_GCC_C)
all-target-libobjc: maybe-all-target-libiberty
@@ -1374,7 +1390,6 @@
# Other target modules. Warning, these are not well tested.
configure-target-gperf: $(ALL_GCC_CXX)
all-target-gperf: maybe-all-target-libiberty maybe-all-target-libstdc++-v3
-configure-target-qthreads: $(ALL_GCC_C)

# Dependencies of maybe-foo on foo. These are used because, for example,
# all-gcc only depends on all-gas if gas is present and being configured.
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/configure.in,v
retrieving revision 1.177.4.18
diff -u -r1.177.4.18 configure.in
--- configure.in 5 Dec 2002 22:46:38 -0000 1.177.4.18
+++ configure.in 8 Dec 2002 23:57:35 -0000
@@ -73,7 +73,7 @@

# these libraries are used by various programs built for the host environment
#
-host_libs="intl mmalloc libiberty opcodes bfd readline db tcl tk tclX itcl tix libgui zlib"
+host_libs="intl mmalloc libiberty opcodes bfd readline db tcl tk tclX itcl libgui zlib"

libstdcxx_version="target-libstdc++-v3"

@@ -88,7 +88,6 @@
libgcj="target-libffi \
target-boehm-gc \
target-zlib \
- target-qthreads \
target-libjava"

# these libraries are built for the target environment, and are built after
@@ -367,7 +366,7 @@
noconfigdirs="$noconfigdirs ${libgcj}"
;;
arm-*-elf* | strongarm-*-elf* | xscale-*-elf*)
- noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+ noconfigdirs="$noconfigdirs target-libffi"
;;
arm-*-pe*)
noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
@@ -441,11 +440,11 @@
;;
ia64*-*-elf*)
# No gdb support yet.
- noconfigdirs="$noconfigdirs tix readline mmalloc libgui itcl gdb"
+ noconfigdirs="$noconfigdirs readline mmalloc libgui itcl gdb"
;;
ia64*-**-hpux*)
# No gdb or ld support yet.
- noconfigdirs="$noconfigdirs tix readline mmalloc libgui itcl gdb ld"
+ noconfigdirs="$noconfigdirs readline mmalloc libgui itcl gdb ld"
;;
i[3456]86-*-coff | i[3456]86-*-elf)
noconfigdirs="$noconfigdirs ${libgcj}"
@@ -479,7 +478,7 @@
# Can't build gdb for mingw32 if not native.
case "${host}" in
i[3456]86-*-mingw32) ;; # keep gdb tcl tk expect etc.
- *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl tix db snavigator gnuserv"
+ *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl db snavigator gnuserv"
;;
esac
;;
@@ -492,7 +491,7 @@
# Can't build gdb for Cygwin if not native.
case "${host}" in
*-*-cygwin*) ;; # keep gdb tcl tk expect etc.
- *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl tix libgui db snavigator gnuserv"
+ *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl libgui db snavigator gnuserv"
;;
esac
;;
@@ -545,13 +544,13 @@
;;
powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe)
target_configdirs="$target_configdirs target-winsup"
- noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl tix db snavigator gnuserv ${libgcj}"
+ noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl db snavigator gnuserv ${libgcj}"
# always build newlib.
skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
;;
# This is temporary until we can link against shared libraries
powerpcle-*-solaris*)
- noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl tix db snavigator gnuserv ${libgcj}"
+ noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl db snavigator gnuserv ${libgcj}"
;;
powerpc-*-beos*)
noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"
@@ -1426,7 +1425,7 @@
no)
GDB_TK="" ;;
*)
- GDB_TK="maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-libgui" ;;
+ GDB_TK="maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-libgui" ;;
esac

# Create the 'maybe dependencies'. This uses a temporary file.