commit 64438c454655df9ec0b57cfee755005957562d1e
Author: František Dvořák <valtri@civ.zcu.cz>
Date:   Sat Nov 7 20:48:06 2015 +0100

    Use the library in all tools and tests.

diff --git a/test/Makefile b/test/Makefile
index c204511..367db9f 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -55,9 +55,11 @@ else
  FFTWLIB=-lfftw3
 endif
 
-FFTWLIBDIR=-L/usr/local/lib/
+FFTWLIBDIR=
+KISSFFT_LIBS=-L../build$(SUFFIX) -lkiss_fft$(SUFFIX) -lkiss_fftnd$(SUFFIX) -lkiss_fftr$(SUFFIX) -lkiss_fftndr$(SUFFIX)
 
-SRCFILES=../kiss_fft.c ../tools/kiss_fftnd.c ../tools/kiss_fftr.c pstats.c ../tools/kfc.c ../tools/kiss_fftndr.c
+
+SRCFILES=pstats.c ../tools/kfc.c
 
 all: tools $(BENCHKISS) $(SELFTEST) $(BENCHFFTW) $(TESTREAL) $(TESTKFC)
 
@@ -66,16 +68,16 @@ tools:
 
 
 $(SELFTEST): $(SELFTESTSRC) $(SRCFILES)
-	$(CC) -o $@ $(CFLAGS) $(TYPEFLAGS) $+ -lm 
+	$(CC) -o $@ $(CFLAGS) $(TYPEFLAGS) $+ -lm $(KISSFFT_LIBS)
 
 $(TESTKFC): $(SRCFILES) 
-	$(CC) -o $@ $(CFLAGS)  -DKFC_TEST $(TYPEFLAGS) $+ -lm
+	$(CC) -o $@ $(CFLAGS)  -DKFC_TEST $(TYPEFLAGS) $+ -lm $(KISSFFT_LIBS)
 	
 $(TESTREAL): test_real.c $(SRCFILES)
-	$(CC) -o $@ $(CFLAGS) $(TYPEFLAGS) $+ -lm
+	$(CC) -o $@ $(CFLAGS) $(TYPEFLAGS) $+ -lm $(KISSFFT_LIBS)
 
 $(BENCHKISS): benchkiss.c $(SRCFILES)
-	$(CC) -o $@ $(CFLAGS) $(TYPEFLAGS)  $+ -lm
+	$(CC) -o $@ $(CFLAGS) $(TYPEFLAGS)  $+ -lm $(KISSFFT_LIBS)
 
 $(BENCHFFTW): benchfftw.c pstats.c
 	@echo "======attempting to build FFTW benchmark"
diff --git a/tools/Makefile b/tools/Makefile
index ae7646b..963109d 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -27,6 +27,7 @@ ifneq ("$(KISS_FFT_USE_ALLOCA)","")
 endif 
 CFLAGS+= $(CFLAGADD)
 
+KISSFFT_LIBS=-L../build$(SUFFIX)
 
 FFTUTIL=fft_$(DATATYPE)
 FASTFILT=fastconv_$(DATATYPE)
@@ -43,20 +44,20 @@ all: $(FFTUTIL) $(FASTFILT) $(FASTFILTREAL)
 CFLAGS=-Wall -O3 $(WARNINGS) 
 # tip: try -openmp or -fopenmp to use multiple cores
 
-$(FASTFILTREAL): ../kiss_fft.c kiss_fastfir.c kiss_fftr.c
-	$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -DREAL_FASTFIR  $+ -DFAST_FILT_UTIL -lm 
+$(FASTFILTREAL): kiss_fastfir.c
+	$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) -DREAL_FASTFIR  $+ -DFAST_FILT_UTIL -lm $(KISSFFT_LIBS) -lkiss_fftr$(SUFFIX) -lkiss_fft$(SUFFIX)
 
-$(FASTFILT): ../kiss_fft.c kiss_fastfir.c
-	$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) $+  -DFAST_FILT_UTIL -lm
+$(FASTFILT): kiss_fastfir.c
+	$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) $+  -DFAST_FILT_UTIL -lm $(KISSFFT_LIBS) -lkiss_fft$(SUFFIX)
 
-$(FFTUTIL): ../kiss_fft.c fftutil.c kiss_fftnd.c kiss_fftr.c kiss_fftndr.c
-	$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) $+ -lm
+$(FFTUTIL): fftutil.c
+	$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) $+ -lm $(KISSFFT_LIBS) -lkiss_fftnd$(SUFFIX) -lkiss_fftr$(SUFFIX) -lkiss_fftndr$(SUFFIX) -lkiss_fft$(SUFFIX)
 
-$(PSDPNG): ../kiss_fft.c psdpng.c kiss_fftr.c
-	$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) $+ -lpng -lm
+$(PSDPNG): psdpng.c
+	$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) $+ -lpng -lm $(KISSFFT_LIBS) -lkiss_fftr$(SUFFIX) -lkiss_fft$(SUFFIX)
 
-$(DUMPHDR): ../kiss_fft.c dumphdr.c
-	$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) $+ -lm
+$(DUMPHDR): dumphdr.c
+	$(CC) -o $@ $(CFLAGS) -I.. $(TYPEFLAGS) $+ -lm $(KISSFFT_LIBS) -lkiss_fft$(SUFFIX)
 
 clean:
 	rm -f *~ fft fft_* fastconv fastconv_* fastconvr fastconvr_* psdpng psdpng_*