[1/2] RFC: remove doc/configure

[1/2] RFC: remove doc/configure

[Tom Tromey]

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

Re: [1/2] RFC: remove doc/configure

[Joel Brobecker]

> 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.

I like it :).

configure is often seen as a bottleneck in term of the amount of time
taken to perform builds, especially on Windows where fork/exec just takes
forever. But it's also becoming true on Unix machines where large number
of cores allow all the compilations to be parallelized, so the time to
configure becomes a bigger chunck of the wall-clock time.  That could
be a possible argument in favor of fragmenting the configury.  But in
this case, this is hardly applicable because:
  . The gdb/doc/configure script is really minimal
  . All the checks it makes have already been done by gdb/configure.

-- 
Joel

Re: [1/2] RFC: remove doc/configure

[Tom Tromey]

>>>>> "Joel" == Joel Brobecker <brobecker@adacore.com> writes:

[ removing doc/configure ]
>> * configure: Remove.
>> * configure.ac: Remove.

Joel> I like it :).

Thanks.

I am checking this in now.

Tom

Re: [1/2] RFC: remove doc/configure

[Tom Tromey]

>>>>> "Tom" == Tom Tromey <tromey@redhat.com> writes:

>>>>> "Joel" == Joel Brobecker <brobecker@adacore.com> writes:
Tom> [ removing doc/configure ]
>>> * configure: Remove.
>>> * configure.ac: Remove.

Joel> I like it :).

Tom> Thanks.

Tom> I am checking this in now.

I forgot to mention -- you will need to reconfigure your build tree
after updating.

Tom