Add support for building PDF's thru FO rather then docbook2latex. Output

files are generated in output/fo-pdf/

diff --git a/Makefile b/Makefile
index 92b301f63e3b99c159ad34af84f57d5b77c2bf9b..51ec3e529e7f9327e81e6b6a9a4e00902e2b042f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,7 @@ ps: $(patsubst $(DOCBOOKDIR)/%.xml,$(PSDIR)/%.ps,$(MAIN_DOCS))
 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 @@ $(FODIR)/%.fo: $(DOCBOOKDIR)/%.xml
        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 $* $@

diff --git a/Makefile.settings.in b/Makefile.settings.in
index b722ba83a2992aafeb90bceaf25e87b4baad1efc..9ac8f080aa1be4cdc354d8fd65c3ba3674addc57 100644 (file)
--- a/Makefile.settings.in
+++ b/Makefile.settings.in
@@ -13,6 +13,7 @@ COPY_IMAGES = ./scripts/copy-images.sh
 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 @@ EXAMPLESDIR = examples
 SMBDOTCONFDOC = smbdotconf
 DOCBOOKDIR = tmp
 PSDIR = $(OUTPUTDIR)
+FOPDFDIR = $(OUTPUTDIR)/fo-pdf
 PDFDIR = $(OUTPUTDIR)
 DVIDIR = $(OUTPUTDIR)
 FODIR = $(OUTPUTDIR)

diff --git a/configure.in b/configure.in
index 033bbed00ffcf3f8914fd2999ff4396a2a162bfd..e4f79fbc182d7c2b68788b883b7dee7eb97f834b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -67,6 +67,7 @@ DOCS_TARGET_REQUIRE_PROGRAM(PLUCKERBUILD, plucker-build, PLUCKER)
 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(MANPAGES, ALL, [manpages], [manpages])
 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])