Clean Makefile

git-svn-id: svn://mattst88.com/svn/cleanbench/trunk@63 0d43b9a7-5ab2-4d7b-af9d-f64450cef757

1 files changed, 26 insertions, 26 deletions

diff --git a/Makefile b/Makefile
index d29593a..44514f8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,62 +1,62 @@
-ICC=icc
-GCC=gcc
-GCCFLAGS=-O3 -march=k8 -msse3 -ftree-vectorize -funroll-loops -pipe -static -Wunused
-ICCFLAGS=-O2 -ip -xP -gcc -static
+CC=gcc
+CFLAGS=-O3 -march=k8 -msse3 -ftree-vectorize -funroll-loops -pipe -static -Wunused
+#CC=icc
+#CFLAGS=-O2 -ip -xP -gcc -static
 LINKFLAGS=
 
 OBJS=emfloat.o randnum.o hardware.o cleanbench.o numsort.o stringsort.o bitfield.o fpemulation.o fourier.o assignment.o idea.o huffman.o neural.o linear.o
 
 all: ${OBJS}
-	$(GCC) ${OBJS} -o cleanbench -lm
+	$(CC) ${OBJS} -o cleanbench -lm
 
 clean:
-	- /bin/rm -f *.o cleanbench sysinfo.c
+	/bin/rm -f *.o cleanbench sysinfo.c
 
 remake: clean all
 
 # Source files
 
-sysinfo.c: Makefile
-	./sysinfo.sh $(GCC) $(GCCFLAGS)
+sysinfo.c:
+	./sysinfo.sh $(CC) $(CFLAGS)
 
-hardware.o: hardware.c hardware.h Makefile
-	$(GCC) $(GCCFLAGS) -c hardware.c
+hardware.o: hardware.c
+	$(CC) $(CFLAGS) -c $<
 
-cleanbench.o: cleanbench.h cleanbench.c hardware.h Makefile sysinfo.c
-	$(GCC) $(GCCFLAGS) -c cleanbench.c
+cleanbench.o: cleanbench.c sysinfo.c
+	$(CC) $(CFLAGS) -c $<
 
-emfloat.o: emfloat.h emfloat.c Makefile
-	$(GCC) $(GCCFLAGS) -c emfloat.c
+emfloat.o: emfloat.c
+	$(CC) $(CFLAGS) -c $<
 
-randnum.o: randnum.c Makefile
-	$(GCC) $(GCCFLAGS) -c randnum.c
+randnum.o: randnum.c
+	$(CC) $(CFLAGS) -c $<
 
 numsort.o: numsort.c
-	$(GCC) $(GCCFLAGS) -c numsort.c
+	$(CC) $(CFLAGS) -c $<
 
 stringsort.o: stringsort.c
-	$(GCC) $(GCCFLAGS) -c stringsort.c
+	$(CC) $(CFLAGS) -c $<
 
 bitfield.o: bitfield.c
-	$(GCC) $(GCCFLAGS) -c bitfield.c
+	$(CC) $(CFLAGS) -c $<
 
 fpemulation.o: fpemulation.c
-	$(GCC) $(GCCFLAGS) -c fpemulation.c
+	$(CC) $(CFLAGS) -c $<
 
 fourier.o: fourier.c
-	$(GCC) $(GCCFLAGS) -c fourier.c
+	$(CC) $(CFLAGS) -c $<
 
 assignment.o: assignment.c
-	$(GCC) $(GCCFLAGS) -c assignment.c
+	$(CC) $(CFLAGS) -c $<
 
 idea.o: idea.c
-	$(GCC) $(GCCFLAGS) -c idea.c
+	$(CC) $(CFLAGS) -c $<
 
 huffman.o: huffman.c
-	$(GCC) $(GCCFLAGS) -c huffman.c
+	$(CC) $(CFLAGS) -c $<
 
 neural.o: neural.c
-	$(GCC) $(GCCFLAGS) -c neural.c
+	$(CC) $(CFLAGS) -c $<
 
 linear.o: linear.c
-	$(GCC) $(GCCFLAGS) -c linear.c
+	$(CC) $(CFLAGS) -c $<