-- Rename nbench0.{c,h} to cleanbench.{c,h}

-- Makefile now generates cleanbench


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

3 files changed, 11 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index ee47615..bb3cbc6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,3 @@
-default: nbench
-
 ICC=icc
 GCC=gcc
 GCCFLAGS=-O3 -march=k8 -msse3 -ftree-vectorize -funroll-loops -pipe -static
@@ -15,8 +13,8 @@ sysinfo.c: Makefile
 hardware.o: hardware.c hardware.h Makefile
 	$(GCC) $(GCCFLAGS) -c hardware.c
 
-nbench0.o: nbench0.h nbench0.c nmglobal.h hardware.h Makefile sysinfo.c sysinfoc.c
-	$(GCC) $(GCCFLAGS) -c nbench0.c
+cleanbench.o: cleanbench.h cleanbench.c nmglobal.h hardware.h Makefile sysinfo.c sysinfoc.c
+	$(GCC) $(GCCFLAGS) -c cleanbench.c
 
 emfloat.o: emfloat.h emfloat.c nmglobal.h Makefile
 	$(GCC) $(GCCFLAGS) -c emfloat.c
@@ -54,10 +52,10 @@ neural.o: neural.c
 linear.o: linear.c
 	$(GCC) $(GCCFLAGS) -c linear.c
 
-nbench: emfloat.o randnum.o nbench0.o numsort.o hardware.o stringsort.o bitfield.o fpemulation.o fourier.o assignment.o idea.o huffman.o neural.o linear.o
-	$(GCC) emfloat.o randnum.o nbench0.o numsort.o hardware.o stringsort.o bitfield.o fpemulation.o fourier.o assignment.o idea.o huffman.o neural.o linear.o -o nbench -lm
+default: emfloat.o randnum.o cleanbench.o numsort.o hardware.o stringsort.o bitfield.o fpemulation.o fourier.o assignment.o idea.o huffman.o neural.o linear.o
+	$(GCC) emfloat.o randnum.o cleanbench.o numsort.o hardware.o stringsort.o bitfield.o fpemulation.o fourier.o assignment.o idea.o huffman.o neural.o linear.o -o cleanbench -lm
 
 clean:
-	- /bin/rm -f *.o nbench sysinfo.c sysinfoc.c
+	- /bin/rm -f *.o cleanbench sysinfo.c sysinfoc.c
 
-remake: clean nbench
+remake: clean default
diff --git a/nbench0.c b/cleanbench.c
index dc50b29..7b8e118 100644
--- a/nbench0.c
+++ b/cleanbench.c
@@ -1,6 +1,6 @@
 
 /*
-** nbench0.c
+** cleanbench.c
 */
 
 /*******************************************
@@ -52,7 +52,7 @@
 #include <time.h>
 #include <math.h>
 #include "nmglobal.h"
-#include "nbench0.h"
+#include "cleanbench.h"
 #include "hardware.h"
 
 /*************
diff --git a/nbench0.h b/cleanbench.h
index 8858756..278de90 100644
--- a/nbench0.h
+++ b/cleanbench.h
@@ -1,6 +1,6 @@
 /*
-** nbench0.h
-** Header for nbench0.c
+** cleanbench.h
+** Header for cleanbench.c
 ** BYTEmark (tm)
 ** BYTE's Native Mode Benchmarks
 ** Rick Grehan, BYTE Magazine
@@ -28,7 +28,7 @@
 ** Following should be modified accordingly per each
 ** compilation.
 */
-char *sysname="You can enter your system description in nbench0.h";
+char *sysname="You can enter your system description in cleanbench.h";
 char *compilername="It then will be printed here after you recompile";
 char *compilerversion="Have a nice day";