This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[1/2] RFC: remove doc/configure
- From: Tom Tromey <tromey at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Fri, 19 Nov 2010 13:51:35 -0700
- Subject: [1/2] RFC: remove doc/configure
While working on a different patch, I discovered gdb/doc/configure.
Is there some reason to have it?
Assuming not, this patch removes it.
Tom
b/gdb/ChangeLog:
2010-11-19 Tom Tromey <tromey@redhat.com>
* Makefile.in (SUBDIRS): Add doc.
* configure: Rebuild.
* configure.ac: Don't configure in doc. Create doc/Makefile.
b/gdb/doc/ChangeLog:
2010-11-19 Tom Tromey <tromey@redhat.com>
* Makefile.in (Makefile): Run ../config.status.
(distclean): Update.
* configure: Remove.
* configure.ac: Remove.
>From 5c6f43f8a6fa70c0aaa75527f255b091debb8db5 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 19 Nov 2010 12:00:41 -0700
Subject: [PATCH 1/2] remove doc/configure
---
gdb/ChangeLog | 6 +
gdb/Makefile.in | 2 +-
gdb/configure | 7 +-
gdb/configure.ac | 4 +-
gdb/doc/ChangeLog | 7 +
gdb/doc/Makefile.in | 6 +-
gdb/doc/configure | 3064 --------------------------------------------------
gdb/doc/configure.ac | 9 -
8 files changed, 23 insertions(+), 3082 deletions(-)
delete mode 100755 gdb/doc/configure
delete mode 100644 gdb/doc/configure.ac
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 550badf..86afb68 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -871,7 +871,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
TSOBS = inflow.o
-SUBDIRS = @subdirs@ data-directory
+SUBDIRS = doc @subdirs@ data-directory
CLEANDIRS = $(SUBDIRS) gnulib
# List of subdirectories in the build tree that must exist.
diff --git a/gdb/configure.ac b/gdb/configure.ac
index a16c87c..230b128 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -108,7 +108,7 @@ AS_HELP_STRING([--with-relocated-sources=PATH], [automatically relocate this pat
[Relocated directory for source files. ])
])
-AC_CONFIG_SUBDIRS(doc testsuite)
+AC_CONFIG_SUBDIRS(testsuite)
# Check whether to support alternative target configurations
AC_ARG_ENABLE(targets,
@@ -2148,7 +2148,7 @@ dnl At the moment, we just assume it's UTF-8.
AC_DEFINE(GDB_DEFAULT_HOST_CHARSET, "UTF-8",
[Define to be a string naming the default host character set.])
-AC_OUTPUT(Makefile .gdbinit:gdbinit.in gnulib/Makefile data-directory/Makefile,
+AC_OUTPUT(Makefile .gdbinit:gdbinit.in doc/Makefile gnulib/Makefile data-directory/Makefile,
[
case x$CONFIG_HEADERS in
xconfig.h:config.in)
diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in
index 3a832b5..a572f90 100644
--- a/gdb/doc/Makefile.in
+++ b/gdb/doc/Makefile.in
@@ -515,8 +515,8 @@ annotate/index.html: $(ANNOTATE_DOC_FILES)
force:
-Makefile: Makefile.in $(host_makefile_frag) config.status
- $(SHELL) ./config.status
+Makefile: Makefile.in $(host_makefile_frag) ../config.status
+ cd .. && $(SHELL) ./config.status doc/Makefile
# The "least clean" level of cleaning. Get rid of files which are
@@ -534,7 +534,7 @@ clean: mostlyclean
rm -f gdb-cfg.texi
distclean: clean
- rm -f Makefile config.status config.log
+ rm -f Makefile
# GDBvn.texi, the dvi files, the info files, and the postscript files,
# are all part of the distribution, so it should not be removed by
diff --git a/gdb/doc/configure.ac b/gdb/doc/configure.ac
deleted file mode 100644
index 3baea74..0000000
--- a/gdb/doc/configure.ac
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_PREREQ(2.59)
-AC_INIT(refcard.tex)
-sinclude(../../config/acx.m4)
-AC_PROG_INSTALL
-AC_PROG_LN_S
-
-ACX_PKGVERSION([GDB])
-ACX_BUGURL([http://www.gnu.org/software/gdb/bugs/])
-AC_OUTPUT(Makefile)
--
1.7.2.3