From d836dc0362089a26fdbc7c8835beb0bb07fe6ac5 Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Mon, 4 Feb 2013 07:52:22 +0100 Subject: doc: File image path in pres and actually convert them from dia --- doc/Makefile | 7 +++++-- doc/presentation.txt | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 46040d1..356b902 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -4,6 +4,9 @@ all: images presentation.html documentation.html documentation.pdf IMAGES_PGM=$(wildcard ../src/img/*.pgm) IMAGES_PNG=$(IMAGES_PGM:.pgm=.png) +IMAGES_DIA=$(wildcard image/*.dia) +IMAGES_SVG=$(IMAGES_DIA:.dia=.svg) + .SUFFIXES: .dia .svg .dia.svg: dia --export=$@ --filter=svg $< @@ -20,9 +23,9 @@ presentation.html: presentation.txt .txt.html: asciidoc --backend html $< -images: image/film.svg $(IMAGES_PNG) +images: image/film.svg $(IMAGES_PNG) $(IMAGES_SVG) clean: - rm -f presentation.html documentation.html $(IMAGES_PNG) + rm -f presentation.html documentation.html $(IMAGES_PNG) $(IMAGES_SVG) include asciidoc-boilerplate/thesis.mk diff --git a/doc/presentation.txt b/doc/presentation.txt index 72a20c6..3afb47a 100644 --- a/doc/presentation.txt +++ b/doc/presentation.txt @@ -8,15 +8,15 @@ == overlap -image::overlap_problem.svg[] +image::image/overlap_problem.svg[] == overlap -image::overlap_tool.svg[] +image::image/overlap_tool.svg[] == Stuktur -image::stack.svg[width="100%"] +image::image/stack.svg[width="100%"] == Simple Video API -- cgit