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 078A313894A for ; Sat, 9 Feb 2013 20:41:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A385821C001; Sat, 9 Feb 2013 20:41:07 +0000 (UTC) Received: from vms173001pub.verizon.net (vms173001pub.verizon.net [206.46.173.1]) by pigeon.gentoo.org (Postfix) with ESMTP id EBEE821C001 for ; Sat, 9 Feb 2013 20:41:06 +0000 (UTC) Received: from odin.tremily.us ([unknown] [72.68.84.219]) by vms173001.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0MHZ000IA049QF80@vms173001.mailsrvcs.net> for gentoo-catalyst@lists.gentoo.org; Sat, 09 Feb 2013 14:40:58 -0600 (CST) Received: by odin.tremily.us (Postfix, from userid 1000) id 5C51F878C39; Sat, 09 Feb 2013 15:40:57 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; t=1360442457; bh=oW6blHs9Vz+jnat554B94vwjsbaNHxD2keIze4gIiUQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References; b=i0LkIZ+rmVvLbGtjfnisa/4QGhAkPbQOlRqt1ZS5J9PjCnZvg70JaxlM9LeZ96+t8 4A7+3TAO6j+nbCSn5aoDGYDwLQFKDeXty59otBSP2TdX6AH3bMtFnrRjdVBB6ObF8o 8dmkg0GVW6/CP3mu4o6BNkdhaeCpyVvnctexSlNA= From: "W. Trevor King" To: Catalyst Cc: "W. Trevor King" Subject: [gentoo-catalyst] [PATCH 2/4] Makefile: Add DOCS for building files/HOWTO.html Date: Sat, 09 Feb 2013 15:40:31 -0500 Message-id: <52b8f12bd26a15040022322fced2d12a8fbe0517.1360441874.git.wking@tremily.us> X-Mailer: git-send-email 1.7.12.4 In-reply-to: References: In-reply-to: References: 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 X-Archives-Salt: 4cb7ebb2-9ea0-41f7-b596-9f9b83170f00 X-Archives-Hash: f9aad8bd19af0782c74eabbb8a4dea67 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