public inbox for gentoo-catalyst@lists.gentoo.org
 help / color / mirror / Atom feed
From: "W. Trevor King" <wking@tremily.us>
To: Catalyst <gentoo-catalyst@lists.gentoo.org>
Cc: "W. Trevor King" <wking@tremily.us>
Subject: [gentoo-catalyst] [PATCH 2/4] Makefile: Add DOCS for building files/HOWTO.html
Date: Sat, 09 Feb 2013 15:40:31 -0500	[thread overview]
Message-ID: <52b8f12bd26a15040022322fced2d12a8fbe0517.1360441874.git.wking@tremily.us> (raw)
In-Reply-To: <cover.1360441874.git.wking@tremily.us>
In-Reply-To: <cover.1360441874.git.wking@tremily.us>

From: "W. Trevor King" <wking@tremily.us>

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



  parent reply	other threads:[~2013-02-09 20:41 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-09 20:40 [gentoo-catalyst] [PATCH 0/4] HOWTO to get newbies started W. Trevor King
2013-02-09 20:40 ` [gentoo-catalyst] [PATCH 1/4] doc/HOWTO: First pass at a gentle Catalyst introduction W. Trevor King
2013-02-23  2:04   ` Matt Turner
2013-02-09 20:40 ` W. Trevor King [this message]
2013-02-23  2:04   ` [gentoo-catalyst] [PATCH 2/4] Makefile: Add DOCS for building files/HOWTO.html Matt Turner
2013-02-23 15:08     ` W. Trevor King
2013-02-09 20:40 ` [gentoo-catalyst] [PATCH 3/4] files/.gitignore: Ignore $(DOCS) and $(DOC_SIDE_EFFECTS) W. Trevor King
2013-02-09 20:40 ` [gentoo-catalyst] [PATCH 4/4] doc/HOWTO.txt: Explain how to run catalyst without installing W. Trevor King
2013-02-21 20:35 ` [gentoo-catalyst] Re: [PATCH 0/4] HOWTO to get newbies started W. Trevor King
2013-02-21 21:47   ` Matt Turner
2013-02-21 21:58     ` W. Trevor King
2013-02-23  2:02       ` Matt Turner
2013-03-09  2:39 ` [gentoo-catalyst] " Matt Turner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=52b8f12bd26a15040022322fced2d12a8fbe0517.1360441874.git.wking@tremily.us \
    --to=wking@tremily.us \
    --cc=gentoo-catalyst@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox