From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 3 Jun 2020 00:14:38 +0000 (+1200)
Subject: docs-xml: Remove references to inkscape (not used any more, no more SVG files)
X-Git-Tag: ldb-2.2.0~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9392c3f81ca83e4eda382ebfc335099616fa1bff;p=thirdparty%2Fsamba.git

docs-xml: Remove references to inkscape (not used any more, no more SVG files)

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
---

diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 47a9a706f08..aaeb8863c61 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -51,10 +51,6 @@ clean::
 	@echo "Cleaning up..." 
 	rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
 	rm -f *-attributions.xml
-	rm -f $(patsubst %.svg,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
-			$(patsubst %.svg,%.pdf,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
-			$(patsubst %.svg,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
-			$(patsubst %.svg,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
 	rm -f *-attributions.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx *.aux
 	rm -f *-images-html*
 	rm -f *-images-latex-* $(LATEX_FIGURES)
@@ -141,10 +137,7 @@ $(TXTDIR)/%.txt: $(HTMLDIR)/%.html
 		--stringparam txtbasedir "$(TXTDIR)/$*/" \
 		--stringparam target "$*" \
 		-o $@ xslt/generate-dependencies.xsl $<
-	@echo "$*-images-latex-svg = \$$(wildcard \$$(addsuffix .svg, \$$($*-images-latex)))" >> $@
 	@echo "$*-images-latex-eps: \$$(addsuffix .eps, \$$($*-images-latex))" >> $@
-	@echo "$*-images-latex-pdf: \$$(patsubst %.svg, %.pdf, \$$($*-images-latex-svg))" >> $@
-	@echo "$*-images-latex-png: \$$(filter-out \$$(patsubst %.svg,%.png,\$$($*-images-latex-svg)), \$$(addsuffix .png, \$$($*-images-latex)))" >> $@
 
 	@echo >> $@
 	@echo "\$$(HTMLDIR)/%: $*/%" >> $@
@@ -177,18 +170,9 @@ $(PDFDIR)/%.pdf: %/index.xml $(PDFDIR) xslt/latex.xsl %-images-latex-png %-image
 $(PSDIR)/%.ps: %/index.xml $(PSDIR) xslt/latex.xsl %-images-latex-eps
 	$(DBLATEX) $(DBLATEX_OPTIONS) -I $*/images -t ps -o $@ $<
 
-%.eps: %.svg
-	$(INKSCAPE) -z -f $(abspath $<) --export-eps=$(abspath $@)
-
-%.png: %.svg
-	$(INKSCAPE) -z -f $(abspath $<) --export-png=$(abspath $@)
-
 %.eps: %.png
 	$(PNGTOPNM) $< | $(PNMTOPS) > $@
 
-%.pdf: %.svg
-	$(INKSCAPE) -z -f $(abspath $<) --export-pdf=$(abspath $@)
-
 $(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml %-images-htmlhelp $(XSLTPROC_DEPS)
 	$(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 69f4e60a3fc..77a40b10fc2 100644
--- a/docs-xml/Makefile.settings.in
+++ b/docs-xml/Makefile.settings.in
@@ -2,7 +2,6 @@
 XSLTPROC = @XSLTPROC@ --nonet
 XMLLINT = @XMLLINT@
 PNGTOPNM = @PNGTOPNM@
-INKSCAPE = @INKSCAPE@
 PNMTOPS = @PNMTOPS@
 HTML2TEXT = @HTML2TEXT@
 DB2TEXI = @DB2TEXI@
diff --git a/docs-xml/README b/docs-xml/README
index ae7e02e4b64..a1caae3d9b5 100644
--- a/docs-xml/README
+++ b/docs-xml/README
@@ -60,7 +60,6 @@ To generate the docs, you need to have the following packages installed:
  * GNU Make
  * GNU autoconf
  * xsltproc
- * inkscape
 
 For generating PDF and PostScript (thru LaTeX):
  * dblatex (from http://dblatex.sf.net/)
diff --git a/docs-xml/configure.ac b/docs-xml/configure.ac
index 908f56b6066..9ab85fdf2af 100644
--- a/docs-xml/configure.ac
+++ b/docs-xml/configure.ac
@@ -8,11 +8,6 @@ AC_SUBST(DOC_BUILD_DATE)
 
 DOCS_TARGET_REQUIRE_PROGRAM(XSLTPROC, xsltproc, ALL)
 DOCS_TARGET_REQUIRE_PROGRAM(RM, rm, ALL)
-DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, LATEX)
-DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PS)
-DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, PDF)
-DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, HTML)
-DOCS_TARGET_REQUIRE_PROGRAM(INKSCAPE, inkscape, HTMLHELP)
 
 DOCS_TARGET_REQUIRE_PROGRAM(PNGTOPNM, pngtopnm, PS)
 DOCS_TARGET_REQUIRE_PROGRAM(PNMTOPS, pnmtops, PS)