From: <ow...@us...> - 2009-06-21 09:48:24
|
Revision: 3096 http://ipcop.svn.sourceforge.net/ipcop/?rev=3096&view=rev Author: owes Date: 2009-06-21 09:47:20 +0000 (Sun, 21 Jun 2009) Log Message: ----------- Some Makefile magic, not ideal and not complete. Add PDF creation using dblatex (thanks to Eric). Will need to write extra text in README as to which external tools are needed. Modified Paths: -------------- IPCopDoc/trunk/en/Makefile IPCopDoc/trunk/en/admin/Makefile IPCopDoc/trunk/en/admin/xml/admin.xml IPCopDoc/trunk/en/install/Makefile Added Paths: ----------- IPCopDoc/trunk/Makefile.rules Removed Paths: ------------- IPCopDoc/trunk/settings.make Property Changed: ---------------- IPCopDoc/trunk/en/admin/Makefile IPCopDoc/trunk/en/install/Makefile Copied: IPCopDoc/trunk/Makefile.rules (from rev 3075, IPCopDoc/trunk/settings.make) =================================================================== --- IPCopDoc/trunk/Makefile.rules (rev 0) +++ IPCopDoc/trunk/Makefile.rules 2009-06-21 09:47:20 UTC (rev 3096) @@ -0,0 +1,7 @@ +# +# Path to docbook xsl, containing common, fo, html, lib etc. etc. +DOCBOOK_XSL_DIR = ~/docbook-xsl +BOOK = `pwd` + +clean: + rm -f html/*.html Property changes on: IPCopDoc/trunk/Makefile.rules ___________________________________________________________________ Added: svn:mergeinfo + Modified: IPCopDoc/trunk/en/Makefile =================================================================== --- IPCopDoc/trunk/en/Makefile 2009-06-21 07:22:02 UTC (rev 3095) +++ IPCopDoc/trunk/en/Makefile 2009-06-21 09:47:20 UTC (rev 3096) @@ -4,27 +4,21 @@ # Makefile for IPCopDoc/en - IPCop Firewall English Documentation Project # -IPCOP_DOC_DIR = .. +# These settings need to come from elsewhere +IPCOP_LANG = en +IPCOP_VERSION = 2.0.0 -ifndef $(SETTINGS_INCLUDED) -include $(IPCOP_DOC_DIR)/settings.make -endif - export -SUBDIRS = admin \ - install \ - quickstart \ - vpn +SUBDIRS = install admin .PHONY : subdirs $(SUBDIRS) all clean - all : subdirs -clean : subdirs +clean : + for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done subdirs : $(SUBDIRS) $(SUBDIRS): - echo $(DOCBOOK_XSL_DIR) $(MAKE) -C $@ Modified: IPCopDoc/trunk/en/admin/Makefile =================================================================== --- IPCopDoc/trunk/en/admin/Makefile 2009-06-21 07:22:02 UTC (rev 3095) +++ IPCopDoc/trunk/en/admin/Makefile 2009-06-21 09:47:20 UTC (rev 3096) @@ -1,2 +1,10 @@ +# +# $Id$ +# + + html/index.html: xml/*.xml xmlto -m ../../html.xsl -x $(DOCBOOK_XSL_DIR)/html/tldp-sections.xsl -o html html xml/admin.xml + dblatex xml/admin.xml -o ipcop-install-$(IPCOP_LANG)-$(IPCOP_VERSION).pdf + +include ../../Makefile.rules Property changes on: IPCopDoc/trunk/en/admin/Makefile ___________________________________________________________________ Added: svn:keywords + Id Modified: IPCopDoc/trunk/en/admin/xml/admin.xml =================================================================== --- IPCopDoc/trunk/en/admin/xml/admin.xml 2009-06-21 07:22:02 UTC (rev 3095) +++ IPCopDoc/trunk/en/admin/xml/admin.xml 2009-06-21 09:47:20 UTC (rev 3096) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ - <!ENTITY imagepath "relative/path/to/images/admin/" > + <!ENTITY imagepath "../images/" > <!ENTITY imageext "png" > ] > Modified: IPCopDoc/trunk/en/install/Makefile =================================================================== --- IPCopDoc/trunk/en/install/Makefile 2009-06-21 07:22:02 UTC (rev 3095) +++ IPCopDoc/trunk/en/install/Makefile 2009-06-21 09:47:20 UTC (rev 3096) @@ -1,2 +1,10 @@ +# +# $Id$ +# + + html/index.html: xml/*.xml xmlto -m ../../html.xsl -x $(DOCBOOK_XSL_DIR)/html/tldp-sections.xsl -o html html xml/install.xml + dblatex xml/install.xml -o ipcop-install-$(IPCOP_LANG)-$(IPCOP_VERSION).pdf + +include ../../Makefile.rules Property changes on: IPCopDoc/trunk/en/install/Makefile ___________________________________________________________________ Added: svn:keywords + Id Deleted: IPCopDoc/trunk/settings.make =================================================================== --- IPCopDoc/trunk/settings.make 2009-06-21 07:22:02 UTC (rev 3095) +++ IPCopDoc/trunk/settings.make 2009-06-21 09:47:20 UTC (rev 3096) @@ -1,3 +0,0 @@ -# -# Path to docbook xsl, containing common, fo, html, lib etc. etc. -DOCBOOK_XSL_DIR = ~/docbook-xsl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |