diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-05-01 18:32:21 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-05-01 22:49:11 +0200 |
| commit | e9bc179e0a72da995ca4ce22eddc50465fb68500 (patch) | |
| tree | 06920094e254b2738e3025b29153be97da6a4b9f | |
| parent | 2099d83226e0d2b29f4029f4fcfdadddeb069dda (diff) | |
| download | samba-e9bc179e0a72da995ca4ce22eddc50465fb68500.tar.gz samba-e9bc179e0a72da995ca4ce22eddc50465fb68500.tar.bz2 samba-e9bc179e0a72da995ca4ce22eddc50465fb68500.zip | |
Remove unnecessary checks for apps now used through dblatex.
| -rw-r--r-- | docs-xml/Makefile | 3 | ||||
| -rw-r--r-- | docs-xml/Makefile.settings.in | 2 | ||||
| -rw-r--r-- | docs-xml/configure.ac | 12 |
3 files changed, 1 insertions, 16 deletions
diff --git a/docs-xml/Makefile b/docs-xml/Makefile index 7469fbb591..318c00197e 100644 --- a/docs-xml/Makefile +++ b/docs-xml/Makefile @@ -9,7 +9,6 @@ include Makefile.settings # Docs to build MAIN_DOCS = $(patsubst %/index.xml,%,$(wildcard */index.xml)) MANPAGES3 = $(wildcard $(MANPAGEDIR3)/*.?.xml) -export TEXINPUTS=xslt/latex:.: # Lists of files to process MANPAGES_PLUCKER = $(patsubst $(MANPAGEDIR3)/%.xml,$(PLUCKERDIR)/%.pdb,$(MANPAGES3)) @@ -23,11 +22,9 @@ endif ifndef OUTPUTDIR Makefile.settings: configure - @echo Makefile.settings not present, trying to run configure... ./configure configure: configure.ac - @echo configure not present, trying to regenerate it... autoreconf endif diff --git a/docs-xml/Makefile.settings.in b/docs-xml/Makefile.settings.in index 8292c61e99..0bc4ab9bbf 100644 --- a/docs-xml/Makefile.settings.in +++ b/docs-xml/Makefile.settings.in @@ -1,7 +1,6 @@ # Programs XSLTPROC = @XSLTPROC@ XMLLINT = @XMLLINT@ -DVIPS = @DVIPS@ PNGTOPNM = @PNGTOPNM@ EPSTOPNM = @EPSTOPNM@ PNMTOPNG = @PNMTOPNG@ @@ -37,7 +36,6 @@ DOCBOOKDIR = tmp PSDIR = $(OUTPUTDIR) FOPDFDIR = $(OUTPUTDIR)/fo-pdf PDFDIR = $(OUTPUTDIR) -DVIDIR = $(OUTPUTDIR) FODIR = $(OUTPUTDIR) HTMLHELPDIR = $(OUTPUTDIR)/htmlhelp PEARSONDIR = $(OUTPUTDIR)/pearson diff --git a/docs-xml/configure.ac b/docs-xml/configure.ac index ef25de25d7..b4a061a1f5 100644 --- a/docs-xml/configure.ac +++ b/docs-xml/configure.ac @@ -11,9 +11,6 @@ AC_SUBST(DOC_BUILD_DATE) DOCS_TARGET_REQUIRE_PROGRAM(XSLTPROC, xsltproc, ALL) DOCS_TARGET_REQUIRE_PROGRAM(RM, rm, ALL) -dnl DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, LATEX) -dnl DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PS) -dnl DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PDF) dnl DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, HTML) dnl DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, HTMLHELP) dnl DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, PEARSON) @@ -43,14 +40,9 @@ DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, FOPDF) # 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(DBLATEX, dblatex, LATEX) DOCS_TARGET_REQUIRE_PROGRAM(PLUCKERBUILD, plucker-build, PLUCKER) DOCS_TARGET_REQUIRE_PROGRAM(HTML2TEXT, html2text, TXT) @@ -65,9 +57,7 @@ AC_MSG_RESULT([Summary:]) 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(LATEX, ALL, [LaTeX versions], [tex ps pdf]) 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]) |