X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=doc%2Fmanual%2FMakefile;h=049acd7dfdde011522fd010a86cc06e5cf5a0e91;hb=2aa988dc7c8790f6f4fa91eddb3292a8d67e99eb;hp=8cf5e6e75c792b295f6c73e63479c51560be2df3;hpb=9d82858f73679c9752e45ef632648e41d22ae864;p=dcpomatic.git

diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index 8cf5e6e75..049acd7df 100644
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -9,11 +9,11 @@ DIAGRAMS := file-structure.svg 3d-left-right.svg 3d-top-bottom.svg timecode.svg
 SCREENSHOTS := file-new.png video-new-film.png still-new-film.png video-select-content-file.png \
                still-select-content-file.png examine-thumbs.png examine-content.png timing-tab.png \
                calculate-audio-gain.png add-file.png dcp-tab.png colour-conversion.png \
-               prefs-kdm-email.png prefs-colour-conversions.png prefs-metadata.png prefs-general.png prefs-tms.png \
+               prefs-kdm-email.png prefs-general.png prefs-tms.png \
                prefs-advanced.png prefs-defaults.png prefs-servers.png prefs-keys.png \
-               making-dcp.png filters.png video-tab.png audio-tab.png subtitles-tab.png timing-tab.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
 
@@ -53,20 +53,26 @@ html/screenshots/export-dialogue.png: screenshots/export-dialogue.png
 html/screenshots/making-dcp.png: screenshots/making-dcp.png
 	mkdir -p html/screenshots
 	convert -resize 75% $< $@
+html/screenshots/kdm-creator.png: screenshots/kdm-creator.png
+	mkdir -p html/screenshots
+	convert -resize 75% $< $@
 
 # 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
 
 #
 # HTML
 #
 
-html:	$(XML) dcpomatic-html.xsl extensions-html.ent dcpomatic.css \
+html:	$(XML) config.xml dcpomatic-html.xsl extensions-html.ent dcpomatic.css dcpomatic_create.xml dcpomatic_cli.xml dcpomatic_kdm_cli.xml \
 	$(addprefix html/screenshots/,$(SCREENSHOTS)) \
 	$(subst .svg,.png,$(addprefix diagrams/,$(DIAGRAMS))) \
 
@@ -86,7 +92,7 @@ html:	$(XML) dcpomatic-html.xsl extensions-html.ent dcpomatic.css \
 # PDF
 #
 
-pdf:	$(XML) dcpomatic-pdf.xsl extensions-pdf.ent \
+pdf:	$(XML) config.xml dcpomatic-pdf.xsl extensions-pdf.ent dcpomatic_create.xml dcpomatic_cli.xml dcpomatic_kdm_cli.xml \
 	$(addprefix screenshots/,$(SCREENSHOTS)) \
 	$(subst .svg,.pdf,$(addprefix diagrams/,$(DIAGRAMS)))
 
@@ -103,7 +109,7 @@ pdf:	$(XML) dcpomatic-pdf.xsl extensions-pdf.ent \
 # LaTeX (handy for debugging)
 #
 
-tex:	$(XML) dcpomatic-pdf.xsl extensions-pdf.ent
+tex:	$(XML) config.xml dcpomatic-pdf.xsl extensions-pdf.ent
 
 # 	The DocBook needs to know what file extensions to look for
 # 	for screenshots and diagrams; use the correct file to tell it.