* Makefile.in (SUBDIR_CLI_OBS): Don't mention cli-utils.o.

	(SUBDIR_CLI_DEPS): Don't mention cli-utils.c.
	(HFILES_NO_SRCDIR): Don't mention cli-utils.h.
	(cli-utils.o): Remove.
	* cli/cli-utils.c: Remove.
	* cli/cli-utils.h: Remove.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b2fa68ff7671bda118f7865fd6f19a2ebb35dc14..d104a96f0b3311304a9e49b48b5068d3b43612ad 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-28  Tom Tromey  <tromey@redhat.com>
+
+       * Makefile.in (SUBDIR_CLI_OBS): Don't mention cli-utils.o.
+       (SUBDIR_CLI_DEPS): Don't mention cli-utils.c.
+       (HFILES_NO_SRCDIR): Don't mention cli-utils.h.
+       (cli-utils.o): Remove.
+       * cli/cli-utils.c: Remove.
+       * cli/cli-utils.h: Remove.
+
 2008-10-28  Tom Tromey  <tromey@redhat.com>
 
        * varobj.c (value_get_print_value): Include valprint.h.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index ec4b1d2c488c2c39af45e3a96e41c967a16adfe2..5432c888208cb62f45aaa59c4947601f9e64f509 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -185,15 +185,14 @@ GNULIB_H = gnulib/string.h @GNULIB_STDINT_H@
 #
 SUBDIR_CLI_OBS = \
        cli-dump.o \
-       cli-decode.o cli-script.o cli-cmds.o cli-setshow.o cli-utils.o \
+       cli-decode.o cli-script.o cli-cmds.o cli-setshow.o \
        cli-logging.o \
        cli-interp.o
 SUBDIR_CLI_SRCS = \
        cli/cli-dump.c \
        cli/cli-decode.c cli/cli-script.c cli/cli-cmds.c cli/cli-setshow.c \
        cli/cli-logging.c \
-       cli/cli-interp.c \
-       cli/cli-utils.c
+       cli/cli-interp.c
 SUBDIR_CLI_DEPS =
 SUBDIR_CLI_LDFLAGS=
 SUBDIR_CLI_CFLAGS=
@@ -682,7 +681,7 @@ exec.h m32r-tdep.h osabi.h gdbcore.h solib-som.h \
 i386bsd-nat.h xml-support.h xml-tdesc.h alphabsd-tdep.h gdb_obstack.h \
 ia64-tdep.h ada-lang.h varobj.h frv-tdep.h nto-tdep.h serial.h \
 c-lang.h frame.h event-loop.h block.h cli/cli-setshow.h        \
-cli/cli-decode.h cli/cli-cmds.h cli/cli-utils.h cli/cli-dump.h \
+cli/cli-decode.h cli/cli-cmds.h cli/cli-dump.h \
 cli/cli-script.h macrotab.h symtab.h version.h gnulib/wchar.in.h \
 gnulib/string.in.h gnulib/str-two-way.h gnulib/extra/link-warning.h \
 gnulib/stdint.in.h remote.h gdb.h sparc-nat.h gdbserver/win32-low.h \
@@ -1554,10 +1553,6 @@ cli-setshow.o: $(srcdir)/cli/cli-setshow.c
        $(COMPILE) $(srcdir)/cli/cli-setshow.c
        $(POSTCOMPILE)
 
-cli-utils.o: $(srcdir)/cli/cli-utils.c
-       $(COMPILE) $(srcdir)/cli/cli-utils.c
-       $(POSTCOMPILE)
-
 
 #
 # GDBTK sub-directory

diff --git a/gdb/cli/cli-utils.c b/gdb/cli/cli-utils.c
deleted file mode 100644 (file)
index adb8a6e..0000000
--- a/gdb/cli/cli-utils.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* GDB CLI utility library.
-   Copyright (c) 2001, 2007, 2008 Free Software Foundation, Inc.
-
-   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 3 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, see <http://www.gnu.org/licenses/>.  */
-
-#include "defs.h"
-#include "cli/cli-utils.h"
-

diff --git a/gdb/cli/cli-utils.h b/gdb/cli/cli-utils.h
deleted file mode 100644 (file)
index 303b768..0000000
--- a/gdb/cli/cli-utils.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Header file for GDB CLI utility library.
-   Copyright (c) 2001, 2007, 2008 Free Software Foundation, Inc.
-
-   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 3 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, see <http://www.gnu.org/licenses/>.  */
-
-#if !defined (CLI_UTILS_H)
-# define CLI_UTILS_H 1
-
-#endif /* !defined (CLI_UTILS_H) */