diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.def | 6 | ||||
| -rw-r--r-- | Makefile.in | 321 | ||||
| -rwxr-xr-x | configure | 71 | ||||
| -rw-r--r-- | configure.in | 34 | ||||
| -rw-r--r-- | src-release | 2 |
6 files changed, 48 insertions, 390 deletions
@@ -1,5 +1,9 @@ 2004-08-12 Nathanael Nerode <neroden@gcc.gnu.org> + * Makefile.def, configure.in, src-release: Remove useless, bogus + references to tix. + * Makefile.in, configure: Regenerate. + * src-release: Stop distributing mmalloc with gdb (which doesn't use it). * Makefile.def: GDB doesn't depend on mmalloc anymore. diff --git a/Makefile.def b/Makefile.def index 82bc2d2..16dad15 100644 --- a/Makefile.def +++ b/Makefile.def @@ -98,7 +98,6 @@ host_modules= { module= gdb; with_x=true; }; host_modules= { module= expect; with_x=true; }; host_modules= { module= guile; with_x=true; }; host_modules= { module= tk; with_x=true; }; -host_modules= { module= tix; with_x=true; }; host_modules= { module= libtermcap; no_check=true; missing=mostlyclean; missing=clean; @@ -275,7 +274,6 @@ dependencies = { module=all-gdb; on=all-sim; }; dependencies = { module=install-gdb; on=install-tcl; }; dependencies = { module=install-gdb; on=install-tk; }; dependencies = { module=install-gdb; on=install-itcl; }; -dependencies = { module=install-gdb; on=install-tix; }; dependencies = { module=install-gdb; on=install-libgui; }; dependencies = { module=configure-libgui; on=configure-tcl; }; @@ -343,10 +341,6 @@ dependencies = { module=install-itcl; on=install-tcl; }; dependencies = { module=configure-tk; on=configure-tcl; }; dependencies = { module=all-tk; on=all-tcl; }; -dependencies = { module=configure-tix; on=configure-tcl; }; -dependencies = { module=configure-tix; on=configure-tk; }; -dependencies = { module=all-tix; on=all-tcl; }; -dependencies = { module=all-tix; on=all-tk; }; dependencies = { module=all-sid; on=all-libiberty; }; dependencies = { module=all-sid; on=all-bfd; }; diff --git a/Makefile.in b/Makefile.in index 4cc72bb..e2c9a2b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -715,7 +715,6 @@ configure-host: \ maybe-configure-expect \ maybe-configure-guile \ maybe-configure-tk \ - maybe-configure-tix \ maybe-configure-libtermcap \ maybe-configure-utils .PHONY: configure-target @@ -818,7 +817,6 @@ all-host: \ maybe-all-expect \ maybe-all-guile \ maybe-all-tk \ - maybe-all-tix \ maybe-all-libtermcap \ maybe-all-utils .PHONY: all-target @@ -916,7 +914,6 @@ info-host: \ maybe-info-expect \ maybe-info-guile \ maybe-info-tk \ - maybe-info-tix \ maybe-info-libtermcap \ maybe-info-utils @@ -1010,7 +1007,6 @@ dvi-host: \ maybe-dvi-expect \ maybe-dvi-guile \ maybe-dvi-tk \ - maybe-dvi-tix \ maybe-dvi-libtermcap \ maybe-dvi-utils @@ -1104,7 +1100,6 @@ TAGS-host: \ maybe-TAGS-expect \ maybe-TAGS-guile \ maybe-TAGS-tk \ - maybe-TAGS-tix \ maybe-TAGS-libtermcap \ maybe-TAGS-utils @@ -1198,7 +1193,6 @@ install-info-host: \ maybe-install-info-expect \ maybe-install-info-guile \ maybe-install-info-tk \ - maybe-install-info-tix \ maybe-install-info-libtermcap \ maybe-install-info-utils @@ -1292,7 +1286,6 @@ installcheck-host: \ maybe-installcheck-expect \ maybe-installcheck-guile \ maybe-installcheck-tk \ - maybe-installcheck-tix \ maybe-installcheck-libtermcap \ maybe-installcheck-utils @@ -1386,7 +1379,6 @@ mostlyclean-host: \ maybe-mostlyclean-expect \ maybe-mostlyclean-guile \ maybe-mostlyclean-tk \ - maybe-mostlyclean-tix \ maybe-mostlyclean-libtermcap \ maybe-mostlyclean-utils @@ -1480,7 +1472,6 @@ clean-host: \ maybe-clean-expect \ maybe-clean-guile \ maybe-clean-tk \ - maybe-clean-tix \ maybe-clean-libtermcap \ maybe-clean-utils @@ -1574,7 +1565,6 @@ distclean-host: \ maybe-distclean-expect \ maybe-distclean-guile \ maybe-distclean-tk \ - maybe-distclean-tix \ maybe-distclean-libtermcap \ maybe-distclean-utils @@ -1668,7 +1658,6 @@ maintainer-clean-host: \ maybe-maintainer-clean-expect \ maybe-maintainer-clean-guile \ maybe-maintainer-clean-tk \ - maybe-maintainer-clean-tix \ maybe-maintainer-clean-libtermcap \ maybe-maintainer-clean-utils @@ -1819,7 +1808,6 @@ do-check: unstage \ maybe-check-expect \ maybe-check-guile \ maybe-check-tk \ - maybe-check-tix \ maybe-check-libtermcap \ maybe-check-utils \ maybe-check-target-libstdc++-v3 \ @@ -1932,7 +1920,6 @@ install-host-nogcc: \ maybe-install-expect \ maybe-install-guile \ maybe-install-tk \ - maybe-install-tix \ maybe-install-libtermcap \ maybe-install-utils @@ -2002,7 +1989,6 @@ install-host: \ maybe-install-expect \ maybe-install-guile \ maybe-install-tk \ - maybe-install-tix \ maybe-install-libtermcap \ maybe-install-utils @@ -21817,308 +21803,6 @@ maintainer-clean-tk: @endif tk -.PHONY: configure-tix maybe-configure-tix -maybe-configure-tix: -@if tix -maybe-configure-tix: configure-tix -configure-tix: - @test ! -f tix/Makefile || exit 0; \ - [ -d tix ] || mkdir tix; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - 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 -@endif tix - -.PHONY: all-tix maybe-all-tix -maybe-all-tix: -@if tix -maybe-all-tix: all-tix -all-tix: configure-tix - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all) -@endif tix - -.PHONY: check-tix maybe-check-tix -maybe-check-tix: -@if tix -maybe-check-tix: check-tix - -check-tix: - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check) - -@endif tix - -.PHONY: install-tix maybe-install-tix -maybe-install-tix: -@if tix -maybe-install-tix: install-tix - -install-tix: installdirs - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) - -@endif tix - -# Other targets (info, dvi, etc.) - -.PHONY: maybe-info-tix info-tix -maybe-info-tix: -@if tix -maybe-info-tix: info-tix - -info-tix: \ - configure-tix - @[ -f ./tix/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing info in tix" ; \ - (cd tix && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - info) \ - || exit 1 - -@endif tix - -.PHONY: maybe-dvi-tix dvi-tix -maybe-dvi-tix: -@if tix -maybe-dvi-tix: dvi-tix - -dvi-tix: \ - configure-tix - @[ -f ./tix/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing dvi in tix" ; \ - (cd tix && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - dvi) \ - || exit 1 - -@endif tix - -.PHONY: maybe-TAGS-tix TAGS-tix -maybe-TAGS-tix: -@if tix -maybe-TAGS-tix: TAGS-tix - -TAGS-tix: \ - configure-tix - @[ -f ./tix/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing TAGS in tix" ; \ - (cd tix && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - TAGS) \ - || exit 1 - -@endif tix - -.PHONY: maybe-install-info-tix install-info-tix -maybe-install-info-tix: -@if tix -maybe-install-info-tix: install-info-tix - -install-info-tix: \ - configure-tix \ - info-tix - @[ -f ./tix/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing install-info in tix" ; \ - (cd tix && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - install-info) \ - || exit 1 - -@endif tix - -.PHONY: maybe-installcheck-tix installcheck-tix -maybe-installcheck-tix: -@if tix -maybe-installcheck-tix: installcheck-tix - -installcheck-tix: \ - configure-tix - @[ -f ./tix/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing installcheck in tix" ; \ - (cd tix && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - installcheck) \ - || exit 1 - -@endif tix - -.PHONY: maybe-mostlyclean-tix mostlyclean-tix -maybe-mostlyclean-tix: -@if tix -maybe-mostlyclean-tix: mostlyclean-tix - -mostlyclean-tix: - @[ -f ./tix/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing mostlyclean in tix" ; \ - (cd tix && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - mostlyclean) \ - || exit 1 - -@endif tix - -.PHONY: maybe-clean-tix clean-tix -maybe-clean-tix: -@if tix -maybe-clean-tix: clean-tix - -clean-tix: - @[ -f ./tix/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing clean in tix" ; \ - (cd tix && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - clean) \ - || exit 1 - -@endif tix - -.PHONY: maybe-distclean-tix distclean-tix -maybe-distclean-tix: -@if tix -maybe-distclean-tix: distclean-tix - -distclean-tix: - @[ -f ./tix/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing distclean in tix" ; \ - (cd tix && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - distclean) \ - || exit 1 - -@endif tix - -.PHONY: maybe-maintainer-clean-tix maintainer-clean-tix -maybe-maintainer-clean-tix: -@if tix -maybe-maintainer-clean-tix: maintainer-clean-tix - -maintainer-clean-tix: - @[ -f ./tix/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing maintainer-clean in tix" ; \ - (cd tix && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - maintainer-clean) \ - || exit 1 - -@endif tix - - .PHONY: configure-libtermcap maybe-configure-libtermcap maybe-configure-libtermcap: @if libtermcap @@ -29444,7 +29128,6 @@ all-gdb: maybe-all-sim install-gdb: maybe-install-tcl install-gdb: maybe-install-tk install-gdb: maybe-install-itcl -install-gdb: maybe-install-tix install-gdb: maybe-install-libgui configure-libgui: maybe-configure-tcl configure-libgui: maybe-configure-tk @@ -29613,10 +29296,6 @@ all-itcl: maybe-all-tk install-itcl: maybe-install-tcl configure-tk: maybe-configure-tcl all-tk: maybe-all-tcl -configure-tix: maybe-configure-tcl -configure-tix: maybe-configure-tk -all-tix: maybe-all-tcl -all-tix: maybe-all-tk all-sid: maybe-all-libiberty all-sid: maybe-all-bfd all-sid: maybe-all-opcodes @@ -891,7 +891,7 @@ build_tools="build-texinfo build-byacc build-flex build-bison build-m4" # these libraries are used by various programs built for the host environment # -host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl tix libgui zlib libbanshee libcpp" +host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libbanshee libcpp" # these tools are built for the host environment # Note, the powerpc-eabi build depends on sim occurring before gdb in order to @@ -1008,7 +1008,7 @@ fi case ${with_x} in yes | "") ;; # the default value for this tree is that X11 is available no) - skipdirs="${skipdirs} tk tix itcl libgui" + skipdirs="${skipdirs} tk itcl libgui" # We won't be able to build gdbtk without X. enable_gdbtk=no ;; @@ -1059,17 +1059,17 @@ case "${host}" in noconfigdirs="$noconfigdirs byacc" ;; i[3456789]86-*-vsta) - noconfigdirs="$noconfigdirs tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl itcl tix gnuserv gettext" + noconfigdirs="$noconfigdirs tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl itcl gnuserv gettext" ;; i[3456789]86-*-go32* | i[3456789]86-*-msdosdjgpp*) - noconfigdirs="$noconfigdirs tcl tk expect dejagnu send-pr uudecode guile itcl tix gnuserv libffi" + noconfigdirs="$noconfigdirs tcl tk expect dejagnu send-pr uudecode guile itcl gnuserv libffi" ;; i[3456789]86-*-mingw32*) - # noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl itcl tix gnuserv" + # noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl itcl gnuserv" noconfigdirs="$noconfigdirs expect dejagnu autoconf automake send-pr rcs guile perl texinfo libtool" ;; i[3456789]86-*-beos*) - noconfigdirs="$noconfigdirs tk itcl tix libgui gdb" + noconfigdirs="$noconfigdirs tk itcl libgui gdb" ;; *-*-cygwin*) noconfigdirs="$noconfigdirs autoconf automake send-pr rcs guile perl" @@ -1078,13 +1078,13 @@ case "${host}" in noconfigdirs="$noconfigdirs rcs" ;; ppc*-*-pe) - noconfigdirs="$noconfigdirs patch diff make tk tcl expect dejagnu autoconf automake texinfo bison send-pr gprof rcs guile perl itcl tix gnuserv" + noconfigdirs="$noconfigdirs patch diff make tk tcl expect dejagnu autoconf automake texinfo bison send-pr gprof rcs guile perl itcl gnuserv" ;; powerpc-*-beos*) - noconfigdirs="$noconfigdirs tk itcl tix libgui gdb dejagnu readline" + noconfigdirs="$noconfigdirs tk itcl libgui gdb dejagnu readline" ;; *-*-darwin*) - noconfigdirs="$noconfigdirs tk itcl tix libgui" + noconfigdirs="$noconfigdirs tk itcl libgui" ;; esac @@ -1246,7 +1246,7 @@ case "${target}" in noconfigdirs="$noconfigdirs ${libgcj}" noconfigdirs="$noconfigdirs target-examples" noconfigdirs="$noconfigdirs target-libiberty texinfo send-pr" - noconfigdirs="$noconfigdirs tcl tix tk itcl libgui sim" + noconfigdirs="$noconfigdirs tcl tk itcl libgui sim" noconfigdirs="$noconfigdirs expect dejagnu" # the C++ libraries don't build on top of CE's C libraries noconfigdirs="$noconfigdirs target-libstdc++-v3" @@ -1347,11 +1347,11 @@ case "${target}" in ;; 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 ${libgcj} tix readline mmalloc libgui itcl gdb ld" + noconfigdirs="$noconfigdirs ${libgcj} readline mmalloc libgui itcl gdb ld" ;; i[3456789]86-*-coff | i[3456789]86-*-elf) noconfigdirs="$noconfigdirs ${libgcj}" @@ -1382,7 +1382,7 @@ case "${target}" in # Can't build gdb for mingw32 if not native. case "${host}" in i[3456789]86-*-mingw32) ;; # keep gdb tcl tk expect etc. - *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl tix gnuserv" + *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl gnuserv" ;; esac ;; @@ -1400,7 +1400,7 @@ case "${target}" in # 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 gnuserv" + *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl libgui gnuserv" ;; esac ;; @@ -1456,13 +1456,13 @@ case "${target}" in ;; powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe) target_configdirs="$target_configdirs target-winsup" - noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl tix gnuserv ${libgcj}" + noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl 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 gnuserv ${libgcj}" + noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl gnuserv ${libgcj}" ;; powerpc-*-beos*) noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}" @@ -3052,7 +3052,7 @@ build_configdirs=`echo "${build_configdirs}" | sed -e 's/build-//g'` # leave out the maybe dependencies when enable_gdbtk is false. I'm not # 100% sure that that's safe though. -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" case "$enable_gdbtk" in no) GDB_TK="" ;; @@ -4897,34 +4897,15 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then we branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\_ACEOF -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g -t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g -t quote -d -: quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g -s,\[,\\&,g -s,\],\\&,g -s,\$,$$,g -p -_ACEOF -# We use echo to avoid assuming a particular line-breaking character. -# The extra dot is to prevent the shell from consuming trailing -# line-breaks from the sub-command output. A line-break within -# single-quotes doesn't work because, if this script is created in a -# platform that uses two characters for line-breaks (e.g., DOS), tr -# would break. -ac_LF_and_DOT=`echo; echo .` -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` -rm -f confdef2opt.sed +cat > conftest.defs <<\EOF +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g +s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g +s%\[%\\&%g +s%\]%\\&%g +s%\$%$$%g +EOF +DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` +rm -f conftest.defs # Without the "./", some shells look in PATH for config.status. diff --git a/configure.in b/configure.in index 9a04dad..67ad4e5 100644 --- a/configure.in +++ b/configure.in @@ -136,7 +136,7 @@ build_tools="build-texinfo build-byacc build-flex build-bison build-m4" # these libraries are used by various programs built for the host environment # -host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl tix libgui zlib libbanshee libcpp" +host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libbanshee libcpp" # these tools are built for the host environment # Note, the powerpc-eabi build depends on sim occurring before gdb in order to @@ -232,7 +232,7 @@ fi case ${with_x} in yes | "") ;; # the default value for this tree is that X11 is available no) - skipdirs="${skipdirs} tk tix itcl libgui" + skipdirs="${skipdirs} tk itcl libgui" # We won't be able to build gdbtk without X. enable_gdbtk=no ;; @@ -283,17 +283,17 @@ case "${host}" in noconfigdirs="$noconfigdirs byacc" ;; i[[3456789]]86-*-vsta) - noconfigdirs="$noconfigdirs tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl itcl tix gnuserv gettext" + noconfigdirs="$noconfigdirs tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl itcl gnuserv gettext" ;; i[[3456789]]86-*-go32* | i[[3456789]]86-*-msdosdjgpp*) - noconfigdirs="$noconfigdirs tcl tk expect dejagnu send-pr uudecode guile itcl tix gnuserv libffi" + noconfigdirs="$noconfigdirs tcl tk expect dejagnu send-pr uudecode guile itcl gnuserv libffi" ;; i[[3456789]]86-*-mingw32*) - # noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl itcl tix gnuserv" + # noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl itcl gnuserv" noconfigdirs="$noconfigdirs expect dejagnu autoconf automake send-pr rcs guile perl texinfo libtool" ;; i[[3456789]]86-*-beos*) - noconfigdirs="$noconfigdirs tk itcl tix libgui gdb" + noconfigdirs="$noconfigdirs tk itcl libgui gdb" ;; *-*-cygwin*) noconfigdirs="$noconfigdirs autoconf automake send-pr rcs guile perl" @@ -302,13 +302,13 @@ case "${host}" in noconfigdirs="$noconfigdirs rcs" ;; ppc*-*-pe) - noconfigdirs="$noconfigdirs patch diff make tk tcl expect dejagnu autoconf automake texinfo bison send-pr gprof rcs guile perl itcl tix gnuserv" + noconfigdirs="$noconfigdirs patch diff make tk tcl expect dejagnu autoconf automake texinfo bison send-pr gprof rcs guile perl itcl gnuserv" ;; powerpc-*-beos*) - noconfigdirs="$noconfigdirs tk itcl tix libgui gdb dejagnu readline" + noconfigdirs="$noconfigdirs tk itcl libgui gdb dejagnu readline" ;; *-*-darwin*) - noconfigdirs="$noconfigdirs tk itcl tix libgui" + noconfigdirs="$noconfigdirs tk itcl libgui" ;; esac @@ -462,7 +462,7 @@ case "${target}" in noconfigdirs="$noconfigdirs ${libgcj}" noconfigdirs="$noconfigdirs target-examples" noconfigdirs="$noconfigdirs target-libiberty texinfo send-pr" - noconfigdirs="$noconfigdirs tcl tix tk itcl libgui sim" + noconfigdirs="$noconfigdirs tcl tk itcl libgui sim" noconfigdirs="$noconfigdirs expect dejagnu" # the C++ libraries don't build on top of CE's C libraries noconfigdirs="$noconfigdirs target-libstdc++-v3" @@ -563,11 +563,11 @@ case "${target}" in ;; 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 ${libgcj} tix readline mmalloc libgui itcl gdb ld" + noconfigdirs="$noconfigdirs ${libgcj} readline mmalloc libgui itcl gdb ld" ;; i[[3456789]]86-*-coff | i[[3456789]]86-*-elf) noconfigdirs="$noconfigdirs ${libgcj}" @@ -598,7 +598,7 @@ case "${target}" in # Can't build gdb for mingw32 if not native. case "${host}" in i[[3456789]]86-*-mingw32) ;; # keep gdb tcl tk expect etc. - *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl tix gnuserv" + *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl gnuserv" ;; esac ;; @@ -616,7 +616,7 @@ case "${target}" in # 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 gnuserv" + *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl libgui gnuserv" ;; esac ;; @@ -672,13 +672,13 @@ case "${target}" in ;; powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe) target_configdirs="$target_configdirs target-winsup" - noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl tix gnuserv ${libgcj}" + noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl 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 gnuserv ${libgcj}" + noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl gnuserv ${libgcj}" ;; powerpc-*-beos*) noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}" @@ -1653,7 +1653,7 @@ build_configdirs=`echo "${build_configdirs}" | sed -e 's/build-//g'` # leave out the maybe dependencies when enable_gdbtk is false. I'm not # 100% sure that that's safe though. -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" case "$enable_gdbtk" in no) GDB_TK="" ;; diff --git a/src-release b/src-release index e08d17a..f012d9d 100644 --- a/src-release +++ b/src-release @@ -309,7 +309,7 @@ gdb+dejagnu.tar: $(DIST_SUPPORT) $(GDBD_SUPPORT_DIRS) gdb SUPPORT_FILES="$(GDBD_SUPPORT_DIRS)" .PHONY: insight.tar.bz2 -INSIGHT_SUPPORT_DIRS= $(GDB_SUPPORT_DIRS) tcl tk itcl tix libgui +INSIGHT_SUPPORT_DIRS= $(GDB_SUPPORT_DIRS) tcl tk itcl libgui insight.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb $(MAKE) -f $(SELF) gdb-taz TOOL=gdb PACKAGE=insight \ MD5PROG="$(MD5PROG)" \ |