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 10748198003 for ; Sat, 9 Mar 2013 02:41:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B8EAE0772; Sat, 9 Mar 2013 02:41:55 +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 CB88EE0772 for ; Sat, 9 Mar 2013 02:41:54 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B0E2C33E0F8 for ; Sat, 9 Mar 2013 02:41:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 576CFE42C6 for ; Sat, 9 Mar 2013 02:41:52 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1362796751.f09a0254fa7609800d76b127feba44fdd8073323.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: / X-VCS-Repository: proj/catalyst X-VCS-Files: Makefile X-VCS-Directories: / X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: f09a0254fa7609800d76b127feba44fdd8073323 X-VCS-Branch: master Date: Sat, 9 Mar 2013 02:41:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 780a69e1-4c65-4949-b2a4-71386bb67941 X-Archives-Hash: ac048803d31ab18c46893da5e81a67dc commit: f09a0254fa7609800d76b127feba44fdd8073323 Author: W. Trevor King tremily us> AuthorDate: Sat Feb 9 20:40:31 2013 +0000 Commit: Matt Turner gmail com> CommitDate: Sat Mar 9 02:39:11 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f09a0254 Makefile: Add DOCS for building files/HOWTO.html 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. Reviewed-by: Matt Turner gmail.com> --- Makefile | 15 ++++++++++++--- 1 files 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