* Makefile.in (COMMON_OBS): Remove tui-file.o.

	(SUBDIR_TUI_OBS): Add it here.
	(SUBDIR_TUI_SRCS): Move tui-file.c and tui-file.h here.
	(main.o): Remove dependency with tui-file.h.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ec98c81ec4d346eef5cd63c0022630b2b4942f1c..6e7544a939866f6f43987c9d489aca6f712a7787 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-18  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
+
+       * Makefile.in (COMMON_OBS): Remove tui-file.o.
+       (SUBDIR_TUI_OBS): Add it here.
+       (SUBDIR_TUI_SRCS): Move tui-file.c and tui-file.h here.
+       (main.o): Remove dependency with tui-file.h.
+
 2001-07-17  Elena Zannoni  <ezannoni@redhat.com>
 
        * Makefile.in (tui-file.o): Update dependencies.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 3e87fef746d2ebaf70c6e6eeccea24af4c3a4baa..346b292bd690690e80e596b3de02a15906227e3d 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -183,11 +183,11 @@ SUBDIR_MI_UNINSTALL=
 # TUI sub directory definitions
 #
 SUBDIR_TUI_OBS = \
-       tui.o tuiData.o tuiSource.o tuiStack.o tuiIO.o \
+       tui-file.o 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/tui-file.c 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 \
@@ -694,7 +694,7 @@ COMMON_OBS = version.o blockframe.o breakpoint.o findvar.o regcache.o \
        c-typeprint.o ch-typeprint.o f-typeprint.o m2-typeprint.o \
        c-valprint.o cp-valprint.o ch-valprint.o f-valprint.o m2-valprint.o \
        nlmread.o serial.o mdebugread.o os9kread.o top.o utils.o \
-       ui-file.o tui-file.o \
+       ui-file.o \
        frame.o \
        gnu-v2-abi.o gnu-v3-abi.o hpacc-abi.o cp-abi.o
 
@@ -790,8 +790,7 @@ uninstall: force $(CONFIG_UNINSTALL)
 # FIXME: There are 2 problems with this approach. First, if the INIT_FILES
 # list includes a file twice (because of some mistake somewhere else) 
 # the _initialize_* function will be included twice in init.c. Second, 
-# init.c may force unnecessary files to be linked in. Like for instance 
-# tui-file.c.
+# init.c may force unnecessary files to be linked in.
 #
 
 INIT_FILES = $(OBS) $(TSOBS) $(CONFIG_OBS) $(CONFIG_INITS)
@@ -1661,7 +1660,7 @@ m88k-tdep.o: m88k-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h) $(regcache_h)
 mac-nat.o: mac-nat.c $(defs_h) $(gdb_string_h) $(regcache_h)
 
 main.o: main.c top.h $(defs_h) $(gdb_string_h) $(event_loop_h) \
-       symfile.h  $(gdbcore_h) $(srcdir)/tui/tui-file.h $(ui_out_h)
+       symfile.h  $(gdbcore_h) $(ui_out_h)
 
 maint.o: maint.c $(defs_h) $(gdbcmd_h) $(gdbtypes_h) $(symtab_h) language.h \
        $(expression_h) objfiles.h symfile.h