changeset 134:7b48d7ae41e4

Add test objects to clean, etc
author Chris Cannam <c.cannam@qmul.ac.uk>
date Mon, 19 May 2014 12:50:26 +0100
parents 16822c41b9af
children cb0f0e317a33
files Makefile.inc
diffstat 1 files changed, 20 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.inc	Mon May 19 12:47:45 2014 +0100
+++ b/Makefile.inc	Mon May 19 12:50:26 2014 +0100
@@ -83,6 +83,7 @@
 OBJECTS	     := $(SOURCES:.cpp=.o)
 OBJECTS	     := $(OBJECTS:.c=.o)
 
+TEST_OBJECTS	:= $(TEST_SOURCES:.cpp=.o)
 TEST_TARGETS	:= $(TEST_SOURCES:.cpp=)
 
 PF_SOURCES := $(TEST_DIR)/processfile.cpp
@@ -110,7 +111,7 @@
 	rm -f $(OBJECTS) $(TEST_OBJECTS) $(PF_OBJECTS)
 
 distclean:	clean
-	rm -f $(PLUGIN)
+	rm -f $(PLUGIN) $(TEST_TARGETS)
 
 depend:
 	makedepend -Y -fMakefile.inc $(SOURCES) $(TEST_SOURCES) $(PF_SOURCES) $(HEADERS)
@@ -137,16 +138,26 @@
 src/ext/kissfft/tools/kiss_fftr.o: src/ext/kissfft/kiss_fft.h
 src/ext/kissfft/tools/kiss_fftr.o: src/ext/kissfft/_kiss_fft_guts.h
 vamp/CQVamp.o: vamp/CQVamp.h cq/CQSpectrogram.h cq/ConstantQ.h cq/CQBase.h
-vamp/CQVamp.o: cq/CQKernel.h vamp/Pitch.h
+vamp/CQVamp.o: cq/CQParameters.h cq/CQKernel.h vamp/Pitch.h
 vamp/CQChromaVamp.o: vamp/CQChromaVamp.h cq/CQSpectrogram.h cq/ConstantQ.h
-vamp/CQChromaVamp.o: cq/CQBase.h cq/CQKernel.h vamp/Pitch.h
+vamp/CQChromaVamp.o: cq/CQBase.h cq/CQParameters.h cq/CQKernel.h vamp/Pitch.h
 vamp/libmain.o: vamp/CQVamp.h cq/CQSpectrogram.h cq/ConstantQ.h cq/CQBase.h
-vamp/libmain.o: cq/CQKernel.h vamp/CQChromaVamp.h
+vamp/libmain.o: cq/CQParameters.h cq/CQKernel.h vamp/CQChromaVamp.h
 vamp/Pitch.o: vamp/Pitch.h
-test/processfile.o: cq/ConstantQ.h cq/CQBase.h cq/CQKernel.h
-cq/ConstantQ.o: cq/CQBase.h cq/CQKernel.h
-cq/CQSpectrogram.o: cq/ConstantQ.h cq/CQBase.h cq/CQKernel.h
-cq/CQInverse.o: cq/CQBase.h cq/CQKernel.h
+test/TestCQFrequency.o: cq/CQSpectrogram.h cq/ConstantQ.h cq/CQBase.h
+test/TestCQFrequency.o: cq/CQParameters.h cq/CQKernel.h src/dsp/Window.h
+test/TestFFT.o: src/dsp/FFT.h
+test/TestMathUtilities.o: src/dsp/MathUtilities.h src/dsp/nan-inf.h
+test/TestResampler.o: src/dsp/Resampler.h src/dsp/Window.h src/dsp/FFT.h
+test/TestWindow.o: src/dsp/Window.h
+test/processfile.o: cq/ConstantQ.h cq/CQBase.h cq/CQParameters.h
+test/processfile.o: cq/CQKernel.h
+cq/CQKernel.o: cq/CQParameters.h
+cq/ConstantQ.o: cq/CQBase.h cq/CQParameters.h cq/CQKernel.h
+cq/CQSpectrogram.o: cq/ConstantQ.h cq/CQBase.h cq/CQParameters.h
+cq/CQSpectrogram.o: cq/CQKernel.h
+cq/CQInverse.o: cq/CQBase.h cq/CQKernel.h cq/CQParameters.h
 src/dsp/MathUtilities.o: src/dsp/nan-inf.h
 src/ext/kissfft/tools/kiss_fftr.o: src/ext/kissfft/kiss_fft.h
-vamp/CQVamp.o: cq/CQSpectrogram.h cq/ConstantQ.h cq/CQBase.h cq/CQKernel.h
+vamp/CQVamp.o: cq/CQSpectrogram.h cq/ConstantQ.h cq/CQBase.h
+vamp/CQVamp.o: cq/CQParameters.h cq/CQKernel.h