|
 |
ce4fefe |
commit 64438c454655df9ec0b57cfee755005957562d1e
|
|
|
ce4fefe |
Author: František Dvořák <valtri@civ.zcu.cz>
|
|
|
ce4fefe |
Date: Sat Nov 7 20:48:06 2015 +0100
|
|
|
ce4fefe |
|
|
|
ce4fefe |
Use the library in all tools and tests.
|
|
|
ce4fefe |
|
|
|
ce4fefe |
diff --git a/test/Makefile b/test/Makefile
|
|
|
ce4fefe |
index c204511..367db9f 100644
|
|
|
ce4fefe |
--- a/test/Makefile
|
|
|
ce4fefe |
+++ b/test/Makefile
|
|
|
ce4fefe |
@@ -55,9 +55,11 @@ else
|
|
|
ce4fefe |
FFTWLIB=-lfftw3
|
|
|
ce4fefe |
endif
|
|
|
ce4fefe |
|
|
|
ce4fefe |
-FFTWLIBDIR=-L/usr/local/lib/
|
|
|
ce4fefe |
+FFTWLIBDIR=
|
|
|
ce4fefe |
+KISSFFT_LIBS=-L../build$(SUFFIX) -lkiss_fft$(SUFFIX) -lkiss_fftnd$(SUFFIX) -lkiss_fftr$(SUFFIX) -lkiss_fftndr$(SUFFIX)
|
|
|
ce4fefe |
|
|
|
ce4fefe |
-SRCFILES=../kiss_fft.c ../tools/kiss_fftnd.c ../tools/kiss_fftr.c pstats.c ../tools/kfc.c ../tools/kiss_fftndr.c
|
|
|
ce4fefe |
+
|
|
|
ce4fefe |
+SRCFILES=pstats.c ../tools/kfc.c
|
|
|
ce4fefe |
|
|
|
ce4fefe |
all: tools $(BENCHKISS) $(SELFTEST) $(BENCHFFTW) $(TESTREAL) $(TESTKFC)
|
|
|
ce4fefe |
|
|
|
ce4fefe |
@@ -66,16 +68,16 @@ tools:
|
|
|
ce4fefe |
|
|
|
ce4fefe |
|
|
|
ce4fefe |
$(SELFTEST): $(SELFTESTSRC) $(SRCFILES)
|
|
|
ce4fefe |
- $(CC) -o $@ $(CFLAGS) $(TYPEFLAGS) $+ -lm
|
|
|
ce4fefe |
+ $(CC) -o $@ $(CFLAGS) $(TYPEFLAGS) $+ -lm $(KISSFFT_LIBS)
|
|
|
ce4fefe |
|
|
|
ce4fefe |
$(TESTKFC): $(SRCFILES)
|
|
|
ce4fefe |
- $(CC) -o $@ $(CFLAGS) -DKFC_TEST $(TYPEFLAGS) $+ -lm
|
|
|
ce4fefe |
+ $(CC) -o $@ $(CFLAGS) -DKFC_TEST $(TYPEFLAGS) $+ -lm $(KISSFFT_LIBS)
|
|
|
ce4fefe |
|
|
|
ce4fefe |
$(TESTREAL): test_real.c $(SRCFILES)
|
|
|
ce4fefe |
- $(CC) -o $@ $(CFLAGS) $(TYPEFLAGS) $+ -lm
|
|
|
ce4fefe |
+ $(CC) -o $@ $(CFLAGS) $(TYPEFLAGS) $+ -lm $(KISSFFT_LIBS)
|
|
|
ce4fefe |
|
|
|
ce4fefe |
$(BENCHKISS): benchkiss.c $(SRCFILES)
|
|
|
ce4fefe |
- $(CC) -o $@ $(CFLAGS) $(TYPEFLAGS) $+ -lm
|
|
|
ce4fefe |
+ $(CC) -o $@ $(CFLAGS) $(TYPEFLAGS) $+ -lm $(KISSFFT_LIBS)
|
|
|
ce4fefe |
|
|
|
ce4fefe |
$(BENCHFFTW): benchfftw.c pstats.c
|
|
|
ce4fefe |
@echo "======attempting to build FFTW benchmark"
|
|
|
ce4fefe |
diff --git a/tools/Makefile b/tools/Makefile
|
|
|
ce4fefe |
index ae7646b..963109d 100644
|
|
|
ce4fefe |
--- a/tools/Makefile
|
|
|
ce4fefe |
+++ b/tools/Makefile
|
|
|
ce4fefe |
@@ -27,6 +27,7 @@ ifneq ("$(KISS_FFT_USE_ALLOCA)","")
|
|
|
ce4fefe |
endif
|
|
|
ce4fefe |
CFLAGS+= $(CFLAGADD)
|
|
|
ce4fefe |
|
|
|
ce4fefe |
+KISSFFT_LIBS=-L../build$(SUFFIX)
|
|
|
ce4fefe |
|
|
|
ce4fefe |
FFTUTIL=fft_$(DATATYPE)
|
|
|
ce4fefe |
FASTFILT=fastconv_$(DATATYPE)
|
|
|
ce4fefe |
@@ -43,20 +44,20 @@ all: $(FFTUTIL) $(FASTFILT) $(FASTFILTREAL)
|
|
|
ce4fefe |
CFLAGS=-Wall -O3 $(WARNINGS)
|
|
|
ce4fefe |
# tip: try -openmp or -fopenmp to use multiple cores
|
|
|
ce4fefe |
|
|
|
ce4fefe |
-$(FASTFILTREAL): ../kiss_fft.c kiss_fastfir.c kiss_fftr.c
|
|
|
ce4fefe |
- $(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -DREAL_FASTFIR $+ -DFAST_FILT_UTIL -lm
|
|
|
ce4fefe |
+$(FASTFILTREAL): kiss_fastfir.c
|
|
|
ce4fefe |
+ $(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -DREAL_FASTFIR $+ -DFAST_FILT_UTIL -lm $(KISSFFT_LIBS) -lkiss_fftr$(SUFFIX) -lkiss_fft$(SUFFIX)
|
|
|
ce4fefe |
|
|
|
ce4fefe |
-$(FASTFILT): ../kiss_fft.c kiss_fastfir.c
|
|
|
ce4fefe |
- $(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) $+ -DFAST_FILT_UTIL -lm
|
|
|
ce4fefe |
+$(FASTFILT): kiss_fastfir.c
|
|
|
ce4fefe |
+ $(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) $+ -DFAST_FILT_UTIL -lm $(KISSFFT_LIBS) -lkiss_fft$(SUFFIX)
|
|
|
ce4fefe |
|
|
|
ce4fefe |
-$(FFTUTIL): ../kiss_fft.c fftutil.c kiss_fftnd.c kiss_fftr.c kiss_fftndr.c
|
|
|
ce4fefe |
- $(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) $+ -lm
|
|
|
ce4fefe |
+$(FFTUTIL): fftutil.c
|
|
|
ce4fefe |
+ $(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) $+ -lm $(KISSFFT_LIBS) -lkiss_fftnd$(SUFFIX) -lkiss_fftr$(SUFFIX) -lkiss_fftndr$(SUFFIX) -lkiss_fft$(SUFFIX)
|
|
|
ce4fefe |
|
|
|
ce4fefe |
-$(PSDPNG): ../kiss_fft.c psdpng.c kiss_fftr.c
|
|
|
ce4fefe |
- $(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) $+ -lpng -lm
|
|
|
ce4fefe |
+$(PSDPNG): psdpng.c
|
|
|
ce4fefe |
+ $(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) $+ -lpng -lm $(KISSFFT_LIBS) -lkiss_fftr$(SUFFIX) -lkiss_fft$(SUFFIX)
|
|
|
ce4fefe |
|
|
|
ce4fefe |
-$(DUMPHDR): ../kiss_fft.c dumphdr.c
|
|
|
ce4fefe |
- $(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) $+ -lm
|
|
|
ce4fefe |
+$(DUMPHDR): dumphdr.c
|
|
|
ce4fefe |
+ $(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) $+ -lm $(KISSFFT_LIBS) -lkiss_fft$(SUFFIX)
|
|
|
ce4fefe |
|
|
|
ce4fefe |
clean:
|
|
|
ce4fefe |
rm -f *~ fft fft_* fastconv fastconv_* fastconvr fastconvr_* psdpng psdpng_*
|