Merge branch 'master' of ssh://vo20.nl/home/git/repos/uva

Conflicts:
	simmod/ass1/Makefile
	simmod/ass1/sum.c

simmod/ass1/.gitignore

@@ -6,3 +6,4 @@ speed
 fp
 float_double
 report.pdf
+fd*

simmod/ass1/Makefile

+CC=gcc
 FLAGS=-Wall -Wextra -std=c99 -pedantic -O0 -lm
 SPEED_TYPES=float double LD
 SUM_TYPES=float double
@@ -13,14 +14,14 @@ speed: speed.c
 	for t in $(SPEED_TYPES); do \
 		for o in $(OPS); do \
 			sed "s#{TYPE}#$$t#" $^ | sed "s#{OP}#$$o#" > speed.$$t.$$o.c; \
-			gcc $(FLAGS) -o speed.$$t.$$o speed.$$t.$$o.c; \
+			$(CC) $(FLAGS) -o speed.$$t.$$o speed.$$t.$$o.c; \
 			rm speed.$$t.$$o.c; \
 		done; \
 	done;
 	touch $@
 
 fp: floating_point.o
-	gcc $(FLAGS) -o $@ $^
+	$(CC) $(FLAGS) -o $@ $^
 
 sum: sum.c
 	for t in $(SUM_TYPES); do \
@@ -31,10 +32,11 @@ sum: sum.c
 	touch $@
 
 %.o: %.c
-	gcc $(FLAGS) -o $@ -c $^
+	$(CC) $(FLAGS) -o $@ -c $^
 
 %.s: %.c
-	gcc $(FLAGS) -o $* $^
+	$(CC) $(FLAGS) -o $* $^
 
 clean:
-	rm -vf *.o *.i *.s fp speed speed.*.* floating_point sum sum.float sum.double
+	rm -vf *.o *.i *.s fp fd* speed speed.*.* floating_point \
+		report.pdf *.aux *.log *.toc sum sum.float sum.double