From 52565d5a4815e386c2d15cc6a3fa1648c288672f Mon Sep 17 00:00:00 2001
From: Ted Pavlic <ted@tedpavlic.com>
Date: Thu, 8 Jan 2009 17:54:09 -0500
Subject: [PATCH] More Makefile.doc refactoring. Also allow 'make shortname' to
 build either t2t or doc or both.

---
 common/Makefile.doc | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/common/Makefile.doc b/common/Makefile.doc
index 5f5b04d3..6777d234 100644
--- a/common/Makefile.doc
+++ b/common/Makefile.doc
@@ -8,11 +8,11 @@ THIS_LOCALE   = $(notdir $(shell pwd))
 
 ADC_SRC_FILES = $(wildcard *.txt)
 ADC_FILES     = $(ADC_SRC_FILES:%.txt=%.html)
-ADC_DEPS      = asciidoc.conf
+ADC_DEPS      = $(wildcard asciidoc.conf)
 
 T2T_SRC_FILES = $(wildcard *.t2t)
 T2T_FILES     = $(T2T_SRC_FILES:%.t2t=%.xhtml)
-T2T_DEPS      = config.t2t
+T2T_DEPS      = $(wildcard config.t2t)
 
 DOC_FILES     = $(ADC_FILES) $(T2T_FILES)
 
@@ -47,6 +47,14 @@ distclean: clean
 	@echo "More cleanup..."
 	rm -f $(DOC_FILES)
 
+#### Makes single-file makes easier to type
+
+%: %.html %.t2t %.xhtml %.t2t ;
+
+%: %.html %.txt ;
+
+%: %.xhtml %.t2t ;
+
 #### asciidoc
 
 asciidoc: check-asciidoc $(ADC_FILES)
@@ -66,7 +74,3 @@ t2t: $(T2T_FILES)
 $(T2T_FILES): %.xhtml: %.t2t $(BASE)/Makefile.doc $(T2T_DEPS)
 	@echo "T2T locale/$(THIS_LOCALE)/$@"
 	txt2tags --quiet $<
-
-%.xhtml: %.t2t
-	@echo "T2T $@"
-	$(TXT2TAGS) --quiet $<