From 6c8049cc7599952f9e0ae73534c0375cae5910fc Mon Sep 17 00:00:00 2001
From: Mark Borgerding <mark@borgerding.net>
Date: Tue, 4 Nov 2003 01:01:37 +0000
Subject: [PATCH] slight changes to Makefile

---
 test/Makefile  | 25 +++++++++++++++----------
 tools/Makefile | 25 +++++++++++++++----------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index 200735b..aeb30ee 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -27,30 +27,35 @@ $(BENCH): benchkiss.c ../kiss_fft.c
 	gcc -o $@ $(CFLAGS) -I.. benchkiss.c $(TYPEFLAGS) ../kiss_fft.c -lm 
 
 fftw: bm_fftw
-	./bm_fftw -x $(NUMFFTS) -n $(NFFT)
+	@[ -x ./bm_fftw ] && \
+		./bm_fftw -x $(NUMFFTS) -n $(NFFT)
+
 bm_fftw: benchfftw.c
-	gcc -o $@ $(CFLAGS) benchfftw.c -lm -lfftw3 -L /usr/local/lib/
+	@gcc -o $@ $(CFLAGS) benchfftw.c -lm -lfftw3 -L /usr/local/lib/ \
+	 || echo 'Cannot build FFTW test script'
 
 time: all
-	./$(BENCH) -x $(NUMFFTS) -n $(NFFT) 
+	@./$(BENCH) -x $(NUMFFTS) -n $(NFFT) 
 
 POW2=256 512 1024 2048
 POW3=243 729 2187
-POW5=25 125 625
+POW5=25 125 625 3125
 
-mtime: all
-	@for n in $(POW2) $(POW3) $(POW5) ;do \
+mtime: all bm_fftw
+	@for n in $(NFFT) $(POW2) $(POW3) $(POW5) ;do \
 		./$(BENCH) -x $(NUMFFTS) -n $$n;\
+		[ -x ./bm_fftw ] && ./bm_fftw -x $(NUMFFTS) -n $$n ; \
 	done
 
 snr: all
-	@which octave
-	@echo
-	@echo "### testing SNR for $(NFFT) point FFTs"
-	@echo "#### $(DATATYPE)"
+	@echo "### testing SNR for $(NFFT) point $(DATATYPE) FFTs"
 	@echo "testkiss( $(NFFT) , '$(DATATYPE)' );" | octave -q
 
+ifeq "$(DATATYPE)" "double"
+test: snr time fftw
+else
 test: snr time 
+endif
 
 clean:
 	rm -f *~ fftutil_* bm_*
diff --git a/tools/Makefile b/tools/Makefile
index 200735b..aeb30ee 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -27,30 +27,35 @@ $(BENCH): benchkiss.c ../kiss_fft.c
 	gcc -o $@ $(CFLAGS) -I.. benchkiss.c $(TYPEFLAGS) ../kiss_fft.c -lm 
 
 fftw: bm_fftw
-	./bm_fftw -x $(NUMFFTS) -n $(NFFT)
+	@[ -x ./bm_fftw ] && \
+		./bm_fftw -x $(NUMFFTS) -n $(NFFT)
+
 bm_fftw: benchfftw.c
-	gcc -o $@ $(CFLAGS) benchfftw.c -lm -lfftw3 -L /usr/local/lib/
+	@gcc -o $@ $(CFLAGS) benchfftw.c -lm -lfftw3 -L /usr/local/lib/ \
+	 || echo 'Cannot build FFTW test script'
 
 time: all
-	./$(BENCH) -x $(NUMFFTS) -n $(NFFT) 
+	@./$(BENCH) -x $(NUMFFTS) -n $(NFFT) 
 
 POW2=256 512 1024 2048
 POW3=243 729 2187
-POW5=25 125 625
+POW5=25 125 625 3125
 
-mtime: all
-	@for n in $(POW2) $(POW3) $(POW5) ;do \
+mtime: all bm_fftw
+	@for n in $(NFFT) $(POW2) $(POW3) $(POW5) ;do \
 		./$(BENCH) -x $(NUMFFTS) -n $$n;\
+		[ -x ./bm_fftw ] && ./bm_fftw -x $(NUMFFTS) -n $$n ; \
 	done
 
 snr: all
-	@which octave
-	@echo
-	@echo "### testing SNR for $(NFFT) point FFTs"
-	@echo "#### $(DATATYPE)"
+	@echo "### testing SNR for $(NFFT) point $(DATATYPE) FFTs"
 	@echo "testkiss( $(NFFT) , '$(DATATYPE)' );" | octave -q
 
+ifeq "$(DATATYPE)" "double"
+test: snr time fftw
+else
 test: snr time 
+endif
 
 clean:
 	rm -f *~ fftutil_* bm_*