Commit e8ff342904348e55b35b8e1b44f44dc090086baf
2019-05-07T11:55:43
cleanup make output
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99
diff --git a/etc/makefile b/etc/makefile
index 04a97fa..ce9cf06 100644
--- a/etc/makefile
+++ b/etc/makefile
@@ -12,15 +12,13 @@ pprime: pprime.o
# portable [well requires clock()] tuning app
tune: tune.o
- # The actual benchmark program
$(CC) $(CFLAGS) tune.o $(LIBNAME) -o tune
- # a small script to run it
- /bin/sh tune_it.sh
+ ./tune_it.sh
test_standalone: tune.o
# The benchmark program works as a testtool, too
$(CC) $(CFLAGS) tune.o $(LIBNAME) -o test
-
+
# spits out mersenne primes
mersenne: mersenne.o
$(CC) $(CFLAGS) mersenne.o $(LIBNAME) -o mersenne
@@ -28,7 +26,7 @@ mersenne: mersenne.o
# finds DR safe primes for the given config
drprime: drprime.o
$(CC) $(CFLAGS) drprime.o $(LIBNAME) -o drprime
-
+
# finds 2k safe primes for the given config
2kprime: 2kprime.o
$(CC) $(CFLAGS) 2kprime.o $(LIBNAME) -o 2kprime
@@ -36,7 +34,7 @@ drprime: drprime.o
mont: mont.o
$(CC) $(CFLAGS) mont.o $(LIBNAME) -o mont
-
+
clean:
rm -f *.log *.o *.obj *.exe pprime tune mersenne drprime mont 2kprime pprime.dat \
tuning_list multiplying squaring test *.da *.dyn *.dpi *~
diff --git a/etc/makefile.icc b/etc/makefile.icc
index fc1512f..9217f7b 100644
--- a/etc/makefile.icc
+++ b/etc/makefile.icc
@@ -8,7 +8,7 @@ CFLAGS += -I../
# -ax? specifies make code specifically for ? but compatible with IA-32
# -x? specifies compile solely for ? [not specifically IA-32 compatible]
#
-# where ? is
+# where ? is
# K - PIII
# W - first P4 [Williamette]
# N - P4 Northwood
@@ -29,16 +29,14 @@ pprime: pprime.o
$(CC) pprime.o $(LIBNAME) -o pprime
tune: tune.o
- # The actual benchmark program
$(CC) $(CFLAGS) tune.o $(LIBNAME) -o tune
- # a small script to run it
- /bin/sh tune_it.sh
-
+ ./tune_it.sh
+
# same app but using RDTSC for higher precision [requires 80586+], coff based gcc installs [e.g. ming, cygwin, djgpp]
tune86: tune.c
nasm -f coff timer.asm
$(CC) -DX86_TIMER $(CFLAGS) tune.c timer.o $(LIBNAME) -o tune86
-
+
# for cygwin
tune86c: tune.c
nasm -f gnuwin32 timer.asm
@@ -48,7 +46,7 @@ tune86c: tune.c
tune86l: tune.c
nasm -f elf -DUSE_ELF timer.asm
$(CC) -DX86_TIMER $(CFLAGS) tune.c timer.o $(LIBNAME) -o tune86l
-
+
# spits out mersenne primes
mersenne: mersenne.o
$(CC) mersenne.o $(LIBNAME) -o mersenne
@@ -56,7 +54,7 @@ mersenne: mersenne.o
# fines DR safe primes for the given config
drprime: drprime.o
$(CC) drprime.o $(LIBNAME) -o drprime
-
+
# fines 2k safe primes for the given config
2kprime: 2kprime.o
$(CC) 2kprime.o $(LIBNAME) -o 2kprime
@@ -64,6 +62,6 @@ drprime: drprime.o
mont: mont.o
$(CC) mont.o $(LIBNAME) -o mont
-
+
clean:
rm -f *.log *.o *.obj *.exe pprime tune mersenne drprime tune86 tune86l mont 2kprime pprime.dat *.il tuning_list