public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
* [RFA] Remove --disable-gdbcli and --disable-gdbmi
@ 2018-06-28 17:21 Tom Tromey
  2018-06-28 18:34 ` Eli Zaretskii
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Tom Tromey @ 2018-06-28 17:21 UTC (permalink / raw)
  To: gdb-patches; +Cc: Tom Tromey

I think it doesn't really make sense to allow building gdb without the
CLI or without MI.  Perhaps at one time this was a goal, but libgdb is
long gone, the CLI is intrinsic to gdb, and MI is relied on by many
GUIs.

So, this patch removes the implementation of these configure options.
They are still recognized (this is autoconf's default), but do
nothing.

This simplifies configure.ac and Makefile.in a bit.

Tested by rebuilding.

gdb/ChangeLog
2018-06-28  Tom Tromey  <tom@tromey.com>

	* configure.ac: Remove --disable-gdbcli and --disable-gdbmi.
	* configure: Rebuild.
	* Makefile.in (SUBDIR_CLI_DEPS, SUBDIR_CLI_LDFLAGS)
	(SUBDIR_CLI_CFLAGS, SUBDIR_MI_DEPS, SUBDIR_MI_LDFLAGS)
	(SUBDIR_MI_CFLAGS): Remove.
	(SUBDIR_MI_SRCS): Add mi-common.c.
	(SFILES): Use SUBDIR_CLI_SRCS, SUBDIR_MI_SRCS.  Don't mention
	mi-common.c.
	(COMMON_OBS): Use SUBDIR_CLI_OBS, SUBDIR_MI_OBS.  Don't mention
	mi-common.o.
---
 gdb/ChangeLog    | 13 ++++++++++++
 gdb/Makefile.in  | 15 +++++---------
 gdb/NEWS         |  5 +++++
 gdb/configure    | 52 ------------------------------------------------
 gdb/configure.ac | 42 --------------------------------------
 5 files changed, 23 insertions(+), 104 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 417c563849a..4ae266837a4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+2018-06-28  Tom Tromey  <tom@tromey.com>
+
+	* configure.ac: Remove --disable-gdbcli and --disable-gdbmi.
+	* configure: Rebuild.
+	* Makefile.in (SUBDIR_CLI_DEPS, SUBDIR_CLI_LDFLAGS)
+	(SUBDIR_CLI_CFLAGS, SUBDIR_MI_DEPS, SUBDIR_MI_LDFLAGS)
+	(SUBDIR_MI_CFLAGS): Remove.
+	(SUBDIR_MI_SRCS): Add mi-common.c.
+	(SFILES): Use SUBDIR_CLI_SRCS, SUBDIR_MI_SRCS.  Don't mention
+	mi-common.c.
+	(COMMON_OBS): Use SUBDIR_CLI_OBS, SUBDIR_MI_OBS.  Don't mention
+	mi-common.o.
+
 2018-06-28  Pedro Alves  <palves@redhat.com>
 
 	* infrun.c (handle_inferior_event_1) <TARGET_WAITKIND_EXECD>:
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 5934cd6a23e..eeff729dac9 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -249,10 +249,6 @@ SUBDIR_CLI_SRCS = \
 
 SUBDIR_CLI_OBS = $(patsubst %.c,%.o,$(SUBDIR_CLI_SRCS))
 
-SUBDIR_CLI_DEPS =
-SUBDIR_CLI_LDFLAGS =
-SUBDIR_CLI_CFLAGS =
-
 #
 # MI sub directory definitons
 #
@@ -267,6 +263,7 @@ SUBDIR_MI_SRCS = \
 	mi/mi-cmd-target.c \
 	mi/mi-cmd-var.c \
 	mi/mi-cmds.c \
+	mi/mi-common.c \
 	mi/mi-console.c \
 	mi/mi-getopt.c \
 	mi/mi-interp.c \
@@ -277,10 +274,6 @@ SUBDIR_MI_SRCS = \
 
 SUBDIR_MI_OBS = $(patsubst %.c,%.o,$(SUBDIR_MI_SRCS))
 
-SUBDIR_MI_DEPS =
-SUBDIR_MI_LDFLAGS =
-SUBDIR_MI_CFLAGS =
-
 #
 # TUI sub directory definitions
 #
@@ -1159,7 +1152,8 @@ SFILES = \
 	stub-termcap.c \
 	symfile-mem.c \
 	ui-file.h \
-	mi/mi-common.c \
+	$(SUBDIR_CLI_SRCS) \
+	$(SUBDIR_MI_SRCS) \
 	$(SUBDIR_TARGET_SRCS) \
 	$(COMMON_SFILES) \
 	$(SUBDIR_GCC_COMPILE_SRCS)
@@ -1555,10 +1549,11 @@ TAGFILES_WITH_SRCDIR = $(HFILES_WITH_SRCDIR)
 
 COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
 	exec.o \
-	mi/mi-common.o \
 	version.o \
 	xml-builtin.o \
 	$(patsubst %.c,%.o,$(COMMON_SFILES)) \
+	$(SUBDIR_CLI_OBS) \
+	$(SUBDIR_MI_OBS) \
 	$(SUBDIR_TARGET_OBS) \
 	$(SUBDIR_GCC_COMPILE_OBS)
 
diff --git a/gdb/NEWS b/gdb/NEWS
index 016796a802a..a5199d20ef6 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -94,6 +94,11 @@ SH-5/SH64 running OpenBSD 	SH-5/SH64 support in sh*-*-openbsd*
   the tradeoff that there is a possibility of false hits being
   reported.
 
+* Configure changes
+
+--disable-gdbmi and --disable-gdbcli have been removed
+  These are now silently accepted, but do nothing.
+
 *** Changes in GDB 8.1
 
 * GDB now supports dynamically creating arbitrary register groups specified
diff --git a/gdb/configure b/gdb/configure
index d3a3bbe44c9..48c192888df 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -854,8 +854,6 @@ with_auto_load_dir
 with_auto_load_safe_path
 enable_targets
 enable_64_bit_bfd
-enable_gdbcli
-enable_gdbmi
 enable_tui
 enable_gdbtk
 with_libunwind_ia64
@@ -1545,8 +1543,6 @@ Optional Features:
   --enable-targets=TARGETS
                           alternative target configurations
   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
-  --disable-gdbcli        disable command-line interface (CLI)
-  --disable-gdbmi         disable machine-interface (MI)
   --enable-tui            enable full-screen terminal user interface (TUI)
   --enable-gdbtk          enable gdbtk graphical user interface (GUI)
   --enable-profiling      enable profiling of GDB
@@ -6752,54 +6748,6 @@ _ACEOF
 
 fi
 
-# The CLI cannot be disabled yet, but may be in the future.
-
-# Enable CLI.
-# Check whether --enable-gdbcli was given.
-if test "${enable_gdbcli+set}" = set; then :
-  enableval=$enable_gdbcli; case $enableval in
-    yes)
-      ;;
-    no)
-      as_fn_error $? "the command-line interface cannot be disabled yet" "$LINENO" 5 ;;
-    *)
-      as_fn_error $? "bad value $enableval for --enable-gdbcli" "$LINENO" 5 ;;
-  esac
-else
-  enable_gdbcli=yes
-fi
-
-if test x"$enable_gdbcli" = xyes; then
-  if test -d $srcdir/cli; then
-    CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_CLI_OBS)"
-    CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_CLI_DEPS)"
-    CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_CLI_SRCS)"
-    ENABLE_CFLAGS="$ENABLE_CFLAGS \$(SUBDIR_CLI_CFLAGS)"
-  fi
-fi
-
-# Enable MI.
-# Check whether --enable-gdbmi was given.
-if test "${enable_gdbmi+set}" = set; then :
-  enableval=$enable_gdbmi; case $enableval in
-    yes | no)
-      ;;
-    *)
-      as_fn_error $? "bad value $enableval for --enable-gdbmi" "$LINENO" 5 ;;
-  esac
-else
-  enable_gdbmi=yes
-fi
-
-if test x"$enable_gdbmi" = xyes; then
-  if test -d $srcdir/mi; then
-    CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_MI_OBS)"
-    CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_MI_DEPS)"
-    CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_MI_SRCS)"
-    ENABLE_CFLAGS="$ENABLE_CFLAGS \$(SUBDIR_MI_CFLAGS)"
-  fi
-fi
-
 # Enable TUI.
 # Check whether --enable-tui was given.
 if test "${enable_tui+set}" = set; then :
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 44b6c62d709..658ae3fbaeb 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -299,48 +299,6 @@ if test "x$targ_defvec" != x; then
     [Define to BFD's default target vector. ])
 fi
 
-# The CLI cannot be disabled yet, but may be in the future.
-
-# Enable CLI.
-AC_ARG_ENABLE(gdbcli,
-AS_HELP_STRING([--disable-gdbcli], [disable command-line interface (CLI)]),
-  [case $enableval in
-    yes)
-      ;;
-    no)
-      AC_MSG_ERROR([the command-line interface cannot be disabled yet]) ;;
-    *)
-      AC_MSG_ERROR([bad value $enableval for --enable-gdbcli]) ;;
-  esac],
-  [enable_gdbcli=yes])
-if test x"$enable_gdbcli" = xyes; then
-  if test -d $srcdir/cli; then
-    CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_CLI_OBS)"
-    CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_CLI_DEPS)"
-    CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_CLI_SRCS)"
-    ENABLE_CFLAGS="$ENABLE_CFLAGS \$(SUBDIR_CLI_CFLAGS)"
-  fi
-fi
-
-# Enable MI.
-AC_ARG_ENABLE(gdbmi,
-AS_HELP_STRING([--disable-gdbmi], [disable machine-interface (MI)]),
-  [case $enableval in
-    yes | no)
-      ;;
-    *)
-      AC_MSG_ERROR([bad value $enableval for --enable-gdbmi]) ;;
-  esac],
-  [enable_gdbmi=yes])
-if test x"$enable_gdbmi" = xyes; then
-  if test -d $srcdir/mi; then
-    CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_MI_OBS)"
-    CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_MI_DEPS)"
-    CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_MI_SRCS)"
-    ENABLE_CFLAGS="$ENABLE_CFLAGS \$(SUBDIR_MI_CFLAGS)"
-  fi
-fi
-
 # Enable TUI.
 AC_ARG_ENABLE(tui,
 AS_HELP_STRING([--enable-tui], [enable full-screen terminal user interface (TUI)]),
-- 
2.17.1

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-07-17 16:05 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-28 17:21 [RFA] Remove --disable-gdbcli and --disable-gdbmi Tom Tromey
2018-06-28 18:34 ` Eli Zaretskii
2018-07-16 16:38 ` Tom Tromey
2018-07-17 12:23 ` Pedro Alves
2018-07-17 14:02   ` Tom Tromey
2018-07-17 16:00     ` Tom Tromey
2018-07-17 16:05       ` Pedro Alves

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).