From: fabb <Administrator@WandTeppich.(none)>
Date: Fri, 19 Mar 2010 17:53:09 +0000 (+0100)
Subject: Merge branch 'master' of wien.tomnetworks.com:hwmod
X-Git-Tag: spec-abgabe1~43
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=hwmod.git;a=commitdiff_plain;h=a0523667e8b5981feb8832053a52e07477ccdf1f;hp=8ad73da1e5727d68e7df61486cc34aa6d5edb4a5

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

diff --git a/.gitignore b/.gitignore
index ad19137..c26d91d 100644
--- 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
index 69a6c98..0000000
Binary files a/spec/Architektur.png and /dev/null differ
diff --git a/spec/Makefile b/spec/Makefile
index 709fc1d..e79e671 100644
--- 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 9b6bbf6..68dd722 100644
--- 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}