X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=doc%2Fmanual%2FMakefile;h=83dfb17c5074ba5b5c4311b542991631ae2faafe;hb=7fc0f6e56c25f01b3bc42f8b5f8d3cf5935bb875;hp=55d888b2e3ba2d66f06e21cec0572cd359794aad;hpb=2d24bc7aaed800415bce4fffe06f261d5e9e464a;p=dcpomatic.git

diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index 55d888b2e..83dfb17c5 100644
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -3,30 +3,24 @@
 all:	html pdf
 
 DIAGRAMS := file-structure.svg 3d-left-right.svg 3d-top-bottom.svg timecode.svg pipeline1.svg pipeline2.svg \
-            pipeline3.svg pipeline4.svg
+            pipeline3.svg pipeline4.svg burn-in.svg discrete.svg dcp-copy.svg dcp-refer.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-advanced.png prefs-defaults.png prefs-servers.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 \
                audio-plot.png audio-map-eg1.png audio-map-eg2.png audio-map-eg3.png kdm.png
 
 XML := dcpomatic.xml
 
-GRAPHICS := 
-
 #
-# For the HTML, default to copying the screenshots direct
+# For the HTML: copy screenshots into html/screenshots, scaling some.
 #
 html/screenshots/%.png: screenshots/%.png
 	mkdir -p html/screenshots
 	cp $< $@
-
-#
-# Some need resizing...
-#
 html/screenshots/editor.png: screenshots/editor.png
 	mkdir -p html/screenshots
 	convert -resize 50% $< $@
@@ -58,14 +52,6 @@ html/screenshots/making-dcp.png: screenshots/making-dcp.png
 	mkdir -p html/screenshots
 	convert -resize 75% $< $@
 
-# For HTML: convert graphics from SVG to PNG
-graphics/%.png:	graphics/%.svg
-	inkscape -z -f $< --export-png $@ --export-area-drawing
-
-# For LaTeX/PDF: convert graphics from SVG to PDF
-graphics/%.pdf:	graphics/%.svg
-	inkscape -z -f $< --export-pdf $@ --export-area-drawing
-
 # For HTML: convert diagrams from SVG to PNG
 diagrams/%.png:	diagrams/%.svg
 	inkscape -z -f $< --export-png $@ --export-area-drawing
@@ -81,7 +67,6 @@ diagrams/%.pdf:	diagrams/%.svg
 html:	$(XML) dcpomatic-html.xsl extensions-html.ent dcpomatic.css \
 	$(addprefix html/screenshots/,$(SCREENSHOTS)) \
 	$(subst .svg,.png,$(addprefix diagrams/,$(DIAGRAMS))) \
-	$(subst .svg,.png,$(addprefix graphics/,$(GRAPHICS))) \
 
 # 	The DocBook needs to know what file extensions to look for
 # 	for screenshots and diagrams; use the correct file to tell it.
@@ -92,16 +77,16 @@ html:	$(XML) dcpomatic-html.xsl extensions-html.ent dcpomatic.css \
 
 #	Copy graphics and CSS in
 	mkdir -p html/diagrams
-#       mkdir -p html/graphics
 	cp diagrams/*.png html/diagrams
-#	cp graphics/*.png html/graphics
 	cp dcpomatic.css html
 
 #
 # PDF
 #
 
-pdf:	$(XML) dcpomatic-pdf.xsl extensions-pdf.ent screenshots/*.png $(subst .svg,.pdf,$(addprefix diagrams/,$(DIAGRAMS)))
+pdf:	$(XML) dcpomatic-pdf.xsl extensions-pdf.ent \
+	$(addprefix screenshots/,$(SCREENSHOTS)) \
+	$(subst .svg,.pdf,$(addprefix diagrams/,$(DIAGRAMS)))
 
 # 	The DocBook needs to know what file extensions to look for
 # 	for screenshots and diagrams; use the correct file to tell it.