From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19493 invoked by alias); 16 Aug 2009 11:48:55 -0000 Received: (qmail 19472 invoked by uid 22791); 16 Aug 2009 11:48:53 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mail.gmx.net (HELO mail.gmx.net) (213.165.64.20) by sourceware.org (qpsmtpd/0.43rc1) with SMTP; Sun, 16 Aug 2009 11:48:46 +0000 Received: (qmail invoked by alias); 16 Aug 2009 11:48:39 -0000 Received: from xdsl-87-78-132-156.netcologne.de (EHLO localhost.localdomain) [87.78.132.156] by mail.gmx.net (mp001) with SMTP; 16 Aug 2009 13:48:39 +0200 Received: from ralf by localhost.localdomain with local (Exim 4.69) (envelope-from ) id 1MceE2-0007hk-Kg; Sun, 16 Aug 2009 13:48:38 +0200 Date: Sun, 16 Aug 2009 11:48:00 -0000 From: Ralf Wildenhues To: "Joseph S. Myers" , gcc-patches@gcc.gnu.org, binutils@sourceware.org, gdb@sourceware.org Subject: install-{html,pdf} (was: Moving to Autoconf 2.64, Automake 1.11) Message-ID: <20090816114837.GA20429@gmx.de> Mail-Followup-To: Ralf Wildenhues , "Joseph S. Myers" , gcc-patches@gcc.gnu.org, binutils@sourceware.org, gdb@sourceware.org References: <20090815112928.GB5396@gmx.de> <20090815160654.GC21850@gmx.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090815160654.GC21850@gmx.de> User-Agent: Mutt/1.5.20 (2009-08-09) Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org X-SW-Source: 2009-08/txt/msg00122.txt.bz2 * Ralf Wildenhues wrote on Sat, Aug 15, 2009 at 06:06:54PM CEST: > * Joseph S. Myers wrote on Sat, Aug 15, 2009 at 05:31:44PM CEST: > > On Sat, 15 Aug 2009, Ralf Wildenhues wrote: > > > > The texinfo changes have been tested with 'make info pdf html'. > > > > There should be a "make install-pdf install-html" test (for both gcc and > > GDB/Binutils) as well. > > I think I tried that when changing the relevant rules, but I will test > again before committing. Gah, I did overlook libgomp, which indeed had a bug, and I didn't search for unneeded Makefile.am bits that can just be deleted now. Incremental patch below, against GCC; intended to be squashed into [PATCH 5/N]. binutils/gdb seems ok. I noted that files are installed a bit inconsistently: GCC: ${docdir}/libgomp.pdf ${docdir}/classpath/cp-tools.pdf ${docdir}/gcc/gnat-style.pdf ${docdir}/gcc/gccinstall.pdf ${docdir}/gcc/cpp.pdf ${docdir}/gcc/cppinternals.pdf ${docdir}/gcc/gccint.pdf ${docdir}/gcc/gnat_ugn.pdf ${docdir}/gcc/gcc.pdf ${docdir}/gcc/gfortran.pdf ${docdir}/gcc/gnat_rm.pdf ${docdir}/gcj.pdf ${docdir}/libiberty.pdf and HTML files as this, or below these directories: ${docdir}/gccint/ ${docdir}/cpp/ ${docdir}/classpath/cp-tools.html/ ${docdir}/gccinstall/ ${docdir}/libgomp.html/ ${docdir}/libiberty.html ${docdir}/gcc/ ${docdir}/cppinternals/ Here, the location for at least gcj.pdf seems inconsistent (but that issue existed before my patch series already). For src: ${docdir}/bfd.pdf ${docdir}/gdbint.pdf ${docdir}/binutils.pdf ${docdir}/gprof.pdf ${docdir}/ld.pdf ${docdir}/etc/standards.pdf ${docdir}/etc/configure.pdf ${docdir}/as.pdf ${docdir}/stabs.pdf ${docdir}/refcard.pdf ${docdir}/annotate.pdf ${docdir}/gdb.pdf ${docdir}/libiberty.pdf ${docdir}/binutils.html/ ${docdir}/ld.html/ ${docdir}/standards.html ${docdir}/bfd.html/ ${docdir}/annotate/ ${docdir}/gdb/ ${docdir}/as.html/ ${docdir}/gdbint/ ${docdir}/libiberty.html ${docdir}/configure.html ${docdir}/stabs/ ${docdir}/gprof.html/ At least the location of GDB's obsolete annotations and its refcard seem weird, maybe also stabs (they all have rather generic names for not being placed in a subdirectory), as does the fact that some directories are named with ".html" in their name but not all. etc/*.pdf seems weird, too, and that the html equivalents are in a different directory. All of these issues are independent of my patch series (the install tree looks exactly the same before and after). Comments as to the desired structure? Thanks, Ralf libjava/ChangeLog: 2009-08-16 Ralf Wildenhues * Makefile.am (install-html, install-pdf): Remove. * Makefile.in: Regenerate. libssp/ChangeLog: 2009-08-16 Ralf Wildenhues * Makefile.am (install-html, install-pdf): Remove. * Makefile.in: Regenerate. libstdc++-v3/ChangeLog: 2009-08-16 Ralf Wildenhues * Makefile.am (install-html, install-pdf): Remove. * Makefile.in: Regenerate. boehm-gc/ChangeLog: 2009-08-16 Ralf Wildenhues * Makefile.am (install-html, install-pdf): Remove. * Makefile.in: Regenerate. libmudflap/ChangeLog: 2009-08-16 Ralf Wildenhues * Makefile.am (install-html, install-pdf): Remove. * Makefile.in: Regenerate. zlib/ChangeLog: 2009-08-16 Ralf Wildenhues * Makefile.am (install-html, install-pdf, html): Remove. * Makefile.in: Regenerate. libffi/ChangeLog: 2009-08-16 Ralf Wildenhues * Makefile.am (install-html, install-pdf): Remove. * Makefile.in: Regenerate. libgomp/ChangeLog: 2009-08-16 Ralf Wildenhues * Makefile.am (install-html, install-pdf): Remove. * Makefile.in: Regenerate. diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am index 83005b2..8438911 100644 --- a/boehm-gc/Makefile.am +++ b/boehm-gc/Makefile.am @@ -115,9 +115,3 @@ AM_MAKEFLAGS = \ CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host MAKEOVERRIDES= - -# No install-html or install-pdf support in automake yet -.PHONY: install-html install-pdf -install-html: -install-pdf: - diff --git a/libffi/Makefile.am b/libffi/Makefile.am index 9705c8f..74d45d4 100644 --- a/libffi/Makefile.am +++ b/libffi/Makefile.am @@ -169,11 +169,6 @@ libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LT AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src AM_CCASFLAGS = $(AM_CPPFLAGS) -# No install-html or install-pdf support in automake yet -.PHONY: install-html install-pdf -install-html: -install-pdf: - # Multilib support. Automake should provide these on its own. all-recursive: all-multi install-recursive: install-multi diff --git a/libgomp/Makefile.am b/libgomp/Makefile.am index 6cecc2a..83942f7 100644 --- a/libgomp/Makefile.am +++ b/libgomp/Makefile.am @@ -56,20 +56,6 @@ env.lo: libgomp_f.h env.o: libgomp_f.h -# No install-html or install-pdf support in automake yet -.PHONY: install-html install-pdf -install-html: - -install-pdf: $(PDFS) - @$(NORMAL_INSTALL) - test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)" - @list='$(PDFS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \ - $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \ - done - # Automake Documentation: # If your package has Texinfo files in many directories, you can use the # variable TEXINFO_TEX to tell Automake where to find the canonical diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 7c7e0db..d4b45d7 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -1326,11 +1326,6 @@ CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host MAKEOVERRIDES= -# No install-html or install-pdf support in automake yet -.PHONY: install-html install-pdf -install-html: -install-pdf: - # Multilib support variables. MULTISRCTOP = MULTIBUILDTOP = diff --git a/libmudflap/Makefile.am b/libmudflap/Makefile.am index d326d88..29091de 100644 --- a/libmudflap/Makefile.am +++ b/libmudflap/Makefile.am @@ -94,10 +94,5 @@ AM_MAKEFLAGS = \ MAKEOVERRIDES= -# No install-html or install-pdf support in automake yet -.PHONY: install-html install-pdf -install-html: -install-pdf: - ## ################################################################ diff --git a/libssp/Makefile.am b/libssp/Makefile.am index 6a8b4c8..7a350f4 100644 --- a/libssp/Makefile.am +++ b/libssp/Makefile.am @@ -90,10 +90,5 @@ AM_MAKEFLAGS = \ MAKEOVERRIDES= -# No install-html or install-pdf support in automake yet -.PHONY: install-html install-pdf -install-html: -install-pdf: - ## ################################################################ diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am index 1f8d315..c7a22aa 100644 --- a/libstdc++-v3/Makefile.am +++ b/libstdc++-v3/Makefile.am @@ -89,7 +89,3 @@ AM_MAKEFLAGS = \ # Subdir rules rely on $(FLAGS_TO_PASS) FLAGS_TO_PASS = $(AM_MAKEFLAGS) - -.PHONY: install-html install-pdf -install-html: -install-pdf: diff --git a/zlib/Makefile.am b/zlib/Makefile.am index 749a13c..55418e4 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -58,12 +58,3 @@ AM_MAKEFLAGS = \ "PICFLAG=$(PICFLAG)" \ "RANLIB=$(RANLIB)" \ "DESTDIR=$(DESTDIR)" - -# No html support. -# No install-html or install-pdf support in automake yet -.PHONY: html install-html install-pdf - -html: -install-html: -install-pdf: -