svn commit: samba-docs r356 - in trunk: .

[jelmer at samba.org]

Author: jelmer
Date: 2005-02-10 08:51:11 +0000 (Thu, 10 Feb 2005)
New Revision: 356

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=356

Log:
Add support for building PDF's thru FO rather then docbook2latex. Output 
files are generated in output/fo-pdf/

Modified:
   trunk/Makefile
   trunk/Makefile.settings.in
   trunk/configure.in


Changeset:
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-02-09 21:06:50 UTC (rev 355)
+++ trunk/Makefile	2005-02-10 08:51:11 UTC (rev 356)
@@ -55,6 +55,7 @@
 txt: $(patsubst $(DOCBOOKDIR)/%.xml,$(TXTDIR)/%.txt,$(MAIN_DOCS))
 txt-chunks: $(patsubst $(DOCBOOKDIR)/%.xml,$(TXTDIR)/%/,$(MAIN_DOCS))
 fo: $(patsubst $(DOCBOOKDIR)/%.xml,$(FODIR)/%.fo,$(MAIN_DOCS))
+fo-pdf: $(patsubst $(DOCBOOKDIR)/%.xml,$(FOPDFDIR)/%.pdf,$(MAIN_DOCS))
 tex: $(patsubst $(DOCBOOKDIR)/%.xml,%.tex,$(MAIN_DOCS))
 manpages: $(patsubst $(MANPAGEDIR)/%.xml,$(MANDIR)/%,$(MANPAGES)) 
 pearson: $(PEARSONDIR)/Samba-HOWTO-Collection.xml
@@ -177,6 +178,11 @@
 	mkdir -p $(@D)
 	$(XSLTPROC) --output $@ http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $<
 
+# PDF thru Fo
+$(FOPDFDIR)/%.pdf: $(FODIR)/%.fo
+	mkdir -p $(@D)
+	$(FOP) $< $@
+
 $(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml
 	-mkdir -p $@/images
 	$(COPY_IMAGES) html $(DOCBOOKDIR)/$*.xml $* $@

Modified: trunk/Makefile.settings.in
===================================================================
--- trunk/Makefile.settings.in	2005-02-09 21:06:50 UTC (rev 355)
+++ trunk/Makefile.settings.in	2005-02-10 08:51:11 UTC (rev 356)
@@ -13,6 +13,7 @@
 THUMBPDF = @THUMBPDF@
 PDFLATEX = TEXINPUTS=xslt/latex:.: @PDFLATEX@ --file-line-error-style
 LATEX = TEXINPUTS=xslt/latex:.: @LATEX@ --file-line-error-style
+FOP = @FOP@
 RM = @RM@
 PERL = @PERL@
 ifndef DEBUG_LATEX
@@ -32,6 +33,7 @@
 SMBDOTCONFDOC = smbdotconf
 DOCBOOKDIR = tmp
 PSDIR = $(OUTPUTDIR)
+FOPDFDIR = $(OUTPUTDIR)/fo-pdf
 PDFDIR = $(OUTPUTDIR)
 DVIDIR = $(OUTPUTDIR)
 FODIR = $(OUTPUTDIR)

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-02-09 21:06:50 UTC (rev 355)
+++ trunk/configure.in	2005-02-10 08:51:11 UTC (rev 356)
@@ -67,6 +67,7 @@
 DOCS_TARGET_REQUIRE_PROGRAM(HTML2TEXT, html2text, TXT)
 DOCS_TARGET_REQUIRE_PROGRAM(PERL, perl, UNDOCUMENTED)
 DOCS_TARGET_REQUIRE_PROGRAM(XMLLINT, xmllint, VERIFY)
+DOCS_TARGET_REQUIRE_PROGRAM(FOP, fop, FOPDF)
 DOCS_TARGET_REQUIRE_DIR([$SPECIFIED_SOURCEDIR ..], [source/configure.in], SAMBASOURCEDIR, UNDOCUMENTED)
 
 AC_MSG_RESULT([])
@@ -84,6 +85,7 @@
 DOCS_DEFINE_TARGET(PEARSON, ALL, [pearson-compatible XML], [pearson])
 DOCS_DEFINE_TARGET(PLUCKER, HTML, [plucker versions], [plucker])
 DOCS_DEFINE_TARGET(VERIFY, ALL, [verifying docbook output], [verify])
+DOCS_DEFINE_TARGET(FOPDF, ALL, [PDF versions thru FO], [fopdf])
 DOCS_DEFINE_TARGET(UNDOCUMENTED, MANPAGES, [list of undocumented options], [undocumented])
 DOCS_DEFINE_TARGET(TXT, HTML, [text versions], [txt])