Rev 943: Use dblatex in favour of db2latex. in
file:///home/jelmer/samba-docs/dblatex/
Jelmer Vernooij
jelmer at samba.org
Wed Mar 28 01:02:16 GMT 2007
At file:///home/jelmer/samba-docs/dblatex/
------------------------------------------------------------
revno: 943
revision-id: jelmer at samba.org-20070328002733-wdwg2930tlo8pzjt
parent: svn-v2:1085 at b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: dblatex
timestamp: Wed 2007-03-28 02:27:33 +0200
message:
Use dblatex in favour of db2latex.
modified:
Makefile svn-v2:343 at b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-Makefile
Makefile.settings.in svn-v2:343 at b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-Makefile.settings.in
configure.in svn-v2:3 at b188d75c-76d7-0310-bd5a-9f2eb9070937-trunk-configure.in
=== modified file 'Makefile'
--- a/Makefile 2006-12-27 01:30:39 +0000
+++ b/Makefile 2007-03-28 00:27:33 +0000
@@ -36,7 +36,7 @@
@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,dvi,ps,manpages3,txt,pearson,fo,htmlhelp - Build specific output format"
+ @echo " pdf,tex,ps,manpages3,txt,pearson,fo,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"
@@ -56,7 +56,6 @@
# Output format targets
pdf: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
-dvi: $(patsubst %,$(DVIDIR)/%.dvi,$(MAIN_DOCS))
ps: $(patsubst %,$(PSDIR)/%.ps,$(MAIN_DOCS))
txt: $(patsubst %,$(TXTDIR)/%.txt,$(MAIN_DOCS))
txt-chunks: $(addsuffix -txt-chunks,$(MAIN_DOCS))
@@ -122,23 +121,11 @@
@mkdir -p $(@D)
$(HTML2TEXT) -nobs -style pretty -o $@ $<
-# Tex files
-%.tex: %/index.xml xslt/latex.xsl
- @echo "Generating $@..."
- @mkdir -p $(@D)
- $(XSLTPROC) $(DB2LATEX_ARGS) --stringparam latex.imagebasedir "$*/" --xinclude --output $@ xslt/latex.xsl $<
-
latexfigures: $(LATEX_FIGURES)
-$(PDFDIR)/%.pdf: %.pdf
+$(PDFDIR)/%.pdf: $(DOCBOOKDIR)/%.xml
@mkdir -p $(@D)
- cp $< $@
-
-%.idx: %.tex latexfigures
- -$(PDFLATEX) $<
-
-%.ind: %.idx
- $(MAKEINDEX) $<
+ $(DBLATEX) --pdf $< -o $@
# Dependency files
%.d: $(DOCBOOKDIR)/%.xml xslt/generate-dependencies.xsl
@@ -176,20 +163,6 @@
endif
endif
-# Adobe PDF files
-%.pdf: %.tex %.ind latexfigures %-images-latex-png %-images-latex-pdf
- -$(PDFLATEX) $<
- $(THUMBPDF) --quiet $*.pdf
- -$(PDFLATEX) $<
-
-# DVI files
-$(DVIDIR)/%.dvi: %.dvi
- @mkdir -p $(@D)
- cp $< $@
-
-%.dvi: %.tex %.idx %-images-latex-eps
- -$(LATEX) $<
-
%.eps: %.dia
$(DIA) -t eps-builtin -e $@ $<
@@ -203,9 +176,9 @@
$(PNGTOPNM) $< | $(PNMTOPS) > $@
# PostScript files
-$(PSDIR)/%.ps: $(DVIDIR)/%.dvi
+$(PSDIR)/%.ps: $(DOCBOOKDIR)/%.xml
@mkdir -p $(@D)
- $(DVIPS) -o $@ $<
+ $(DBLATEX) --ps $< -o $@
# Fo
$(FODIR)/%.fo: $(DOCBOOKDIR)/%.xml
=== modified file 'Makefile.settings.in'
--- a/Makefile.settings.in 2005-06-13 14:56:25 +0000
+++ b/Makefile.settings.in 2007-03-28 00:27:33 +0000
@@ -1,10 +1,10 @@
# Programs
XSLTPROC = @XSLTPROC@
XMLLINT = @XMLLINT@
-DVIPS = @DVIPS@
PNGTOPNM = @PNGTOPNM@
EPSTOPNM = @EPSTOPNM@
PNMTOPNG = @PNMTOPNG@
+DBLATEX = @DBLATEX@
DIA = @DIA@
PNMTOPS = @PNMTOPS@
HTML2TEXT = @HTML2TEXT@
@@ -12,16 +12,9 @@
MAKEINFO = @MAKEINFO@
PLUCKERBUILD = @PLUCKERBUILD@
COPY_IMAGES = ./scripts/copy-images.sh
-THUMBPDF = @THUMBPDF@
-PDFLATEX = @PDFLATEX@ --file-line-error-style
-LATEX = @LATEX@ --file-line-error-style
FOP = @FOP@
RM = @RM@
PERL = @PERL@
-ifndef DEBUG_LATEX
-PDFLATEX += --interaction nonstopmode
-LATEX += --interaction nonstopmode
-endif
# Paths
OUTPUTDIR = output
@@ -30,7 +23,6 @@
SRCDIR = @SAMBASOURCEDIR@
EPSTOPDF = @EPSTOPDF@
MANPAGEDIR3 = manpages-3
-MAKEINDEX = @MAKEINDEX@
EXAMPLESDIR = $(OUTPUTDIR)/examples
SMBDOTCONFDOC = smbdotconf
DOCBOOKDIR = tmp
=== modified file 'configure.in'
--- a/configure.in 2006-12-27 01:24:41 +0000
+++ b/configure.in 2007-03-28 00:27:33 +0000
@@ -15,8 +15,8 @@
AC_SUBST(SAMBASOURCEDIR)
DOCS_TARGET_REQUIRE_PROGRAM(XSLTPROC, xsltproc, ALL)
+DOCS_TARGET_REQUIRE_PROGRAM(DBLATEX, dblatex, DBLATEX)
DOCS_TARGET_REQUIRE_PROGRAM(RM, rm, ALL)
-DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, LATEX)
DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PS)
DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PDF)
DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, HTML)
@@ -41,14 +41,10 @@
fi
fi
-DOCS_TARGET_REQUIRE_PROGRAM(MAKEINDEX, makeindex, LATEX)
-DOCS_TARGET_REQUIRE_PROGRAM(PDFLATEX, pdflatex, PDF)
DOCS_TARGET_REQUIRE_PROGRAM(EPSTOPDF, epstopdf, PDF)
DOCS_TARGET_REQUIRE_PROGRAM(THUMBPDF, thumbpdf, PDF)
DOCS_TARGET_REQUIRE_PROGRAM(PNGTOPNM, pngtopnm, PS)
DOCS_TARGET_REQUIRE_PROGRAM(PNMTOPS, pnmtops, PS)
-DOCS_TARGET_REQUIRE_PROGRAM(LATEX, latex, PS)
-DOCS_TARGET_REQUIRE_PROGRAM(DVIPS, dvips, PS)
DOCS_TARGET_REQUIRE_PROGRAM(PLUCKERBUILD, plucker-build, PLUCKER)
DOCS_TARGET_REQUIRE_PROGRAM(HTML2TEXT, html2text, TXT)
DOCS_TARGET_REQUIRE_PROGRAM(PERL, perl, UNDOCUMENTED)
@@ -63,9 +59,9 @@
AC_MSG_RESULT([--------------])
DOCS_DEFINE_TARGET(ALL, [], [base requirements], [])
-DOCS_DEFINE_TARGET(LATEX, ALL, [LaTeX versions], [tex])
-DOCS_DEFINE_TARGET(PDF, LATEX, [PDF versions], [pdf])
-DOCS_DEFINE_TARGET(PS, LATEX, [PostScript versions], [ps])
+DOCS_DEFINE_TARGET(DBLATEX, ALL, [Latex based], [])
+DOCS_DEFINE_TARGET(PDF, DBLATEX, [PDF versions], [pdf])
+DOCS_DEFINE_TARGET(PS, DBLATEX, [PostScript versions], [ps])
DOCS_DEFINE_TARGET(HTML, ALL, [HTML versions], [html])
DOCS_DEFINE_TARGET(HTMLHELP, ALL, [HTML Help versions], [htmlhelp])
DOCS_DEFINE_TARGET(HTMLMAN, ALL, [HTML versions of the manpages], [htmlman3])
More information about the samba-cvs
mailing list