[Ipcop-svn] SF.net SVN: ipcop:[5423] IPCopDoc/trunk

[<ow...@us...>]

Revision: 5423
          http://ipcop.svn.sourceforge.net/ipcop/?rev=5423&view=rev
Author:   owes
Date:     2011-02-09 07:50:12 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
Change the manual makefiles to give slightly more control which manual to build, or build all manuals with 1 command.

Modified Paths:
--------------
    IPCopDoc/trunk/Makefile
    IPCopDoc/trunk/Makefile.rules
    IPCopDoc/trunk/de/Makefile
    IPCopDoc/trunk/de/admin/Makefile
    IPCopDoc/trunk/de/install/Makefile
    IPCopDoc/trunk/en/admin/Makefile
    IPCopDoc/trunk/en/install/Makefile
    IPCopDoc/trunk/en/quickstart/Makefile

Modified: IPCopDoc/trunk/Makefile
===================================================================
--- IPCopDoc/trunk/Makefile	2011-02-09 07:44:52 UTC (rev 5422)
+++ IPCopDoc/trunk/Makefile	2011-02-09 07:50:12 UTC (rev 5423)
@@ -2,23 +2,29 @@
 # $Id$
 #
 
-# 'Make' the documentation for other languages using: make LANG=de
-LANG = en
+# Note:
+# Do not use LANG or LANGUAGE for manual language, as that will override the locale setting
+#
+# 'Make' the documentation for one language only: make LANGUAGES=en
+# 'Make' only the installation manuals: make MANUALS=install
+# 'Make' the English installation manual only: make LANGUAGES=en MANUALS=install
+
 # Can we do this more clever? Without changing the Makefile on version upgrades?
 IPCOP_VERSION = 2.0.0
 
+# Build all languages if LANGUAGES not specified
+LANGUAGES = en de
 export
 
+PDFDIR=$(shell pwd)/pdf
 
-SUBDIRS = install admin quickstart
+.PHONY : languages $(LANGUAGES) all clean
+all : languages
 
-.PHONY : subdirs $(SUBDIRS) all clean
-all : subdirs
-
 clean :
-	$(MAKE) -C $(LANG) clean
+	for i in $(LANGUAGES); do $(MAKE) LANGUAGE=$$i -C $$i clean; done
 
-subdirs : $(SUBDIRS)
+languages : $(LANGUAGES)
 
-$(SUBDIRS):
-	$(MAKE) -C $(LANG)/$@
+$(LANGUAGES):
+	$(MAKE) MAN_LANG=$@ -C $@

Modified: IPCopDoc/trunk/Makefile.rules
===================================================================
--- IPCopDoc/trunk/Makefile.rules	2011-02-09 07:44:52 UTC (rev 5422)
+++ IPCopDoc/trunk/Makefile.rules	2011-02-09 07:50:12 UTC (rev 5423)
@@ -5,5 +5,7 @@
 # To be able to create PDF with 'special' characters in text
 DBLATEX_OPTION := -P latex.encoding=utf8
 
