gdb/

	* common/Makefile.in: Remove BFD_DIR, BFD_SRC, BFD_CFLAGS.
	(INCLUDES): Remove GDB_INCLUDE.
	(COMPILE): Remove GDB_FLAGS.
	* common/configure.ac: Remove conditionals to set includes
	and compilation flags.
	* common/configure: Regenerate.

diff --git a/gdb/common/Makefile.in b/gdb/common/Makefile.in
index 9230b87..6782631 100644
--- a/gdb/common/Makefile.in
+++ b/gdb/common/Makefile.in
@@ -27,11 +27,7 @@ COMMON_CPU_OBJ = @COMMON_CPU_OBJ@
 # when running make.  I.E.  "make CFLAGS=-Wmissing-prototypes".
 CFLAGS = @CFLAGS@
 
-BFD_DIR = ../../bfd
-BFD_SRC = $(srcdir)/$(BFD_DIR)
-BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC)
-
-INCLUDES = -I. -I../ -I$(srcdir) -I$(srcdir)/../../include @GDB_INCLUDE@
+INCLUDES = -I. -I../ -I$(srcdir) -I$(srcdir)/../../include
 
 libcommon_a_OBJS = signals.o $(COMMON_CPU_OBJ)
 libcommon_a_SOURCES = signals.c $(COMMON_CPU_SRC)
@@ -42,7 +38,7 @@ signals.o: $(srcdir)/signals.c
 	$(COMPILE) $(srcdir)/signals.c
 
 COMPILE = source='$<' object='$@' libtool=no $(CC) $(DEFS) $(INCLUDES) \
-	@GDB_FLAGS@ $(CPPFLAGS) $(ALL_CFLAGS) $(CFLAGS) -c
+	$(CPPFLAGS) $(ALL_CFLAGS) $(CFLAGS) -c
 
 # Implicit rules
 
diff --git a/gdb/common/configure b/gdb/common/configure
index 957dcc3..31b353e 100755
--- a/gdb/common/configure
+++ b/gdb/common/configure
@@ -553,8 +553,6 @@ PACKAGE_URL=
 ac_unique_file="."
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-GDB_INCLUDE
-GDB_FLAGS
 COMMON_CPU_SRC
 COMMON_CPU_OBJ
 SET_MAKE
@@ -625,7 +623,6 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_gdbserver
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1244,12 +1241,6 @@ if test -n "$ac_init_help"; then
 
   cat <<\_ACEOF
 
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-gdbserver       build libcommon.a for gdbserver
-
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -2952,26 +2943,6 @@ case "$host_cpu" in
     ;;
 esac
 
-# Determine whether or not build libcommon.a for gdbserver
-# Check whether --enable-gdbserver was given.
-if test "${enable_gdbserver+set}" = set; then :
-  enableval=$enable_gdbserver;
-else
-  enable_gdbserver=no
-fi
-
-
-if test x"$enable_gdbserver" = xyes; then
-  GDB_FLAGS="-DGDBSERVER"
-  GDB_INCLUDE="-I\$(srcdir)/../gdbserver/"
-else
-  GDB_FLAGS=""
-  GDB_INCLUDE="-I\$(srcdir)/../ -I\$(BFD_DIR)"
-fi
-
-
-
-
 
 
 ac_config_files="$ac_config_files Makefile"
diff --git a/gdb/common/configure.ac b/gdb/common/configure.ac
index 1ef85fe..4f0d904 100644
--- a/gdb/common/configure.ac
+++ b/gdb/common/configure.ac
@@ -53,22 +53,6 @@ case "$host_cpu" in
     ;;
 esac
 
-# Determine whether or not build libcommon.a for gdbserver
-AC_ARG_ENABLE(gdbserver,
-[  --enable-gdbserver       build libcommon.a for gdbserver],
-[], [enable_gdbserver=no])
-
-if test x"$enable_gdbserver" = xyes; then
-  GDB_FLAGS="-DGDBSERVER"
-  GDB_INCLUDE="-I\$(srcdir)/../gdbserver/"
-else
-  GDB_FLAGS=""
-  GDB_INCLUDE="-I\$(srcdir)/../ -I\$(BFD_DIR)"
-fi
-
-AC_SUBST(GDB_FLAGS)
-AC_SUBST(GDB_INCLUDE)
-
 AC_EXEEXT
 
 AC_OUTPUT([Makefile])