Update manual Makefile for Inkscape 1.0

[dcpomatic.git] / doc / manual / Makefile

diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index f7120493e365ad2511e1ead8a3125c0356740673..049acd7dfdde011522fd010a86cc06e5cf5a0e91 100644 (file)
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -13,7 +13,7 @@ SCREENSHOTS := file-new.png video-new-film.png still-new-film.png video-select-c
                prefs-advanced.png prefs-defaults.png prefs-servers.png prefs-keys.png \
                making-dcp.png filters.png video-tab.png audio-tab.png timing-tab.png \
                audio-plot.png audio-map-eg1.png audio-map-eg2.png audio-map-eg3.png kdm.png \
-              kdm-creator.png
+              kdm-creator.png export.png
 
 XML := dcpomatic.xml
 
@@ -59,27 +59,15 @@ html/screenshots/kdm-creator.png: screenshots/kdm-creator.png
 
 # For HTML: convert diagrams from SVG to PNG
 diagrams/%.png:        diagrams/%.svg
-       inkscape -z -f $< --export-png $@ --export-area-drawing
+       inkscape $< --export-type=png --export-filename=$@ --export-area-drawing
 
 # For LaTeX/PDF: convert diagrams from SVG to PDF
 diagrams/%.pdf:        diagrams/%.svg
-       inkscape -z -f $< --export-pdf $@ --export-area-drawing
+       inkscape $< --export-type=pdf --export-filename=$@ --export-area-drawing
 
 config.xml:    ../../src/lib/config.cc config.py
        python3 config.py ../../src/lib/config.cc > config.xml
 
-# These require the tools to be runnable, so make needs to be run
-# in a built tree to update them.  The .xml files are committed
-# to git to avoid this always being necessary.
-dcpomatic_create.xml:  ../../src/tools/dcpomatic_create.cc cli.py
-       python3 cli.py dcpomatic_create > dcpomatic_create.xml
-
-dcpomatic_cli.xml:     ../../src/tools/dcpomatic_cli.cc cli.py
-       python3 cli.py dcpomatic_cli > dcpomatic_cli.xml
-
-dcpomatic_kdm_cli.xml: ../../src/tools/dcpomatic_kdm_cli.cc cli.py
-       python3 cli.py dcpomatic_kdm_cli > dcpomatic_kdm_cli.xml
-
 #
 # HTML
 #