From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 73728198005 for ; Sat, 23 Feb 2013 02:05:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9FE521C028; Sat, 23 Feb 2013 02:05:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6441F21C028 for ; Sat, 23 Feb 2013 02:05:12 +0000 (UTC) Received: from mail-yh0-f47.google.com (mail-yh0-f47.google.com [209.85.213.47]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: mattst88) by smtp.gentoo.org (Postfix) with ESMTPSA id 7B0D333DE28 for ; Sat, 23 Feb 2013 02:05:11 +0000 (UTC) Received: by mail-yh0-f47.google.com with SMTP id w68so246612yhw.6 for ; Fri, 22 Feb 2013 18:05:09 -0800 (PST) X-Received: by 10.236.165.135 with SMTP id e7mr7920919yhl.99.1361585109828; Fri, 22 Feb 2013 18:05:09 -0800 (PST) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org MIME-Version: 1.0 Received: by 10.100.92.15 with HTTP; Fri, 22 Feb 2013 18:04:49 -0800 (PST) In-Reply-To: <52b8f12bd26a15040022322fced2d12a8fbe0517.1360441874.git.wking@tremily.us> References: <52b8f12bd26a15040022322fced2d12a8fbe0517.1360441874.git.wking@tremily.us> From: Matt Turner Date: Fri, 22 Feb 2013 18:04:49 -0800 Message-ID: Subject: Re: [gentoo-catalyst] [PATCH 2/4] Makefile: Add DOCS for building files/HOWTO.html To: gentoo-catalyst@lists.gentoo.org Cc: "W. Trevor King" Content-Type: text/plain; charset=ISO-8859-1 X-Archives-Salt: c6e2a147-dbbf-4b39-8921-99abb0b48201 X-Archives-Hash: 69552c07f3228dae691d9677ee870fb1 On Sat, Feb 9, 2013 at 12:40 PM, W. Trevor King wrote: > From: "W. Trevor King" > > The rules are more general though; any new *.txt file in doc/ that > doesn't match *.?.txt or one of the explicitly-listed *.generated.txt > files will be automatically built and distributed. > > The generated `files/docbook-xsl.css` is a side effect of the xhtml > target. > --- > Makefile | 15 ++++++++++++--- > 1 file changed, 12 insertions(+), 3 deletions(-) > > diff --git a/Makefile b/Makefile > index 016120a..98accbe 100644 > --- a/Makefile > +++ b/Makefile > @@ -5,15 +5,18 @@ PACKAGE_VERSION = `fgrep '__version__=' catalyst | sed 's|^__version__="\(.*\)"$ > MAN_PAGE_SOURCES = $(wildcard doc/*.?.txt) > MAN_PAGES = $(patsubst doc/%.txt,files/%,$(MAN_PAGE_SOURCES)) > MAN_PAGE_INCLUDES = doc/subarches.generated.txt doc/targets.generated.txt > -EXTRA_DIST = $(MAN_PAGES) > -GENERATED_FILES = $(MAN_PAGES) $(MAN_PAGE_INCLUDES) > +DOC_SOURCES = $(filter-out $(MAN_PAGE_SOURCES) $(MAN_PAGE_INCLUDES),$(wildcard doc/*.txt)) > +DOCS = $(patsubst doc/%.txt,files/%.html,$(DOC_SOURCES)) > +DOC_SIDE_EFFECTS = files/docbook-xsl.css > +EXTRA_DIST = $(MAN_PAGES) $(DOCS) $(DOC_SIDE_EFFECTS) > +GENERATED_FILES = $(MAN_PAGES) $(MAN_PAGE_INCLUDES) $(DOCS) $(DOC_SIDE_EFFECTS) > > distdir = catalyst-$(PACKAGE_VERSION) > > > all: $(EXTRA_DIST) > > -files/%: doc/%.txt doc/asciidoc.conf Makefile catalyst > +$(MAN_PAGES): files/%: doc/%.txt doc/asciidoc.conf Makefile catalyst > a2x --conf-file=doc/asciidoc.conf --attribute="catalystversion=$(PACKAGE_VERSION)" \ > --format=manpage -D files "$<" > > @@ -27,6 +30,12 @@ doc/subarches.generated.txt: $(wildcard arch/*.py) doc/make_subarch_table_guidex > doc/targets.generated.txt: doc/make_target_table.py $(wildcard modules/*_target.py) > "./$<" > "$@" > > +$(DOCS): files/%.html: doc/%.txt doc/asciidoc.conf Makefile > + a2x --conf-file=doc/asciidoc.conf --attribute="catalystversion=$(PACKAGE_VERSION)" \ > + --format=xhtml -D files "$<" > + > +$(DOC_SIDE_EFFECTS): $(firstword $(DOCS)) > + > clean: > rm -f $(GENERATED_FILES) > find -name '*.pyo' -delete > -- > 1.8.1.336.g94702dd What's the rationale behind generating HTML instead of man pages like the other docs?