From patchwork Fri Mar 23 00:02:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Kosnik X-Patchwork-Id: 148362 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id E18C2B6EE6 for ; Fri, 23 Mar 2012 11:02:37 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1333065759; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Date:From:To:Subject:Message-ID:Mime-Version:Content-Type: Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:Sender:Delivered-To; bh=WEGN7ZjAgYJ0LMYNRdeE j1PHPDI=; b=gaE7NJuj44OHRiCpzPrA1XvgAM5WVhBLM+//TiWOA+7jJZr/fS0f gT/owlkhBrWWGHFRr15ycrBdpkiPbXEIeVrCRvSvkoC9VeG3QoSxpeWhf883+O4E p/4TEHqbOx5bZS0/kv5iUeOqZvWwCzk1A/9S9dv2zsththi1HCgnmmk= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Date:From:To:Subject:Message-ID:Mime-Version:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=Rv2iTOkI6OhGzDWvvzPYPF0dT6QFJTx/kEBSgKL8Empc5/Re76+lHt+DXQMEf8 KPoPD56IhRmcQ39RteA12Bahr+cCYOgCZjxzJX1SGusXluynhPB94dYauX72/Nl6 aP0LO+dyBL0IBfR2LEJmgu+NPALaeAZ7iWLxNNTRmQyow=; Received: (qmail 7683 invoked by alias); 23 Mar 2012 00:02:30 -0000 Received: (qmail 7653 invoked by uid 22791); 23 Mar 2012 00:02:28 -0000 X-SWARE-Spam-Status: No, hits=-6.2 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, SPF_HELO_PASS, TW_PH, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 23 Mar 2012 00:02:10 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2N02Aj0011409 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 22 Mar 2012 20:02:10 -0400 Received: from adair (ovpn-113-32.phx2.redhat.com [10.3.113.32]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q2N029s1022935; Thu, 22 Mar 2012 20:02:10 -0400 Date: Thu, 22 Mar 2012 17:02:15 -0700 From: Benjamin De Kosnik To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [v3] doc xml output names Message-ID: <20120322170215.263f913b@adair> Mime-Version: 1.0 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Simple rename for XML filenames. The "-single" can be omitted. tested x86/linux -benjamin 2012-03-22 Benjamin Kosnik * doc/Makefile.am: XML output names have only .xml suffix. * doc/Makefile.in: Regenerate. diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am index 0f7b285..95d8513 100644 --- a/libstdc++-v3/doc/Makefile.am +++ b/libstdc++-v3/doc/Makefile.am @@ -1,6 +1,6 @@ ## Makefile for the doc subdirectory of the GNU C++ Standard library. ## -## Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +## Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. ## ## This file is part of the libstdc++ version 3 distribution. ## Process this file with automake to produce Makefile.in. @@ -206,7 +206,7 @@ doc-install-epub: doc-epub # Assumes doxygen, graphviz (with dot), pdflatex installed doxygen_script=${top_srcdir}/scripts/run_doxygen doxygen_outdir = ${glibcxx_builddir}/doc/doxygen -api_xml = ${doxygen_outdir}/xml/libstdc++-api-single.xml +api_xml = ${doxygen_outdir}/xml/libstdc++-api.xml doxygen_pdf = ${doxygen_outdir}/latex/refman.pdf api_pdf = ${doxygen_outdir}/pdf/libstdc++-api.pdf @@ -505,8 +505,8 @@ doc-xml-validate-docbook: $(xml_sources) $(xml_images) # XML, all one page # Some info on canonicalization # http://www.mail-archive.com/help-texinfo@gnu.org/msg00864.html -manual_xml = ${docbook_outdir}/xml/libstdc++-manual-single.xml -set_xml = ${docbook_outdir}/xml/libstdc++-set-single.xml +manual_xml = ${docbook_outdir}/xml/libstdc++-manual.xml +set_xml = ${docbook_outdir}/xml/libstdc++-set.xml stamp-xml-single-docbook: $(xml_sources) ${docbook_outdir}/xml @echo "Generating XML single..." $(XMLLINT) $(XMLLINT_FLAGS) \