From 227288a05cfbdfb8a562a19c1a59a68e1d91af48 Mon Sep 17 00:00:00 2001 From: Stephane Carrez Date: Wed, 18 Jul 2001 20:53:35 +0000 Subject: [PATCH] * 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. --- gdb/ChangeLog | 7 +++++++ gdb/Makefile.in | 11 +++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ec98c81ec4d..6e7544a9398 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2001-07-18 Stephane Carrez + + * 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 * Makefile.in (tui-file.o): Update dependencies. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 3e87fef746d..346b292bd69 100644 --- 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 -- 2.30.2