From: Andrew Cagney Date: Thu, 25 May 2000 01:50:50 +0000 (+0000) Subject: Have TUI use the same configury mechanism as MI. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ed952ac51281cbe9ec9ea1aec12e99b779a79540;p=binutils-gdb.git Have TUI use the same configury mechanism as MI. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 355c007aa2d..937cdebf75d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,22 @@ +Thu May 25 11:09:50 2000 Andrew Cagney + + * configure.in (AC_OUTPUT): Do not generate tui/Makefile. + (enable-tui): Convert Makefile configury to use the same mechanism + as MI. + + * Makefile.in (BUILD_TUI, TUI_LIBRARY, TUI_DIR, TUI_SRC, + TUI_CFLAGS): Delete + (all-tui): Delete target. + (tuiWin.o, tuiStack.o, tuiSourceWin.o, tuiSource.o, tuiRegs.o, + tuiLayout.o, tuiIO.o, tuiGeneralWin.o, tuiDisassem.o, + tuiDataWin.o, tuiData.o, tuiCommand.o, tui.o): New targets. + (SUBDIR_TUI_OBS, SUBDIR_TUI_SRCS, SUBDIR_TUI_DEPS, + SUBDIR_TUI_INITS, SUBDIR_TUI_LDFLAGS, SUBDIR_TUI_CFLAGS, + SUBDIR_TUI_ALL, SUBDIR_TUI_CLEAN, SUBDIR_TUI_INSTALL, + SUBDIR_TUI_UNINSTALL): Define. + + * TODO: Update. + Thu May 25 11:02:24 2000 Andrew Cagney * TODO: Update. Mark Kettenis fixed FreeBSD >2.2 support. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index ea83ebfb9d8..32a1d21fc20 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -62,14 +62,6 @@ DLLTOOL = @DLLTOOL@ WINDRES = @WINDRES@ MIG = @MIG@ -# If the user configured GDB to include the TUI, the name of the tui -# library goes here. -TUI_LIBRARY = @TUI_LIBRARY@ - -# If the user configured GDB to include the TUI, the all-tui -# target goes here. -BUILD_TUI = @BUILD_TUI@ - # Flags that describe where you can find the termcap library. # This can be overridden in the host Makefile fragment file. TERMCAP = @TERM_LIB@ @@ -142,11 +134,6 @@ INTL_DEPS = @INTLDEPS@ INTL_SRC = $(srcdir)/$(INTL_DIR) INTL_CFLAGS = -I$(INTL_DIR) -I$(INTL_SRC) -# Where is the TUI library? Typically in tui/. -TUI_DIR=tui -TUI_SRC = $(srcdir)/$(TUI_DIR) -TUI_CFLAGS= -I$(TUI_SRC) - # # MI sub directory definitons # @@ -172,6 +159,33 @@ SUBDIR_MI_CLEAN= SUBDIR_MI_INSTALL= SUBDIR_MI_UNINSTALL= +# +# TUI sub directory definitions +# +SUBDIR_TUI_OBS = \ + tui.o tuiData.o tuiSource.o tuiStack.o tuiIO.o \ + tuiGeneralWin.o tuiLayout.o tuiWin.o tuiCommand.o \ + tuiDisassem.o tuiSourceWin.o tuiRegs.o tuiDataWin.o +SUBDIR_TUI_SRCS = \ + tui/tui.c tui/tuiData.c tui/tuiSource.c \ + tui/tuiStack.c tui/tuiIO.c \ + tui/tuiGeneralWin.c tui/tuiLayout.c \ + tui/tuiWin.c tui/tuiCommand.c \ + tui/tuiDisassem.c tui/tuiSourceWin.c \ + tui/tuiRegs.c tui/tuiDataWin.c +SUBDIR_TUI_DEPS = +SUBDIR_TUI_INITS = \ + $(SUBDIR_TUI_SRCS) +SUBDIR_TUI_LDFLAGS= +SUBDIR_TUI_CFLAGS= \ + -DTUI=1 -I${srcdir}/tui +SUBDIR_TUI_ALL= +SUBDIR_TUI_CLEAN= +SUBDIR_TUI_INSTALL= +SUBDIR_TUI_UNINSTALL= + + + # Opcodes currently live in one of two places. Either they are in the # opcode library, typically ../opcodes, or they are in a header file # in INCLUDE_DIR. @@ -275,7 +289,7 @@ INTERNAL_WARN_CFLAGS = \ $(CFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \ $(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) \ $(BFD_CFLAGS) $(MMALLOC_CFLAGS) $(INCLUDE_CFLAGS) \ - $(INTL_CFLAGS) $(TUI_CFLAGS) $(ENABLE_CFLAGS) \ + $(INTL_CFLAGS) $(ENABLE_CFLAGS) \ $(GDB_WARN_CFLAGS) INTERNAL_CFLAGS = $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS) @@ -837,13 +851,6 @@ kdb: $(NTSSTART) $(OBS) $(NTSOBS) $(ADD_DEPS) $(CDEPS) ld -o kdb $(NTSSTART) $(OBS) $(NTSOBS) init.o $(ADD_FILES) \ -lc $(CLIBS) -# Have the TUI library depend on a phony target, so we'll always -# recurse and make sure it's up to date. If it is, then the file will -# be unchanged, and we won't rebuild it. -# .PHONY: check-tui -all-tui: - @(cd tui; ${MAKE} ${FLAGS_TO_PASS} all) - # Put the proper machine-specific files first, so M-. on a machine # specific routine gets the one for the correct machine. (FIXME: those # files go in twice; we should be removing them from the main list). @@ -1987,4 +1994,69 @@ mi-parse.o: $(srcdir)/mi/mi-parse.c $(defs_h) $(mi_parse_h) $(mi_cmds_h) mi-getopt.o: $(srcdir)/mi/mi-getopt.c $(mi_getopt_h) $(defs_h) $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-getopt.c +# +# TUI dependencies +# +# Need to explicitly specify the compile rule as make will do nothing +# or try to compile the object file into the mi directory. + +tui.o: $(srcdir)/tui/tui.c \ + $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \ + $(srcdir)/tui/tuiLayout.h $(srcdir)/tui/tuiIO.h \ + $(srcdir)/tui/tuiRegs.h $(srcdir)/tui/tuiWin.h + $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tui.c +tuiCommand.o: $(srcdir)/tui/tuiCommand.c \ + $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \ + $(srcdir)/tui/tuiWin.h $(srcdir)/tui/tuiIO.h + $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiCommand.c +tuiData.o: $(srcdir)/tui/tuiData.c \ + $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h + $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiData.c +tuiDataWin.o: $(srcdir)/tui/tuiDataWin.c \ + $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \ + $(srcdir)/tui/tuiRegs.h + $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiDataWin.c +tuiDisassem.o: $(srcdir)/tui/tuiDisassem.c \ + $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \ + $(srcdir)/tui/tuiLayout.h $(srcdir)/tui/tuiSourceWin.h \ + $(srcdir)/tui/tuiStack.h + $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiDisassem.c +tuiGeneralWin.o: $(srcdir)/tui/tuiGeneralWin.c \ + $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \ + $(srcdir)/tui/tuiGeneralWin.h + $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiGeneralWin.c +tuiIO.o: $(srcdir)/tui/tuiIO.c \ + $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \ + $(srcdir)/tui/tuiIO.h $(srcdir)/tui/tuiCommand.h \ + $(srcdir)/tui/tuiWin.h + $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiIO.c +tuiLayout.o: $(srcdir)/tui/tuiLayout.c \ + $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \ + $(srcdir)/tui/tuiGeneralWin.h $(srcdir)/tui/tuiStack.h \ + $(srcdir)/tui/tuiRegs.h $(srcdir)/tui/tuiDisassem.h + $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiLayout.c +tuiRegs.o: $(srcdir)/tui/tuiRegs.c \ + $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \ + $(srcdir)/tui/tuiLayout.h $(srcdir)/tui/tuiWin.h + $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiRegs.c +tuiSource.o: $(srcdir)/tui/tuiSource.c \ + $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \ + $(srcdir)/tui/tuiStack.h $(srcdir)/tui/tuiSourceWin.h \ + $(srcdir)/tui/tuiSource.h + $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiSource.c +tuiSourceWin.o: $(srcdir)/tui/tuiSourceWin.c \ + $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \ + $(srcdir)/tui/tuiStack.h $(srcdir)/tui/tuiSourceWin.h \ + $(srcdir)/tui/tuiSource.h $(srcdir)/tui/tuiDisassem.h + $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiSourceWin.c +tuiStack.o: $(srcdir)/tui/tuiStack.c \ + $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \ + $(srcdir)/tui/tuiStack.h $(srcdir)/tui/tuiSourceWin.h + $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiStack.c +tuiWin.o: $(srcdir)/tui/tuiWin.c \ + $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \ + $(srcdir)/tui/tuiGeneralWin.h $(srcdir)/tui/tuiStack.h \ + $(srcdir)/tui/tuiSourceWin.h $(srcdir)/tui/tuiDataWin.h + $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiWin.c + ### end of the gdb Makefile.in. diff --git a/gdb/TODO b/gdb/TODO index f74f3d9cb03..b4c118c719b 100644 --- a/gdb/TODO +++ b/gdb/TODO @@ -303,15 +303,6 @@ Nuke USG define. -- -Eliminate gdb/tui/Makefile.in. -Cleanup configury support for optional sub-directories. - -Check how GCC handles multiple front ends for an example of how things -could work. A tentative first step is to rationalize things so that -all sub directories are handled in a fashion similar to gdb/mi. - --- - [PATCH/5] src/intl/Makefile.in:distclean additions http://sourceware.cygnus.com/ml/gdb-patches/2000-04/msg00363.html @@ -633,6 +624,18 @@ Convert ALL architectures to MULTI-ARCH. Convert GDB build process to AUTOMAKE. +See also sub-directory configure below. + +-- + +Cleanup configury support for optional sub-directories. + +Check how GCC handles multiple front ends for an example of how things +could work. A tentative first step is to rationalize things so that +all sub directories are handled in a fashion similar to gdb/mi. + +See also automake above. + -- Restructure gdb directory tree so that it avoids any 8.3 and 14 diff --git a/gdb/configure b/gdb/configure index e1eeaa069ed..c20548d82c5 100755 --- a/gdb/configure +++ b/gdb/configure @@ -5461,21 +5461,20 @@ fi case ${enable_tui} in "yes" ) - cat >> confdefs.h <<\EOF -#define TUI 1 -EOF - - BUILD_TUI=all-tui - TUI_LIBRARY=tui/libtui.a - ;; - * ) - BUILD_TUI= - TUI_LIBRARY= - ;; + if test -d "${srcdir}/tui" ; then + CONFIG_OBS="${CONFIG_OBS} \$(SUBDIR_TUI_OBS)" + CONFIG_DEPS="${CONFIG_DEPS} \$(SUBDIR_TUI_DEPS)" + CONFIG_SRCS="${CONFIG_SRS} \$(SUBDIR_TUI_SRCS)" + CONFIG_INITS="${CONFIG_INITS} \$(SUBDIR_TUI_INITS)" + ENABLE_CFLAGS="${ENABLE_CFLAGS} \$(SUBDIR_TUI_CFLAGS)" + CONFIG_ALL="${CONFIG_ALL} \$(SUBDIR_TUI_ALL)" + CONFIG_CLEAN="${CONFIG_CLEAN} \$(SUBDIR_TUI_CLEAN)" + CONFIG_INSTALL="${CONFIG_INSTALL} \$(SUBDIR_TUI_INSTALL)" + CONFIG_UNINSTALL="${CONFIG_UNINSTALL} \$(SUBDIR_TUI_UNINSTALL)" + fi + ;; esac - - # Check whether --enable-netrom or --disable-netrom was given. if test "${enable_netrom+set}" = set; then enableval="$enable_netrom" @@ -5524,7 +5523,7 @@ WERROR_CFLAGS="" if test "x${build_warnings}" != x -a "x$GCC" = xyes then echo $ac_n "checking compiler warning flags""... $ac_c" 1>&6 -echo "configure:5528: checking compiler warning flags" >&5 +echo "configure:5527: checking compiler warning flags" >&5 # Separate out the -Werror flag as some files just cannot be # compiled with it enabled. for w in ${build_warnings}; do @@ -5587,12 +5586,12 @@ fi if test $want_included_regex = false; then echo $ac_n "checking for GNU regex""... $ac_c" 1>&6 -echo "configure:5591: checking for GNU regex" >&5 +echo "configure:5590: checking for GNU regex" >&5 if eval "test \"`echo '$''{'gdb_cv_have_gnu_regex'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5604,7 +5603,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5608: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gdb_cv_have_gnu_regex=yes else @@ -5633,12 +5632,12 @@ fi # In the Cygwin environment, we need some additional flags. echo $ac_n "checking for cygwin""... $ac_c" 1>&6 -echo "configure:5637: checking for cygwin" >&5 +echo "configure:5636: checking for cygwin" >&5 if eval "test \"`echo '$''{'gdb_cv_os_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:5676: checking for tgetent in -lncurses" >&5 +echo "configure:5675: checking for tgetent in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5680,7 +5679,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5710,7 +5709,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -lHcurses""... $ac_c" 1>&6 -echo "configure:5714: checking for tgetent in -lHcurses" >&5 +echo "configure:5713: checking for tgetent in -lHcurses" >&5 ac_lib_var=`echo Hcurses'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5718,7 +5717,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lHcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5748,7 +5747,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermlib""... $ac_c" 1>&6 -echo "configure:5752: checking for tgetent in -ltermlib" >&5 +echo "configure:5751: checking for tgetent in -ltermlib" >&5 ac_lib_var=`echo termlib'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5756,7 +5755,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermlib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5786,7 +5785,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:5790: checking for tgetent in -ltermcap" >&5 +echo "configure:5789: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5794,7 +5793,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5824,7 +5823,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:5828: checking for tgetent in -lcurses" >&5 +echo "configure:5827: checking for tgetent in -lcurses" >&5 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5832,7 +5831,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5862,7 +5861,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -lterminfo""... $ac_c" 1>&6 -echo "configure:5866: checking for tgetent in -lterminfo" >&5 +echo "configure:5865: checking for tgetent in -lterminfo" >&5 ac_lib_var=`echo terminfo'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5870,7 +5869,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lterminfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6039,7 +6038,7 @@ if test "${with_tclconfig+set}" = set; then fi echo $ac_n "checking for Tcl configuration""... $ac_c" 1>&6 -echo "configure:6043: checking for Tcl configuration" >&5 +echo "configure:6042: checking for Tcl configuration" >&5 if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6147,7 +6146,7 @@ if test "${with_tkconfig+set}" = set; then fi echo $ac_n "checking for Tk configuration""... $ac_c" 1>&6 -echo "configure:6151: checking for Tk configuration" >&5 +echo "configure:6150: checking for Tk configuration" >&5 if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6243,7 +6242,7 @@ fi no_tcl=true echo $ac_n "checking for Tcl private headers. dir=${configdir}""... $ac_c" 1>&6 -echo "configure:6247: checking for Tcl private headers. dir=${configdir}" >&5 +echo "configure:6246: checking for Tcl private headers. dir=${configdir}" >&5 # Check whether --with-tclinclude or --without-tclinclude was given. if test "${with_tclinclude+set}" = set; then withval="$with_tclinclude" @@ -6309,17 +6308,17 @@ fi if test x"${ac_cv_c_tclh}" = x ; then ac_safe=`echo "tclInt.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tclInt.h""... $ac_c" 1>&6 -echo "configure:6313: checking for tclInt.h" >&5 +echo "configure:6312: checking for tclInt.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6322: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6379,7 +6378,7 @@ fi # no_tk=true echo $ac_n "checking for Tk private headers""... $ac_c" 1>&6 -echo "configure:6383: checking for Tk private headers" >&5 +echo "configure:6382: checking for Tk private headers" >&5 # Check whether --with-tkinclude or --without-tkinclude was given. if test "${with_tkinclude+set}" = set; then withval="$with_tkinclude" @@ -6445,17 +6444,17 @@ fi if test x"${ac_cv_c_tkh}" = x ; then ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tk.h""... $ac_c" 1>&6 -echo "configure:6449: checking for tk.h" >&5 +echo "configure:6448: checking for tk.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6459: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6501,7 +6500,7 @@ fi echo $ac_n "checking for Itcl private headers. srcdir=${srcdir}""... $ac_c" 1>&6 -echo "configure:6505: checking for Itcl private headers. srcdir=${srcdir}" >&5 +echo "configure:6504: checking for Itcl private headers. srcdir=${srcdir}" >&5 if test x"${ac_cv_c_itclh}" = x ; then for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itcl; do if test -f $i/generic/itcl.h ; then @@ -6524,7 +6523,7 @@ fi echo $ac_n "checking for Itk private headers. srcdir=${srcdir}""... $ac_c" 1>&6 -echo "configure:6528: checking for Itk private headers. srcdir=${srcdir}" >&5 +echo "configure:6527: checking for Itk private headers. srcdir=${srcdir}" >&5 if test x"${ac_cv_c_itkh}" = x ; then for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itk; do if test -f $i/generic/itk.h ; then @@ -6547,7 +6546,7 @@ fi echo $ac_n "checking for Tix private headers. srcdir=${srcdir}""... $ac_c" 1>&6 -echo "configure:6551: checking for Tix private headers. srcdir=${srcdir}" >&5 +echo "configure:6550: checking for Tix private headers. srcdir=${srcdir}" >&5 if test x"${ac_cv_c_tixh}" = x ; then for i in ${srcdir}/../tix ${srcdir}/../../tix ${srcdir}/../../../tix ; do if test -f $i/generic/tix.h ; then @@ -6585,7 +6584,7 @@ if test "${with_itclconfig+set}" = set; then fi echo $ac_n "checking for Itcl configuration""... $ac_c" 1>&6 -echo "configure:6589: checking for Itcl configuration" >&5 +echo "configure:6588: checking for Itcl configuration" >&5 if eval "test \"`echo '$''{'ac_cv_c_itclconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6697,7 +6696,7 @@ if test "${with_itkconfig+set}" = set; then fi echo $ac_n "checking for Itk configuration""... $ac_c" 1>&6 -echo "configure:6701: checking for Itk configuration" >&5 +echo "configure:6700: checking for Itk configuration" >&5 if eval "test \"`echo '$''{'ac_cv_c_itkconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6809,7 +6808,7 @@ if test "${with_tixconfig+set}" = set; then fi echo $ac_n "checking for Tix configuration""... $ac_c" 1>&6 -echo "configure:6813: checking for Tix configuration" >&5 +echo "configure:6812: checking for Tix configuration" >&5 if eval "test \"`echo '$''{'ac_cv_c_tixconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6948,7 +6947,7 @@ fi # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:6952: checking for X" >&5 +echo "configure:6951: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -7010,12 +7009,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7018: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7084,14 +7083,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -7373,7 +7372,7 @@ files="${files} config/nm-empty.h" links="${links} nm.h" fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:7377: checking whether ln -s works" >&5 +echo "configure:7376: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7397,12 +7396,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:7401: checking for Cygwin environment" >&5 +echo "configure:7400: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -7430,19 +7429,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:7434: checking for mingw32 environment" >&5 +echo "configure:7433: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -7461,7 +7460,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:7465: checking for executable suffix" >&5 +echo "configure:7464: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7471,7 +7470,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:7475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:7474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj | *.ilk | *.pdb) ;; @@ -7595,7 +7594,7 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Makefile tui/Makefile .gdbinit:gdbinit.in config.h:config.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile .gdbinit:gdbinit.in config.h:config.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/gdb/configure.in b/gdb/configure.in index c884e97217f..28e7a07c803 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -456,17 +456,19 @@ AC_ARG_ENABLE(tui, ]) case ${enable_tui} in "yes" ) - AC_DEFINE(TUI) - BUILD_TUI=all-tui - TUI_LIBRARY=tui/libtui.a - ;; - * ) - BUILD_TUI= - TUI_LIBRARY= - ;; + if test -d "${srcdir}/tui" ; then + CONFIG_OBS="${CONFIG_OBS} \$(SUBDIR_TUI_OBS)" + CONFIG_DEPS="${CONFIG_DEPS} \$(SUBDIR_TUI_DEPS)" + CONFIG_SRCS="${CONFIG_SRS} \$(SUBDIR_TUI_SRCS)" + CONFIG_INITS="${CONFIG_INITS} \$(SUBDIR_TUI_INITS)" + ENABLE_CFLAGS="${ENABLE_CFLAGS} \$(SUBDIR_TUI_CFLAGS)" + CONFIG_ALL="${CONFIG_ALL} \$(SUBDIR_TUI_ALL)" + CONFIG_CLEAN="${CONFIG_CLEAN} \$(SUBDIR_TUI_CLEAN)" + CONFIG_INSTALL="${CONFIG_INSTALL} \$(SUBDIR_TUI_INSTALL)" + CONFIG_UNINSTALL="${CONFIG_UNINSTALL} \$(SUBDIR_TUI_UNINSTALL)" + fi + ;; esac -AC_SUBST(BUILD_TUI) -AC_SUBST(TUI_LIBRARY) AC_ARG_ENABLE(netrom, [ --enable-netrom Enable NetROM support], @@ -1014,7 +1016,7 @@ dnl Check for exe extension set on certain hosts (e.g. Win32) AC_EXEEXT AC_CONFIG_SUBDIRS($configdirs) -AC_OUTPUT(Makefile tui/Makefile .gdbinit:gdbinit.in, +AC_OUTPUT(Makefile .gdbinit:gdbinit.in, [ dnl Autoconf doesn't provide a mechanism for modifying definitions dnl provided by makefile fragments. diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog index 3afa8b04996..1cc09ced974 100644 --- a/gdb/tui/ChangeLog +++ b/gdb/tui/ChangeLog @@ -1,3 +1,7 @@ +Mon May 15 17:16:10 2000 Andrew Cagney + + * Makefile.in: Delete. + Tue Apr 18 15:32:15 2000 Andrew Cagney * Makefile.in (distclean, maintainer-clean, realclean, diff --git a/gdb/tui/Makefile.in b/gdb/tui/Makefile.in deleted file mode 100644 index 2ae22b4e735..00000000000 --- a/gdb/tui/Makefile.in +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1998 Free Software Foundation, Inc. - -# This file is part of GDB. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -all: libtui.a - -srcdir=@srcdir@ -VPATH = @srcdir@ - -SHELL = @SHELL@ - -CC=@CC@ -CFLAGS=@CFLAGS@ -AR=@AR@ -RANLIB=@RANLIB@ - -# Host and target-dependent makefile fragments come in here. -@host_makefile_frag@ -@target_makefile_frag@ -# End of host and target-dependent makefile fragments - -# Where is our "include" directory? Typically $(srcdir)/../include. -# This is essentially the header file directory for the library -# routines in libiberty. -INCLUDE_DIR = $(srcdir)/../../include -INCLUDE_CFLAGS = -I$(INCLUDE_DIR) - -# Configured by the --with-mmalloc option to configure. -MMALLOC = @MMALLOC@ -MMALLOC_CFLAGS = @MMALLOC_CFLAGS@ - -# Where is the BFD library? Typically in ../bfd. -BFD_DIR = ../../bfd -BFD_SRC = $(srcdir)/$(BFD_DIR) -BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC) - -# Where is the READLINE library? Typically in ../readline. -READLINE_DIR = ../../readline -READLINE_SRC = $(srcdir)/$(READLINE_DIR) -READLINE_CFLAGS = -I$(READLINE_SRC) - -# Where is the INTL library? Typically in ../intl. -INTL_DIR = ../../intl -INTL_SRC = $(srcdir)/$(INTL_DIR) -INTL_CFLAGS = -I$(INTL_DIR) -I$(INTL_SRC) - -# Where is the TCL library? Typically in ../tcl. -TCL_CFLAGS = @TCLHDIR@ - -# Where is the TK library? Typically in ../tk. -TK_CFLAGS = @TKHDIR@ @TK_BUILD_INCLUDES@ - -# Where is Itcl? Typically in ../itcl. -ITCL_CFLAGS = @ITCLHDIR@ - -# Where is Tix? Typically in ../tix. -TIX_CFLAGS = @TIXHDIR@ - -X11_CFLAGS = @TK_XINCLUDES@ - -ENABLE_IDE= @ENABLE_IDE@ - -GUI_CFLAGS_X = -I$(srcdir)/../../libgui/src - -IDE_CFLAGS_X = -I$(srcdir)/../../libidetcl/src -I$(srcdir)/../../libide/src \ - `if [ x"$(ENABLE_IDE)" != x ] ; then \ - echo -DIDE -I$(srcdir)/../../ilu/runtime/mainloop;\ - fi` - -IDE_CFLAGS=$(GUI_CFLAGS_X) $(IDE_CFLAGS_X) - -ENABLE_CFLAGS= @ENABLE_CFLAGS@ - -# -I. for config files. -# -I$(srcdir) for gdb internal headers and possibly for gnu-regex.h also. -# -I$(srcdir)/config for more generic config files. - -# It is also possible that you will need to add -I/usr/include/sys if -# your system doesn't have fcntl.h in /usr/include (which is where it -# should be according to Posix). -DEFS = @DEFS@ -GDB_CFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../config $(DEFS) - -# M{H,T}_CFLAGS, if defined, have host- and target-dependent CFLAGS -# from the config directory. -GLOBAL_CFLAGS = $(MT_CFLAGS) $(MH_CFLAGS) -#PROFILE_CFLAGS = -pg - -# INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros. -INTERNAL_CFLAGS = $(CFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \ - $(GDB_CFLAGS) $(READLINE_CFLAGS) $(BFD_CFLAGS) \ - $(MMALLOC_CFLAGS) $(INCLUDE_CFLAGS) $(INTL_CFLAGS) \ - $(ENABLE_CFLAGS) - -HEADERS = tuiIO.h tuiData.h tuiGeneralWin.h tuiLayout.h tuiStack.h \ - tuiSource.h tuiCommand.h tuiWin.h tuiDisassem.h \ - tuiSourceWin.h tuiRegs.h tuiDataWin.h - -SOURCES = tui.c tuiData.c tuiSource.c tuiStack.c tuiIO.c \ - tuiGeneralWin.c tuiLayout.c tuiWin.c tuiCommand.c \ - tuiDisassem.c tuiSourceWin.c tuiRegs.c tuiDataWin.c - -OBJECTS = tui.o tuiData.o tuiSource.o tuiStack.o tuiIO.o \ - tuiGeneralWin.o tuiLayout.o tuiWin.o tuiCommand.o \ - tuiDisassem.o tuiSourceWin.o tuiRegs.o tuiDataWin.o \ - tuiInit.o - - -# Prevent Sun make from putting in the machine type. Setting -# TARGET_ARCH to nothing works for SunOS 3, 4.0, but not for 4.1. -.c.o: - $(CC) -c $(INTERNAL_CFLAGS) $< -.SUFFIXES: .cpp -.c.cpp: - $(CC) -E $(INTERNAL_CFLAGS) $< > $@ - -libtui.a: $(OBJECTS) - rm -f libtui.a - $(AR) rc libtui.a $(OBJECTS) - $(RANLIB) libtui.a - -tui.o: tui.c tui.h tuiData.h tuiLayout.h tuiIO.h tuiRegs.h tuiWin.h -tuiCommand.o: tui.h tuiData.h tuiWin.h tuiIO.h -tuiData.o: tui.h tuiData.h -tuiDataWin.o: tui.h tuiData.h tuiRegs.h -tuiDisassem.o: tui.h tuiData.h tuiLayout.h tuiSourceWin.h tuiStack.h -tuiGeneralWin.o: tui.h tuiData.h tuiGeneralWin.h -tuiIO.o: tui.h tuiData.h tuiIO.h tuiCommand.h tuiWin.h -tuiLayout.o: tui.h tuiData.h tuiGeneralWin.h tuiStack.h tuiRegs.h \ - tuiDisassem.h -tuiRegs.o: tui.h tuiData.h tuiLayout.h tuiWin.h -tuiSource.o: tui.h tuiData.h tuiStack.h tuiSourceWin.h tuiSource.h -tuiSourceWin.o: tui.h tuiData.h tuiStack.h tuiSourceWin.h tuiSource.h \ - tuiDisassem.h -tuiStack.o: tui.h tuiData.h tuiStack.h tuiSourceWin.h -tuiWin.o: tui.h tuiData.h tuiGeneralWin.h tuiStack.h tuiSourceWin.h \ - tuiDataWin.h - -tuiInit.o: tuiInit.c -tuiInit.c: $(SOURCES) - @echo Making tuiInit.c - @rm -f init.c-tmp - @echo '/* Do not modify this file. */' >init.c-tmp - @echo '/* It is created automatically by the Makefile. */'>>init.c-tmp - @echo '#include "ansidecl.h"' >>init.c-tmp - @echo 'extern void initialize_tui_files PARAMS ((void));' >>init.c-tmp - @echo 'void initialize_tui_files PARAMS ((void)) {' >>init.c-tmp - @-( cd $(srcdir) ; grep '^_initialize_[a-z_0-9A-Z]* *(' $(SOURCES) ) 2>/dev/null \ - | sed -e 's/^.*://' -e 's/^\([a-z_0-9A-Z]*\).*/ {extern void \1 PARAMS ((void)); \1 ();}/' >>init.c-tmp - @echo '}' >>init.c-tmp - @mv init.c-tmp tuiInit.c - -clean mostlyclean: - -rm -f *.o *.a - -distclean maintainer-clean realclean: clean - -rm -f Makefile config.log config.cache