This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[commit] More Makefile simplification
- From: Andrew Cagney <cagney at gnu dot org>
- To: gdb-patches at sources dot redhat dot com
- Date: Sun, 08 Feb 2004 08:39:29 -0500
- Subject: [commit] More Makefile simplification
Hello,
This lets me remove the middle step in:
CONFIG_ALL = .... $(SUBDIR_TUI_ALL)
SUBDIR_TUI_ALL = tui-all
tui-all:
build ./tui
committed,
Andrew
2004-02-08 Andrew Cagney <cagney@redhat.com>
* configure.in (CONFIG_ALL): Set to Makefile target, and not
makefile macro.
* configure: Re-generate.
(CONFIG_CLEAN, CONFIG_INSTALL, CONFIG_UNINSTALL): Ditto.
* Makefile.in (SUBDIR_CLI_CLEAN): Delete.
(SUBDIR_CLI_INSTALL, SUBDIR_CLI_UNINSTALL): Delete.
(SUBDIR_CLI_ALL, SUBDIR_GDBTK_ALL): Delete.
(SUBDIR_GDBTK_CLEAN, SUBDIR_GDBTK_INSTALL): Delete.
(SUBDIR_GDBTK_UNINSTALL, SUBDIR_MI_ALL): Delete.
(SUBDIR_MI_CLEAN, SUBDIR_MI_INSTALL): Delete.
(SUBDIR_MI_UNINSTALL, SUBDIR_TUI_ALL): Delete.
(SUBDIR_TUI_CLEAN, SUBDIR_TUI_INSTALL): Delete.
(SUBDIR_TUI_UNINSTALL, SUBDIR_CLI_CLEAN): Delete.
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.489
diff -u -r1.489 Makefile.in
--- Makefile.in 8 Feb 2004 04:46:13 -0000 1.489
+++ Makefile.in 8 Feb 2004 13:34:58 -0000
@@ -154,10 +154,6 @@
SUBDIR_CLI_DEPS =
SUBDIR_CLI_LDFLAGS=
SUBDIR_CLI_CFLAGS=
-SUBDIR_CLI_ALL=
-SUBDIR_CLI_CLEAN=
-SUBDIR_CLI_INSTALL=
-SUBDIR_CLI_UNINSTALL=
#
# MI sub directory definitons
@@ -179,10 +175,6 @@
SUBDIR_MI_LDFLAGS=
SUBDIR_MI_CFLAGS= \
-DMI_OUT=1
-SUBDIR_MI_ALL=
-SUBDIR_MI_CLEAN=
-SUBDIR_MI_INSTALL=
-SUBDIR_MI_UNINSTALL=
#
# TUI sub directory definitions
@@ -226,11 +218,6 @@
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
@@ -306,10 +293,6 @@
$(LIBGUI) $(ITCL_DEPS) $(ITK_DEPS) $(TK_DEPS) $(TCL_DEPS)
SUBDIR_GDBTK_LDFLAGS=
SUBDIR_GDBTK_CFLAGS= -DGDBTK
-SUBDIR_GDBTK_ALL= all-gdbtk
-SUBDIR_GDBTK_CLEAN= clean-gdbtk
-SUBDIR_GDBTK_INSTALL= install-gdbtk
-SUBDIR_GDBTK_UNINSTALL= uninstall-gdbtk
CONFIG_OBS= @CONFIG_OBS@
CONFIG_SRCS= @CONFIG_SRCS@
Index: configure.in
===================================================================
RCS file: /cvs/src/src/gdb/configure.in,v
retrieving revision 1.142
diff -u -r1.142 configure.in
--- configure.in 8 Feb 2004 04:25:07 -0000 1.142
+++ configure.in 8 Feb 2004 13:35:25 -0000
@@ -113,10 +113,6 @@
CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_CLI_DEPS)"
CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_CLI_SRCS)"
ENABLE_CFLAGS="$ENABLE_CFLAGS \$(SUBDIR_CLI_CFLAGS)"
- CONFIG_ALL="$CONFIG_ALL \$(SUBDIR_CLI_ALL)"
- CONFIG_CLEAN="$CONFIG_CLEAN \$(SUBDIR_CLI_CLEAN)"
- CONFIG_INSTALL="$CONFIG_INSTALL \$(SUBDIR_CLI_INSTALL)"
- CONFIG_UNINSTALL="$CONFIG_UNINSTALL \$(SUBDIR_CLI_UNINSTALL)"
fi
fi
@@ -136,10 +132,6 @@
CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_MI_DEPS)"
CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_MI_SRCS)"
ENABLE_CFLAGS="$ENABLE_CFLAGS \$(SUBDIR_MI_CFLAGS)"
- CONFIG_ALL="$CONFIG_ALL \$(SUBDIR_MI_ALL)"
- CONFIG_CLEAN="$CONFIG_CLEAN \$(SUBDIR_MI_CLEAN)"
- CONFIG_INSTALL="$CONFIG_INSTALL \$(SUBDIR_MI_INSTALL)"
- CONFIG_UNINSTALL="$CONFIG_UNINSTALL \$(SUBDIR_MI_UNINSTALL)"
fi
fi
@@ -158,10 +150,6 @@
CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_TUI_DEPS)"
CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_TUI_SRCS)"
ENABLE_CFLAGS="$ENABLE_CFLAGS \$(SUBDIR_TUI_CFLAGS)"
- CONFIG_ALL="$CONFIG_ALL \$(SUBDIR_TUI_ALL)"
- CONFIG_CLEAN="$CONFIG_CLEAN \$(SUBDIR_TUI_CLEAN)"
- CONFIG_INSTALL="$CONFIG_INSTALL \$(SUBDIR_TUI_INSTALL)"
- CONFIG_UNINSTALL="$CONFIG_UNINSTALL \$(SUBDIR_TUI_UNINSTALL)"
need_curses=yes
fi
fi
@@ -1209,10 +1197,10 @@
CONFIG_OBS="${CONFIG_OBS} \$(SUBDIR_GDBTK_OBS)"
CONFIG_DEPS="${CONFIG_DEPS} \$(SUBDIR_GDBTK_DEPS)"
CONFIG_SRCS="${CONFIG_SRCS} \$(SUBDIR_GDBTK_SRCS)"
- CONFIG_ALL="${CONFIG_ALL} \$(SUBDIR_GDBTK_ALL)"
- CONFIG_CLEAN="${CONFIG_CLEAN} \$(SUBDIR_GDBTK_CLEAN)"
- CONFIG_INSTALL="${CONFIG_INSTALL} \$(SUBDIR_GDBTK_INSTALL)"
- CONFIG_UNINSTALL="${CONFIG_UNINSTALL} \$(SUBDIR_GDBTK_UNINSTALL)"
+ CONFIG_ALL="${CONFIG_ALL} all-gdbtk"
+ CONFIG_CLEAN="${CONFIG_CLEAN} clean-gdbtk"
+ CONFIG_INSTALL="${CONFIG_INSTALL} install-gdbtk"
+ CONFIG_UNINSTALL="${CONFIG_UNINSTALL} uninstall-gdbtk"
if test x$gdb_cv_os_cygwin = xyes; then
WIN32LIBS="${WIN32LIBS} -lshell32 -lgdi32 -lcomdlg32 -ladvapi32"