From 26f138d5d6f63f580e5a76cc04b5e668cfc73cbe Mon Sep 17 00:00:00 2001
From: Jan Klemkow <j.klemkow@wemelug.de>
Date: Mon, 7 Jan 2013 09:31:22 +0100
Subject: wip

---
 Makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 0829762..e47ddfe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 DBLATEX_OPTS="-P latex.encoding=utf8 -P latex.output.revhistory=0 -P doc.publisher.show=0"
 IMAGES!=ls image/*.dia
-GenSVG=${IMAGES:s/.dia/.svg/}
+GenSVG=${IMAGES:S/.dia$/.svg/}
 
 .PHONY: all clean up
-all: document.html presentation.html
+all: ${GenSVG} document.html presentation.html
 
 .SUFFIXES: .asciidoc .html
 presentation.html: presentation.asciidoc
@@ -13,19 +13,19 @@ presentation.html: presentation.asciidoc
 	asciidoc --out-file=$@ --backend=html $<
 
 .SUFFIXES: .asciidoc .tex
-.tex.asciidoc:
+.asciidoc.tex:
 	asciidoc --backend=latex $<
 
 .SUFFIXES: .asciidoc .pdf
-.pdf.asciidoc:
+.asciidoc.pdf:
 	a2x -f pdf --dblatex-opts=$(DBLATEX_OPTS) $<
 
 .SUFFIXES: .dia .svg
-image/%.svg: image/%.dia
-	dia --export=$@ --filter=svg $<
+.dia.svg:
+	@dia --export=$@ --filter=svg $<
 
 up: document.html
-	scp $< klemkow.net:www
+	scp document.html presentation.html klemkow.net:www
 
 clean:
-	rm -f document.html
+	rm -f document.html presentation.html ${GenSVG}
-- 
cgit