--- a/Makefile	Thu May 08 15:44:04 2014 +0200
+++ b/Makefile	Fri May 09 10:38:05 2014 +0200
@@ -1,23 +1,23 @@
-IMAGES = procs.pdf routing.pdf
+
 ALL = mk2014.pdf
+
+DIA = $(wildcard dia/*.dia)
 TT = $(wildcard *.tt)
 CONF = $(wildcard *.conf)
+FRAMES = $(wildcard frames/*tex)
+IMAGES = $(notdir $(DIA:.dia=.pdf))
+
 .PHONY: clean
 
 all:		$(ALL)
 clean:
 	rubber -d --clean mk2014.tex
-	-rm -f *.vrb $(IMAGES)
+	-rm -f *.vrb $(PDF)
 
-mk2014.pdf:	mk2014.tex $(IMAGES) $(TT) $(CONF)
+mk2014.pdf:	mk2014.tex $(IMAGES) $(FRAMES) $(TT) $(CONF)
 
 %.pdf:	%.tex
 	rubber -f -d $<
 
-%.pdf:	%.dia
+%.pdf:	dia/%.dia
 	dia --export $@ $<
-
-#procs-%.pdf:	procs.dia
-#	for p in 0 1 2 3; do \
-#		dia --export procs-$$p.pdf --show-layers $$p $<; \
-#	done