Merge branch 'master' of wien.tomnetworks.com:hwmod

diff --git a/.gitignore b/.gitignore
index ad19137fe648ad35ae17c530af235e99859d8fda..c26d91dac426640219c03f506aa28b7c313f193d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,8 @@ spec/*.toc
 spec/*.backup
 spec/*.out
 spec/*.pdf
+spec/*.png
 *.swp
 *~
 
-*.ppk
\ No newline at end of file
+*.ppk

diff --git a/spec/Architektur.png b/spec/Architektur.png
deleted file mode 100644 (file)
index 69a6c98..0000000
Binary files a/spec/Architektur.png and /dev/null differ

diff --git a/spec/Makefile b/spec/Makefile
index 709fc1dc88dd8c55dea4e94b01d7ee009047fc25..e79e671652b6a35ab6dc929509f86f2a86656920 100644 (file)
--- a/spec/Makefile
+++ b/spec/Makefile
@@ -1,8 +1,13 @@
 PROJECT = spec
 
-protocol:
-       @pdflatex $(PROJECT)
-       @pdflatex $(PROJECT)
+all: protocol
+
+protocol: $(subst .dia,.png,$(shell ls *.dia))
+       pdflatex $(PROJECT)
+       pdflatex $(PROJECT)
+
+%.png: %.dia
+       dia $< -e $@ -t png
 
 clean:
-       -rm -f *.aux *.log *.dvi *.toc *.out *.pdf
+       -rm -f *.aux *.log *.dvi *.toc *.out *.pdf *.png

diff --git a/spec/spec.tex b/spec/spec.tex
index 9b6bbf63d33d2da694e3ab2ad2858abee6a1cebb..68dd72281640d05b3b5afc4e08b8475787640f69 100644 (file)
--- a/spec/spec.tex
+++ b/spec/spec.tex
@@ -46,7 +46,7 @@ EXPRESSION = OPERAND \{ OPERATOR OPERAND \} ;
 
 \req{Dabei soll Punkt- vor Strichrechnung gelten}
 
-\req{Die Zahlen dürfen im Zahlenbereich eines signed long liegen ($-2^31$ bis $2^31-1$)}
+\req{Die Zahlen dürfen im Zahlenbereich eines signed long liegen ($-2^{31}$ bis $2^{31}-1$)}
 
 \req{Die Eingabe darf aus 70 Zeichen bestehen}