summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-05-01 21:09:13 +0200
committerJelmer Vernooij <jelmer@samba.org>2009-05-01 22:49:13 +0200
commitdf74a0eb78181eba58241a3ff80affe8b8270266 (patch)
tree94a684108ae17710095a3789560f9cba0beab47c
parent25181744c65b9049630447286a5c060c72681597 (diff)
downloadsamba-df74a0eb78181eba58241a3ff80affe8b8270266.tar.gz
samba-df74a0eb78181eba58241a3ff80affe8b8270266.tar.bz2
samba-df74a0eb78181eba58241a3ff80affe8b8270266.zip
Remove broken XSL-FO translation code; this has been broken for a while
and the output was never used.
-rw-r--r--docs-xml/Makefile14
-rw-r--r--docs-xml/Makefile.settings.in3
-rw-r--r--docs-xml/configure.ac3
-rwxr-xr-xdocs-xml/scripts/find_missing_manpages.pl1
-rw-r--r--docs-xml/xslt/fo.xsl8
5 files changed, 1 insertions, 28 deletions
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 486a11190c..68890306ed 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -33,7 +33,7 @@ help:
@echo " release - Build the docs needed for a Samba release"
@echo " all - Build all docs that can be build using the utilities found by configure"
@echo " everything - Build all of the above"
- @echo " pdf,tex,ps,manpages3,txt,pearson,fo,htmlhelp - Build specific output format"
+ @echo " pdf,tex,ps,manpages3,txt,pearson,htmlhelp - Build specific output format"
@echo " html - Build multi-file HTML versions"
@echo " html-single - Build single-file HTML versions"
@echo " htmlman3 - Build HTML version of manpages"
@@ -70,8 +70,6 @@ pdf:: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
ps:: $(patsubst %,$(PSDIR)/%.ps,$(MAIN_DOCS))
txt:: $(patsubst %,$(TXTDIR)/%.txt,$(MAIN_DOCS))
txt-chunks:: $(addsuffix -txt-chunks,$(MAIN_DOCS))
-fo:: $(patsubst %,$(FODIR)/%.fo,$(MAIN_DOCS))
-fo-pdf:: $(patsubst %,$(FOPDFDIR)/%.pdf,$(MAIN_DOCS))
tex:: $(addsuffix .tex,$(MAIN_DOCS))
texi:: $(patsubst %,$(TEXINFODIR)/%.texi,$(MAIN_DOCS))
texiinfo:: $(patsubst %,$(TEXINFODIR)/%.info,$(MAIN_DOCS))
@@ -198,16 +196,6 @@ $(PSDIR)/%.ps: %/index.xml $(PSDIR) xslt/latex.xsl %-images-latex-eps
%.eps: %.png
$(PNGTOPNM) $< | $(PNMTOPS) > $@
-# Fo
-$(FODIR)/%.fo: $(DOCBOOKDIR)/%.xml
- @mkdir -p $(@D)
- $(XSLTPROC) --output $@ xslt/fo.xsl $<
-
-# PDF thru Fo
-$(FOPDFDIR)/%.pdf: $(FODIR)/%.fo
- @mkdir -p $(@D)
- JAVA_OPTS=-Xmx250m $(FOP) -q -d $< -pdf $@
-
$(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml %-images-htmlhelp
$(XSLTPROC) --stringparam htmlhelp.chm $*.chm \
--stringparam manifest.in.base.dir "$@/" \
diff --git a/docs-xml/Makefile.settings.in b/docs-xml/Makefile.settings.in
index 2ab7255a74..635300110a 100644
--- a/docs-xml/Makefile.settings.in
+++ b/docs-xml/Makefile.settings.in
@@ -9,7 +9,6 @@ DB2TEXI = @DB2TEXI@
MAKEINFO = @MAKEINFO@
PLUCKERBUILD = @PLUCKERBUILD@
DBLATEX = @DBLATEX@
-FOP = @FOP@
RM = @RM@
PERL = @PERL@
@@ -23,9 +22,7 @@ MANPAGEDIR3 = manpages-3
SMBDOTCONFDOC = smbdotconf
DOCBOOKDIR = tmp
PSDIR = $(OUTPUTDIR)
-FOPDFDIR = $(OUTPUTDIR)/fo-pdf
PDFDIR = $(OUTPUTDIR)
-FODIR = $(OUTPUTDIR)
HTMLHELPDIR = $(OUTPUTDIR)/htmlhelp
PEARSONDIR = $(OUTPUTDIR)/pearson
TXTDIR = $(OUTPUTDIR)/textdocs
diff --git a/docs-xml/configure.ac b/docs-xml/configure.ac
index 65878d391b..221081d748 100644
--- a/docs-xml/configure.ac
+++ b/docs-xml/configure.ac
@@ -18,7 +18,6 @@ DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, HTML)
DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, HTMLHELP)
DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PEARSON)
DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PLUCKER)
-DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, FOPDF)
DOCS_TARGET_REQUIRE_PROGRAM(EPSTOPDF, epstopdf, PDF)
DOCS_TARGET_REQUIRE_PROGRAM(PNGTOPNM, pngtopnm, PS)
@@ -28,7 +27,6 @@ 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, VALIDATE)
-DOCS_TARGET_REQUIRE_PROGRAM(FOP, fop, FOPDF)
DOCS_TARGET_REQUIRE_PROGRAM(DB2TEXI, docbook2x-texi, TEXI)
DOCS_TARGET_REQUIRE_PROGRAM(MAKEINFO, makeinfo, TEXIINFO)
@@ -45,7 +43,6 @@ DOCS_DEFINE_TARGET(MANPAGES, ALL, [manpages], [manpages3])
DOCS_DEFINE_TARGET(PEARSON, ALL, [pearson-compatible XML], [pearson])
DOCS_DEFINE_TARGET(PLUCKER, HTML, [plucker versions], [plucker])
DOCS_DEFINE_TARGET(VALIDATE, ALL, [validating docbook output], [])
-DOCS_DEFINE_TARGET(FOPDF, ALL, [PDF versions thru FO], [fo-pdf])
DOCS_DEFINE_TARGET(TEXI, ALL, [TexInfo versions], [texi])
DOCS_DEFINE_TARGET(TEXIINFO, ALL, [TexInfo Info versions], [texiinfo])
DOCS_DEFINE_TARGET(UNDOCUMENTED, MANPAGES, [list of undocumented options], [undocumented])
diff --git a/docs-xml/scripts/find_missing_manpages.pl b/docs-xml/scripts/find_missing_manpages.pl
index 90d9f6abe8..612930e42d 100755
--- a/docs-xml/scripts/find_missing_manpages.pl
+++ b/docs-xml/scripts/find_missing_manpages.pl
@@ -26,7 +26,6 @@ foreach(split(/bin\//, $progs)) {
s/\@EXEEXT\@//g;
s/ //g;
-
$f = $_;
$found = 0;
diff --git a/docs-xml/xslt/fo.xsl b/docs-xml/xslt/fo.xsl
deleted file mode 100644
index f095f5df8f..0000000000
--- a/docs-xml/xslt/fo.xsl
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0'?>
-<!-- vim:set sts=2 shiftwidth=2 syntax=xml: -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version='1.0'>
-
-<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"/>
-
-</xsl:stylesheet>