+PDF_FILE = $(PDFDIR)/ipcop-$(MANUAL)-$(MAN_LANG)-$(IPCOP_VERSION).pdf
+
 clean:
 	rm -f html/*.html

Modified: IPCopDoc/trunk/de/Makefile
===================================================================
--- IPCopDoc/trunk/de/Makefile	2011-02-09 07:44:52 UTC (rev 5422)
+++ IPCopDoc/trunk/de/Makefile	2011-02-09 07:50:12 UTC (rev 5423)
@@ -1,18 +1,18 @@
 #
 # $Id$
 #
-# Makefile for IPCopDoc/en - IPCop Firewall English Documentation Project
+# Makefile for IPCopDoc/de- IPCop Firewall German Documentation Project
 #
 
-SUBDIRS = install admin
+MANUALS = install admin
 
-.PHONY : subdirs $(SUBDIRS) all clean
-all : subdirs
+.PHONY : manuals $(MANUALS) all clean
+all : manuals
 
 clean :
-	for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done
+	for i in $(MANUALS); do $(MAKE) -C $$i clean; done
 
-subdirs : $(SUBDIRS)
+manuals : $(MANUALS)
 
-$(SUBDIRS):
-	$(MAKE) -C $@
+$(MANUALS):
+	$(MAKE) MAN_LANG=$(MAN_LANG) MANUAL=$@ -C $@

Modified: IPCopDoc/trunk/de/admin/Makefile
===================================================================
--- IPCopDoc/trunk/de/admin/Makefile	2011-02-09 07:44:52 UTC (rev 5422)
+++ IPCopDoc/trunk/de/admin/Makefile	2011-02-09 07:50:12 UTC (rev 5423)
@@ -4,9 +4,9 @@
 
 
 html/index.html: xml/*.xml
-	xmlto -m ../../html.xsl -x $(DOCBOOK_XSL_DIR)/html/tldp-sections.xsl -o html html xml/admin.xml
+	xmlto -m ../../html.xsl -x $(DOCBOOK_XSL_DIR)/html/tldp-sections.xsl -o html html xml/$(MANUAL).xml
 	-tidy -imq -utf8 html/*.html
 	patch -Np1 -i index.html_logo.patch
-	dblatex xml/admin.xml $(DBLATEX_OPTION) -o ipcop-admin-$(LANG)-$(IPCOP_VERSION).pdf
+	dblatex xml/$(MANUAL).xml $(DBLATEX_OPTION) -o $(PDF_FILE)
 
 include ../../Makefile.rules

Modified: IPCopDoc/trunk/de/install/Makefile
===================================================================
--- IPCopDoc/trunk/de/install/Makefile	2011-02-09 07:44:52 UTC (rev 5422)
+++ IPCopDoc/trunk/de/install/Makefile	2011-02-09 07:50:12 UTC (rev 5423)
@@ -4,9 +4,9 @@
 
 
 html/index.html: xml/*.xml
-	xmlto -m ../../html.xsl -x $(DOCBOOK_XSL_DIR)/html/tldp-sections.xsl -o html html xml/install.xml
+	xmlto -m ../../html.xsl -x $(DOCBOOK_XSL_DIR)/html/tldp-sections.xsl -o html html xml/$(MANUAL).xml
 	-tidy -imq -utf8 html/*.html
 	patch -Np1 -i index.html_logo.patch
-	dblatex xml/install.xml $(DBLATEX_OPTION) -o ipcop-install-$(LANG)-$(IPCOP_VERSION).pdf
+	dblatex xml/$(MANUAL).xml $(DBLATEX_OPTION) -o $(PDF_FILE)
 
 include ../../Makefile.rules

Modified: IPCopDoc/trunk/en/admin/Makefile
===================================================================
--- IPCopDoc/trunk/en/admin/Makefile	2011-02-09 07:44:52 UTC (rev 5422)
+++ IPCopDoc/trunk/en/admin/Makefile	2011-02-09 07:50:12 UTC (rev 5423)
@@ -4,9 +4,9 @@
 
 
 html/index.html: xml/*.xml
-	xmlto -m ../../html.xsl -x $(DOCBOOK_XSL_DIR)/html/tldp-sections.xsl -o html html xml/admin.xml
+	xmlto -m ../../html.xsl -x $(DOCBOOK_XSL_DIR)/html/tldp-sections.xsl -o html html xml/$(MANUAL).xml
 	-tidy -imq -utf8 html/*.html
 	patch -Np1 -i index.html_logo.patch
-	dblatex xml/admin.xml -o ipcop-admin-$(LANG)-$(IPCOP_VERSION).pdf
+	dblatex xml/$(MANUAL).xml $(DBLATEX_OPTION) -o $(PDF_FILE)
 
 include ../../Makefile.rules

Modified: IPCopDoc/trunk/en/install/Makefile
===================================================================
--- IPCopDoc/trunk/en/install/Makefile	2011-02-09 07:44:52 UTC (rev 5422)
+++ IPCopDoc/trunk/en/install/Makefile	2011-02-09 07:50:12 UTC (rev 5423)
@@ -4,9 +4,9 @@
 
 
 html/index.html: xml/*.xml
-	xmlto -m ../../html.xsl -x $(DOCBOOK_XSL_DIR)/html/tldp-sections.xsl -o html html xml/install.xml
+	xmlto -m ../../html.xsl -x $(DOCBOOK_XSL_DIR)/html/tldp-sections.xsl -o html html xml/$(MANUAL).xml
 	-tidy -imq -utf8 html/*.html
 	patch -Np1 -i index.html_logo.patch
-	dblatex xml/install.xml -o ipcop-install-$(LANG)-$(IPCOP_VERSION).pdf
+	dblatex xml/$(MANUAL).xml $(DBLATEX_OPTION) -o $(PDF_FILE)
 
 include ../../Makefile.rules

Modified: IPCopDoc/trunk/en/quickstart/Makefile
===================================================================
--- IPCopDoc/trunk/en/quickstart/Makefile	2011-02-09 07:44:52 UTC (rev 5422)
+++ IPCopDoc/trunk/en/quickstart/Makefile	2011-02-09 07:50:12 UTC (rev 5423)
@@ -4,9 +4,9 @@
 
 
 html/index.html: xml/*.xml
-	xmlto -m html.xsl -x $(DOCBOOK_XSL_DIR)/html/tldp-sections.xsl -o html html xml/quickstart-en.xml
+	xmlto -m html.xsl -x $(DOCBOOK_XSL_DIR)/html/tldp-sections.xsl -o html html xml/$(MANUAL).xml
 	-tidy -imq -utf8 html/*.html
 	patch -Np1 -i index.html_logo.patch
-	dblatex xml/quickstart-en.xml -o ipcop-quickstart-$(LANG)-$(IPCOP_VERSION).pdf
+	dblatex xml/$(MANUAL).xml $(DBLATEX_OPTION) -o $(PDF_FILE)
 
 include ../../Makefile.rules


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.