Makefile.doc cleanup. Also made Makefile build t2t's too with doc target.

common/Makefile.common

@@ -5,9 +5,8 @@ OS            = $(shell uname -s)
 BUILD_DATE    = $(shell date "+%Y/%m/%d %H:%M:%S")
 BASE	      = $(TOP)/../common
 
-DOC_SRC_FILES = $(wildcard locale/*/*.txt)
+DOC_SRC_FILES = $(wildcard locale/*/*.txt) $(wildcard locale/*/*.t2t)
-DOC_FILES     = ${DOC_SRC_FILES:%.txt=%.html}
+LOCALES       = $(wildcard locale/*)
-DOC_DEPS      = $(wildcard locale/*/asciidoc.conf)
 
 MAKE_JAR      = VERSION="$(VERSION)" DATE="$(BUILD_DATE)" sh $(BASE)/make_jar.sh
 
@@ -64,8 +63,6 @@ info:
 	@echo -e "jar files           $(shell echo ${JAR_FILES} | sed 's/ /\\n                    /g' )"
 	@echo    "xpi files           ${XPI_FILES}"
 
-.PHONY: check-asciidoc
-doc: check-asciidoc ${DOC_FILES}
 xpi: ${XPI}
 jar: ${JAR}
 
@@ -85,7 +82,7 @@ clean:
 
 distclean: clean
 	@echo "More cleanup..."
-	rm -f ${DOC_FILES}
+	@set -e; for locale in $(LOCALES); do $(MAKE) -C clean; doc; done
 	rm -rf ${BUILD_DIR}
 
 #### xpi
@@ -104,21 +101,7 @@ $(JAR): doc
 	$(MAKE_JAR) "$(JAR)" "$(JAR_BASES)" "$(JAR_DIRS)" "$(JAR_TEXTS)" "$(JAR_BINS)" "$(JAR_FILES)"
 	@echo "SUCCESS: $@"
 
-#### doc
+#### doc (see Makefile.doc)
-
-check-asciidoc:
-	@$(ASCIIDOC) --version | awk '{ exit $$2 !~ /^8\.2\./ }' || \
-		echo >&2 "Warning: asciidoc versions other than 8.2.x are unsupported"
-
-${DOC_FILES}: %.html: %.txt $(BASE)/Makefile.common $(DOC_DEPS)
-	@echo "DOC $@"
-	$(ASCIIDOC) --unsafe -a linkcss -a quirks! -a doctitle="$(shell basename $@)" -o $@ $<
-
-T2T = $(wildcard locale/*/*.t2t)
-t2t: $(T2T:%.t2t=%.xhtml)
-$(T2T:%.t2t=%.xhtml): locale/en-US/config.t2t
-
-%.xhtml: %.t2t
-	@echo "T2T $@"
-	txt2tags --quiet $<
 
+doc:
+	@set -e; for locale in $(LOCALES); do $(MAKE) -C $$locale doc; done

common/Makefile.doc

@@ -0,0 +1,70 @@
+# Symlink me to locale/*/Makefile
+
+#### configuration
+
+BASE          = ../../../common
+
+THIS_LOCALE   = $(notdir $(shell pwd))
+
+ADC_SRC_FILES = $(wildcard *.txt)
+ADC_FILES     = $(ADC_SRC_FILES:%.txt=%.html)
+ADC_DEPS      = asciidoc.conf
+
+T2T_SRC_FILES = $(wildcard *.t2t)
+T2T_FILES     = $(T2T_SRC_FILES:%.t2t=%.xhtml)
+T2T_DEPS      = config.t2t
+
+DOC_FILES     = $(ADC_FILES) $(T2T_FILES)
+
+ASCIIDOC      = asciidoc
+TXT2TAGS      = txt2tags
+AWK           = awk
+
+.SILENT:
+
+#### rules
+
+.PHONY: all help doc asciidoc check-asciidoc clean distclean
+all: doc
+
+doc: asciidoc
+
+help:
+	@echo "${NAME} ${VERSION} build"
+	@echo
+	@echo "  make help      - display this help"
+	@echo "  make doc       - build doc files"
+	@echo "  make asciidoc  - build asciidoc'd files only"
+	@echo "  make t2t       - build txt2tags'd files only"
+	@echo "  make clean     - clean up"
+	@echo "  make distclean - clean up more"
+
+clean:
+	@echo "Cleanup..."
+	find . -name '*~' -exec rm -f {} \;
+
+distclean: clean
+	@echo "More cleanup..."
+	rm -f $(DOC_FILES)
+
+#### asciidoc
+
+asciidoc: check-asciidoc $(ADC_FILES)
+
+check-asciidoc:
+	@$(ASCIIDOC) --version | $(AWK) '{ exit $$2 !~ /^8\.2\./ }' || \
+		echo >&2 "Warning: asciidoc versions other than 8.2.x are unsupported"
+
+$(ADC_FILES): %.html: %.txt $(BASE)/Makefile.doc $(ADC_DEPS)
+	@echo "DOC locale/$(THIS_LOCALE)/$@"
+	$(ASCIIDOC) --unsafe -a linkcss -a quirks! -a doctitle="$(shell basename $@)" -o $@ $<
+
+#### txt2tags
+
+$(T2T_FILES): %.xhtml: %.t2t $(BASE)/Makefile.doc $(T2T_DEPS)
+	@echo "T2T locale/$(THIS_LOCALE)/$@"
+	txt2tags --quiet $<
+
+%.xhtml: %.t2t
+	@echo "T2T $@"
+	$(TXT2TAGS) --quiet $<

muttator/locale/en-US/Makefile

@@ -1 +1 @@
-../../../vimperator/locale/en-US/Makefile
+../../../common/Makefile.doc

vimperator/locale/en-US/Makefile

@@ -1,18 +0,0 @@
-THIS_LOCALE  = $(notdir $(shell pwd))
-DOC_FILES    = $(addsuffix .html,$(basename $(wildcard *.txt)))
-
-.PHONY: all doc clean distclean
-
-doc: $(DOC_FILES)
-
-clean:
-	find . -name '*~' -exec rm -f {} \;
-
-distclean: clean
-	rm -f $(DOC_FILES)
-
-%: %.html %.txt
-	@
-
-%.html: %.txt ../../../common/Makefile.common asciidoc.conf
-	@make -C ../../ locale/$(THIS_LOCALE)/$@

vimperator/locale/en-US/Makefile

@@ -0,0 +1 @@
+../../../common/Makefile.doc