This is the mail archive of the
gdb-patches@sourceware.cygnus.com
mailing list for the GDB project.
[rfa/tui] Convert TUI to MI Makefile configury
- To: GDB Patches <gdb-patches at sourceware dot cygnus dot com>
- Subject: [rfa/tui] Convert TUI to MI Makefile configury
- From: Andrew Cagney <ac131313 at cygnus dot com>
- Date: Mon, 15 May 2000 21:00:24 +1000
- Organization: Cygnus Solutions
Hello,
The attatched patch switches the gdb/tui directory to the MI style
configury.
Ok?
Andrew
PS: Has it been tested? Well after more hacks and tweeks than I'd care
to admit, I've managed to compile the TUI on a non HP/UX machine. The
result won't run unfortunatly :-(
Index: ChangeLog
Mon May 15 16:55:22 2000 Andrew Cagney <cagney@b1.cygnus.com>
* configure.in (AC_OUTPUT): Do not generate tui/Makefile.
(enable-tui): Convert Makefile configury to use the same mechanism
as MI.
* Makefile.in (BUILD_TUI, TUI_LIBRARY, TUI_DIR, TUI_SRC,
TUI_CFLAGS): Delete
(all-tui): Delete target.
(tuiWin.o, tuiStack.o, tuiSourceWin.o, tuiSource.o, tuiRegs.o,
tuiLayout.o, tuiIO.o, tuiGeneralWin.o, tuiDisassem.o,
tuiDataWin.o, tuiData.o, tuiCommand.o, tui.o): New targets.
Index: tui/ChangeLog
Mon May 15 17:16:10 2000 Andrew Cagney <cagney@b1.cygnus.com>
* Makefile.in: Delete.
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.30
diff -p -r1.30 Makefile.in
*** Makefile.in 2000/05/10 20:07:24 1.30
--- Makefile.in 2000/05/15 10:50:54
*************** DLLTOOL = @DLLTOOL@
*** 62,75 ****
WINDRES = @WINDRES@
MIG = @MIG@
- # If the user configured GDB to include the TUI, the name of the tui
- # library goes here.
- TUI_LIBRARY = @TUI_LIBRARY@
-
- # If the user configured GDB to include the TUI, the all-tui
- # target goes here.
- BUILD_TUI = @BUILD_TUI@
-
# Flags that describe where you can find the termcap library.
# This can be overridden in the host Makefile fragment file.
TERMCAP = @TERM_LIB@
--- 62,67 ----
*************** INTL_DEPS = @INTLDEPS@
*** 142,152 ****
INTL_SRC = $(srcdir)/$(INTL_DIR)
INTL_CFLAGS = -I$(INTL_DIR) -I$(INTL_SRC)
- # Where is the TUI library? Typically in tui/.
- TUI_DIR=tui
- TUI_SRC = $(srcdir)/$(TUI_DIR)
- TUI_CFLAGS= -I$(TUI_SRC)
-
#
# MI sub directory definitons
#
--- 134,139 ----
*************** SUBDIR_MI_CLEAN=
*** 172,177 ****
--- 159,191 ----
SUBDIR_MI_INSTALL=
SUBDIR_MI_UNINSTALL=
+ #
+ # TUI sub directory definitions
+ #
+ SUBDIR_TUI_OBS = \
+ 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/tuiStack.c tui/tuiIO.c \
+ tui/tuiGeneralWin.c tui/tuiLayout.c \
+ tui/tuiWin.c tui/tuiCommand.c \
+ tui/tuiDisassem.c tui/tuiSourceWin.c \
+ tui/tuiRegs.c tui/tuiDataWin.c
+ SUBDIR_TUI_DEPS =
+ SUBDIR_TUI_INITS = \
+ $(SUBDIR_TUI_SRCS)
+ SUBDIR_TUI_LDFLAGS=
+ SUBDIR_TUI_CFLAGS= \
+ -DTUI=1 -I${srcdir}/tui
+ SUBDIR_TUI_ALL=
+ SUBDIR_TUI_CLEAN=
+ SUBDIR_TUI_INSTALL=
+ SUBDIR_TUI_UNINSTALL=
+
+
+
# Opcodes currently live in one of two places. Either they are in the
# opcode library, typically ../opcodes, or they are in a header file
# in INCLUDE_DIR.
*************** INTERNAL_WARN_CFLAGS = \
*** 275,281 ****
$(CFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \
$(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) \
$(BFD_CFLAGS) $(MMALLOC_CFLAGS) $(INCLUDE_CFLAGS) \
! $(INTL_CFLAGS) $(TUI_CFLAGS) $(ENABLE_CFLAGS) \
$(GDB_WARN_CFLAGS)
INTERNAL_CFLAGS = $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS)
--- 289,295 ----
$(CFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \
$(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) \
$(BFD_CFLAGS) $(MMALLOC_CFLAGS) $(INCLUDE_CFLAGS) \
! $(INTL_CFLAGS) $(ENABLE_CFLAGS) \
$(GDB_WARN_CFLAGS)
INTERNAL_CFLAGS = $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS)
*************** kdb: $(NTSSTART) $(OBS) $(NTSOBS) $(ADD_
*** 837,849 ****
ld -o kdb $(NTSSTART) $(OBS) $(NTSOBS) init.o $(ADD_FILES) \
-lc $(CLIBS)
- # Have the TUI library depend on a phony target, so we'll always
- # recurse and make sure it's up to date. If it is, then the file will
- # be unchanged, and we won't rebuild it.
- # .PHONY: check-tui
- all-tui:
- @(cd tui; ${MAKE} ${FLAGS_TO_PASS} all)
-
# Put the proper machine-specific files first, so M-. on a machine
# specific routine gets the one for the correct machine. (FIXME: those
# files go in twice; we should be removing them from the main list).
--- 851,856 ----
*************** mi-parse.o: $(srcdir)/mi/mi-parse.c $(de
*** 1986,1990 ****
--- 1993,2062 ----
$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-parse.c
mi-getopt.o: $(srcdir)/mi/mi-getopt.c $(mi_getopt_h) $(defs_h)
$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-getopt.c
+
+ #
+ # TUI dependencies
+ #
+ # Need to explicitly specify the compile rule as make will do nothing
+ # or try to compile the object file into the mi directory.
+
+ tui.o: $(srcdir)/tui/tui.c \
+ $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \
+ $(srcdir)/tui/tuiLayout.h $(srcdir)/tui/tuiIO.h \
+ $(srcdir)/tui/tuiRegs.h $(srcdir)/tui/tuiWin.h
+ $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tui.c
+ tuiCommand.o: $(srcdir)/tui/tuiCommand.c \
+ $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \
+ $(srcdir)/tui/tuiWin.h $(srcdir)/tui/tuiIO.h
+ $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiCommand.c
+ tuiData.o: $(srcdir)/tui/tuiData.c \
+ $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h
+ $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiData.c
+ tuiDataWin.o: $(srcdir)/tui/tuiDataWin.c \
+ $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \
+ $(srcdir)/tui/tuiRegs.h
+ $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiDataWin.c
+ tuiDisassem.o: $(srcdir)/tui/tuiDisassem.c \
+ $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \
+ $(srcdir)/tui/tuiLayout.h $(srcdir)/tui/tuiSourceWin.h \
+ $(srcdir)/tui/tuiStack.h
+ $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiDisassem.c
+ tuiGeneralWin.o: $(srcdir)/tui/tuiGeneralWin.c \
+ $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \
+ $(srcdir)/tui/tuiGeneralWin.h
+ $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiGeneralWin.c
+ tuiIO.o: $(srcdir)/tui/tuiIO.c \
+ $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \
+ $(srcdir)/tui/tuiIO.h $(srcdir)/tui/tuiCommand.h \
+ $(srcdir)/tui/tuiWin.h
+ $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiIO.c
+ tuiLayout.o: $(srcdir)/tui/tuiLayout.c \
+ $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \
+ $(srcdir)/tui/tuiGeneralWin.h $(srcdir)/tui/tuiStack.h \
+ $(srcdir)/tui/tuiRegs.h $(srcdir)/tui/tuiDisassem.h
+ $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiLayout.c
+ tuiRegs.o: $(srcdir)/tui/tuiRegs.c \
+ $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \
+ $(srcdir)/tui/tuiLayout.h $(srcdir)/tui/tuiWin.h
+ $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiRegs.c
+ tuiSource.o: $(srcdir)/tui/tuiSource.c \
+ $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \
+ $(srcdir)/tui/tuiStack.h $(srcdir)/tui/tuiSourceWin.h \
+ $(srcdir)/tui/tuiSource.h
+ $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiSource.c
+ tuiSourceWin.o: $(srcdir)/tui/tuiSourceWin.c \
+ $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \
+ $(srcdir)/tui/tuiStack.h $(srcdir)/tui/tuiSourceWin.h \
+ $(srcdir)/tui/tuiSource.h $(srcdir)/tui/tuiDisassem.h
+ $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiSourceWin.c
+ tuiStack.o: $(srcdir)/tui/tuiStack.c \
+ $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \
+ $(srcdir)/tui/tuiStack.h $(srcdir)/tui/tuiSourceWin.h
+ $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiStack.c
+ tuiWin.o: $(srcdir)/tui/tuiWin.c \
+ $(srcdir)/tui/tui.h $(srcdir)/tui/tuiData.h \
+ $(srcdir)/tui/tuiGeneralWin.h $(srcdir)/tui/tuiStack.h \
+ $(srcdir)/tui/tuiSourceWin.h $(srcdir)/tui/tuiDataWin.h
+ $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/tui/tuiWin.c
### end of the gdb Makefile.in.
Index: tui/Makefile.in
===================================================================
RCS file: Makefile.in
diff -N Makefile.in
*** /sourceware/cvs-tmp/cvsJHuOny Mon May 15 03:50:55 2000
--- /dev/null Tue May 5 13:32:27 1998
***************
*** 1,171 ****
- # Copyright 1998 Free Software Foundation, Inc.
-
- # This file is part of GDB.
-
- # 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 2 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, write to the Free Software
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- all: libtui.a
-
- srcdir=@srcdir@
- VPATH = @srcdir@
-
- SHELL = @SHELL@
-
- CC=@CC@
- CFLAGS=@CFLAGS@
- AR=@AR@
- RANLIB=@RANLIB@
-
- # Host and target-dependent makefile fragments come in here.
- @host_makefile_frag@
- @target_makefile_frag@
- # End of host and target-dependent makefile fragments
-
- # Where is our "include" directory? Typically $(srcdir)/../include.
- # This is essentially the header file directory for the library
- # routines in libiberty.
- INCLUDE_DIR = $(srcdir)/../../include
- INCLUDE_CFLAGS = -I$(INCLUDE_DIR)
-
- # Configured by the --with-mmalloc option to configure.
- MMALLOC = @MMALLOC@
- MMALLOC_CFLAGS = @MMALLOC_CFLAGS@
-
- # Where is the BFD library? Typically in ../bfd.
- BFD_DIR = ../../bfd
- BFD_SRC = $(srcdir)/$(BFD_DIR)
- BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC)
-
- # Where is the READLINE library? Typically in ../readline.
- READLINE_DIR = ../../readline
- READLINE_SRC = $(srcdir)/$(READLINE_DIR)
- READLINE_CFLAGS = -I$(READLINE_SRC)
-
- # Where is the INTL library? Typically in ../intl.
- INTL_DIR = ../../intl
- INTL_SRC = $(srcdir)/$(INTL_DIR)
- INTL_CFLAGS = -I$(INTL_DIR) -I$(INTL_SRC)
-
- # Where is the TCL library? Typically in ../tcl.
- TCL_CFLAGS = @TCLHDIR@
-
- # Where is the TK library? Typically in ../tk.
- TK_CFLAGS = @TKHDIR@ @TK_BUILD_INCLUDES@
-
- # Where is Itcl? Typically in ../itcl.
- ITCL_CFLAGS = @ITCLHDIR@
-
- # Where is Tix? Typically in ../tix.
- TIX_CFLAGS = @TIXHDIR@
-
- X11_CFLAGS = @TK_XINCLUDES@
-
- ENABLE_IDE= @ENABLE_IDE@
-
- GUI_CFLAGS_X = -I$(srcdir)/../../libgui/src
-
- IDE_CFLAGS_X = -I$(srcdir)/../../libidetcl/src -I$(srcdir)/../../libide/src \
- `if [ x"$(ENABLE_IDE)" != x ] ; then \
- echo -DIDE -I$(srcdir)/../../ilu/runtime/mainloop;\
- fi`
-
- IDE_CFLAGS=$(GUI_CFLAGS_X) $(IDE_CFLAGS_X)
-
- ENABLE_CFLAGS= @ENABLE_CFLAGS@
-
- # -I. for config files.
- # -I$(srcdir) for gdb internal headers and possibly for gnu-regex.h also.
- # -I$(srcdir)/config for more generic config files.
-
- # It is also possible that you will need to add -I/usr/include/sys if
- # your system doesn't have fcntl.h in /usr/include (which is where it
- # should be according to Posix).
- DEFS = @DEFS@
- GDB_CFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../config $(DEFS)
-
- # M{H,T}_CFLAGS, if defined, have host- and target-dependent CFLAGS
- # from the config directory.
- GLOBAL_CFLAGS = $(MT_CFLAGS) $(MH_CFLAGS)
- #PROFILE_CFLAGS = -pg
-
- # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
- INTERNAL_CFLAGS = $(CFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \
- $(GDB_CFLAGS) $(READLINE_CFLAGS) $(BFD_CFLAGS) \
- $(MMALLOC_CFLAGS) $(INCLUDE_CFLAGS) $(INTL_CFLAGS) \
- $(ENABLE_CFLAGS)
-
- HEADERS = tuiIO.h tuiData.h tuiGeneralWin.h tuiLayout.h tuiStack.h \
- tuiSource.h tuiCommand.h tuiWin.h tuiDisassem.h \
- tuiSourceWin.h tuiRegs.h tuiDataWin.h
-
- SOURCES = tui.c tuiData.c tuiSource.c tuiStack.c tuiIO.c \
- tuiGeneralWin.c tuiLayout.c tuiWin.c tuiCommand.c \
- tuiDisassem.c tuiSourceWin.c tuiRegs.c tuiDataWin.c
-
- OBJECTS = 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 \
- tuiInit.o
-
-
- # Prevent Sun make from putting in the machine type. Setting
- # TARGET_ARCH to nothing works for SunOS 3, 4.0, but not for 4.1.
- .c.o:
- $(CC) -c $(INTERNAL_CFLAGS) $<
- .SUFFIXES: .cpp
- .c.cpp:
- $(CC) -E $(INTERNAL_CFLAGS) $< > $@
-
- libtui.a: $(OBJECTS)
- rm -f libtui.a
- $(AR) rc libtui.a $(OBJECTS)
- $(RANLIB) libtui.a
-
- tui.o: tui.c tui.h tuiData.h tuiLayout.h tuiIO.h tuiRegs.h tuiWin.h
- tuiCommand.o: tui.h tuiData.h tuiWin.h tuiIO.h
- tuiData.o: tui.h tuiData.h
- tuiDataWin.o: tui.h tuiData.h tuiRegs.h
- tuiDisassem.o: tui.h tuiData.h tuiLayout.h tuiSourceWin.h tuiStack.h
- tuiGeneralWin.o: tui.h tuiData.h tuiGeneralWin.h
- tuiIO.o: tui.h tuiData.h tuiIO.h tuiCommand.h tuiWin.h
- tuiLayout.o: tui.h tuiData.h tuiGeneralWin.h tuiStack.h tuiRegs.h \
- tuiDisassem.h
- tuiRegs.o: tui.h tuiData.h tuiLayout.h tuiWin.h
- tuiSource.o: tui.h tuiData.h tuiStack.h tuiSourceWin.h tuiSource.h
- tuiSourceWin.o: tui.h tuiData.h tuiStack.h tuiSourceWin.h tuiSource.h \
- tuiDisassem.h
- tuiStack.o: tui.h tuiData.h tuiStack.h tuiSourceWin.h
- tuiWin.o: tui.h tuiData.h tuiGeneralWin.h tuiStack.h tuiSourceWin.h \
- tuiDataWin.h
-
- tuiInit.o: tuiInit.c
- tuiInit.c: $(SOURCES)
- @echo Making tuiInit.c
- @rm -f init.c-tmp
- @echo '/* Do not modify this file. */' >init.c-tmp
- @echo '/* It is created automatically by the Makefile. */'>>init.c-tmp
- @echo '#include "ansidecl.h"' >>init.c-tmp
- @echo 'extern void initialize_tui_files PARAMS ((void));' >>init.c-tmp
- @echo 'void initialize_tui_files PARAMS ((void)) {' >>init.c-tmp
- @-( cd $(srcdir) ; grep '^_initialize_[a-z_0-9A-Z]* *(' $(SOURCES) ) 2>/dev/null \
- | sed -e 's/^.*://' -e 's/^\([a-z_0-9A-Z]*\).*/ {extern void \1 PARAMS ((void)); \1 ();}/' >>init.c-tmp
- @echo '}' >>init.c-tmp
- @mv init.c-tmp tuiInit.c
-
- clean mostlyclean:
- -rm -f *.o *.a
-
- distclean maintainer-clean realclean: clean
- -rm -f Makefile config.log config.cache
--- 0 ----