comparison Makefile.inc @ 172:76b70af3a563

Merge from branch chroma-in-library
author Chris Cannam <c.cannam@qmul.ac.uk>
date Thu, 05 Feb 2015 09:53:06 +0000
parents b96b0addbca7
children
comparison
equal deleted inserted replaced
169:8a1d240ac542 172:76b70af3a563
34 $(INC_DIR)/CQBase.h \ 34 $(INC_DIR)/CQBase.h \
35 $(INC_DIR)/CQKernel.h \ 35 $(INC_DIR)/CQKernel.h \
36 $(INC_DIR)/ConstantQ.h \ 36 $(INC_DIR)/ConstantQ.h \
37 $(INC_DIR)/CQSpectrogram.h \ 37 $(INC_DIR)/CQSpectrogram.h \
38 $(INC_DIR)/CQInverse.h \ 38 $(INC_DIR)/CQInverse.h \
39 $(INC_DIR)/Chromagram.h \
40 $(LIB_DIR)/Pitch.h \
39 $(LIB_DIR)/dsp/FFT.h \ 41 $(LIB_DIR)/dsp/FFT.h \
40 $(LIB_DIR)/dsp/KaiserWindow.h \ 42 $(LIB_DIR)/dsp/KaiserWindow.h \
41 $(LIB_DIR)/dsp/MathUtilities.h \ 43 $(LIB_DIR)/dsp/MathUtilities.h \
42 $(LIB_DIR)/dsp/nan-inf.h \ 44 $(LIB_DIR)/dsp/nan-inf.h \
43 $(LIB_DIR)/dsp/Resampler.h \ 45 $(LIB_DIR)/dsp/Resampler.h \
49 LIB_SOURCES := \ 51 LIB_SOURCES := \
50 $(LIB_DIR)/CQKernel.cpp \ 52 $(LIB_DIR)/CQKernel.cpp \
51 $(LIB_DIR)/ConstantQ.cpp \ 53 $(LIB_DIR)/ConstantQ.cpp \
52 $(LIB_DIR)/CQSpectrogram.cpp \ 54 $(LIB_DIR)/CQSpectrogram.cpp \
53 $(LIB_DIR)/CQInverse.cpp \ 55 $(LIB_DIR)/CQInverse.cpp \
56 $(LIB_DIR)/Chromagram.cpp \
57 $(LIB_DIR)/Pitch.cpp \
54 $(LIB_DIR)/dsp/FFT.cpp \ 58 $(LIB_DIR)/dsp/FFT.cpp \
55 $(LIB_DIR)/dsp/KaiserWindow.cpp \ 59 $(LIB_DIR)/dsp/KaiserWindow.cpp \
56 $(LIB_DIR)/dsp/MathUtilities.cpp \ 60 $(LIB_DIR)/dsp/MathUtilities.cpp \
57 $(LIB_DIR)/dsp/Resampler.cpp \ 61 $(LIB_DIR)/dsp/Resampler.cpp \
58 $(LIB_DIR)/dsp/SincWindow.cpp \ 62 $(LIB_DIR)/dsp/SincWindow.cpp \
59 $(KFFT_DIR)/kiss_fft.c \ 63 $(KFFT_DIR)/kiss_fft.c \
60 $(KFFT_DIR)/tools/kiss_fftr.c 64 $(KFFT_DIR)/tools/kiss_fftr.c
61 65
62 VAMP_HEADERS := \ 66 VAMP_HEADERS := \
63 $(VAMP_DIR)/CQVamp.h \ 67 $(VAMP_DIR)/CQVamp.h \
64 $(VAMP_DIR)/CQChromaVamp.h \ 68 $(VAMP_DIR)/CQChromaVamp.h
65 $(VAMP_DIR)/Pitch.h
66 69
67 VAMP_SOURCES := \ 70 VAMP_SOURCES := \
68 $(VAMP_DIR)/CQVamp.cpp \ 71 $(VAMP_DIR)/CQVamp.cpp \
69 $(VAMP_DIR)/CQChromaVamp.cpp \ 72 $(VAMP_DIR)/CQChromaVamp.cpp \
70 $(VAMP_DIR)/libmain.cpp \ 73 $(VAMP_DIR)/libmain.cpp
71 $(VAMP_DIR)/Pitch.cpp 74
72
73 TEST_SOURCES := \ 75 TEST_SOURCES := \
74 $(TEST_DIR)/TestFFT.cpp \ 76 $(TEST_DIR)/TestFFT.cpp \
75 $(TEST_DIR)/TestMathUtilities.cpp \ 77 $(TEST_DIR)/TestMathUtilities.cpp \
76 $(TEST_DIR)/TestResampler.cpp \ 78 $(TEST_DIR)/TestResampler.cpp \
77 $(TEST_DIR)/TestWindow.cpp \ 79 $(TEST_DIR)/TestWindow.cpp \
134 src/CQKernel.o: src/dsp/Window.h 136 src/CQKernel.o: src/dsp/Window.h
135 src/ConstantQ.o: src/dsp/Resampler.h src/dsp/MathUtilities.h 137 src/ConstantQ.o: src/dsp/Resampler.h src/dsp/MathUtilities.h
136 src/ConstantQ.o: src/dsp/nan-inf.h src/dsp/FFT.h 138 src/ConstantQ.o: src/dsp/nan-inf.h src/dsp/FFT.h
137 src/CQInverse.o: src/dsp/Resampler.h src/dsp/MathUtilities.h 139 src/CQInverse.o: src/dsp/Resampler.h src/dsp/MathUtilities.h
138 src/CQInverse.o: src/dsp/nan-inf.h src/dsp/FFT.h 140 src/CQInverse.o: src/dsp/nan-inf.h src/dsp/FFT.h
141 src/Chromagram.o: src/Pitch.h
142 src/Pitch.o: src/Pitch.h
139 src/dsp/FFT.o: src/dsp/FFT.h src/dsp/MathUtilities.h src/dsp/nan-inf.h 143 src/dsp/FFT.o: src/dsp/FFT.h src/dsp/MathUtilities.h src/dsp/nan-inf.h
140 src/dsp/KaiserWindow.o: src/dsp/KaiserWindow.h src/dsp/MathUtilities.h 144 src/dsp/KaiserWindow.o: src/dsp/KaiserWindow.h src/dsp/MathUtilities.h
141 src/dsp/KaiserWindow.o: src/dsp/nan-inf.h 145 src/dsp/KaiserWindow.o: src/dsp/nan-inf.h
142 src/dsp/MathUtilities.o: src/dsp/MathUtilities.h src/dsp/nan-inf.h 146 src/dsp/MathUtilities.o: src/dsp/MathUtilities.h src/dsp/nan-inf.h
143 src/dsp/Resampler.o: src/dsp/Resampler.h src/dsp/MathUtilities.h 147 src/dsp/Resampler.o: src/dsp/Resampler.h src/dsp/MathUtilities.h
148 src/ext/kissfft/kiss_fft.o: src/ext/kissfft/kiss_fft.h 152 src/ext/kissfft/kiss_fft.o: src/ext/kissfft/kiss_fft.h
149 src/ext/kissfft/tools/kiss_fftr.o: src/ext/kissfft/tools/kiss_fftr.h 153 src/ext/kissfft/tools/kiss_fftr.o: src/ext/kissfft/tools/kiss_fftr.h
150 src/ext/kissfft/tools/kiss_fftr.o: src/ext/kissfft/kiss_fft.h 154 src/ext/kissfft/tools/kiss_fftr.o: src/ext/kissfft/kiss_fft.h
151 src/ext/kissfft/tools/kiss_fftr.o: src/ext/kissfft/_kiss_fft_guts.h 155 src/ext/kissfft/tools/kiss_fftr.o: src/ext/kissfft/_kiss_fft_guts.h
152 vamp/CQVamp.o: vamp/CQVamp.h cq/CQSpectrogram.h cq/ConstantQ.h cq/CQBase.h 156 vamp/CQVamp.o: vamp/CQVamp.h cq/CQSpectrogram.h cq/ConstantQ.h cq/CQBase.h
153 vamp/CQVamp.o: cq/CQParameters.h cq/CQKernel.h vamp/Pitch.h 157 vamp/CQVamp.o: cq/CQParameters.h cq/CQKernel.h src/Pitch.h
154 vamp/CQChromaVamp.o: vamp/CQChromaVamp.h cq/CQSpectrogram.h cq/ConstantQ.h 158 vamp/CQChromaVamp.o: vamp/CQChromaVamp.h cq/CQSpectrogram.h cq/ConstantQ.h
155 vamp/CQChromaVamp.o: cq/CQBase.h cq/CQParameters.h cq/CQKernel.h vamp/Pitch.h 159 vamp/CQChromaVamp.o: cq/CQBase.h cq/CQParameters.h cq/CQKernel.h
156 vamp/libmain.o: vamp/CQVamp.h cq/CQSpectrogram.h cq/ConstantQ.h cq/CQBase.h 160 vamp/libmain.o: vamp/CQVamp.h cq/CQSpectrogram.h cq/ConstantQ.h cq/CQBase.h
157 vamp/libmain.o: cq/CQParameters.h cq/CQKernel.h vamp/CQChromaVamp.h 161 vamp/libmain.o: cq/CQParameters.h cq/CQKernel.h vamp/CQChromaVamp.h
158 vamp/Pitch.o: vamp/Pitch.h
159 test/TestFFT.o: src/dsp/FFT.h 162 test/TestFFT.o: src/dsp/FFT.h
160 test/TestMathUtilities.o: src/dsp/MathUtilities.h src/dsp/nan-inf.h 163 test/TestMathUtilities.o: src/dsp/MathUtilities.h src/dsp/nan-inf.h
161 test/TestResampler.o: src/dsp/Resampler.h src/dsp/Window.h src/dsp/FFT.h 164 test/TestResampler.o: src/dsp/Resampler.h src/dsp/Window.h src/dsp/FFT.h
162 test/TestWindow.o: src/dsp/Window.h 165 test/TestWindow.o: src/dsp/Window.h
163 test/TestCQKernel.o: cq/CQKernel.h cq/CQParameters.h 166 test/TestCQKernel.o: cq/CQKernel.h cq/CQParameters.h
170 cq/CQKernel.o: cq/CQParameters.h 173 cq/CQKernel.o: cq/CQParameters.h
171 cq/ConstantQ.o: cq/CQBase.h cq/CQParameters.h cq/CQKernel.h 174 cq/ConstantQ.o: cq/CQBase.h cq/CQParameters.h cq/CQKernel.h
172 cq/CQSpectrogram.o: cq/ConstantQ.h cq/CQBase.h cq/CQParameters.h 175 cq/CQSpectrogram.o: cq/ConstantQ.h cq/CQBase.h cq/CQParameters.h
173 cq/CQSpectrogram.o: cq/CQKernel.h 176 cq/CQSpectrogram.o: cq/CQKernel.h
174 cq/CQInverse.o: cq/CQBase.h cq/CQKernel.h cq/CQParameters.h 177 cq/CQInverse.o: cq/CQBase.h cq/CQKernel.h cq/CQParameters.h
178 cq/Chromagram.o: cq/CQBase.h
175 src/dsp/MathUtilities.o: src/dsp/nan-inf.h 179 src/dsp/MathUtilities.o: src/dsp/nan-inf.h
176 src/ext/kissfft/tools/kiss_fftr.o: src/ext/kissfft/kiss_fft.h 180 src/ext/kissfft/tools/kiss_fftr.o: src/ext/kissfft/kiss_fft.h
177 vamp/CQVamp.o: cq/CQSpectrogram.h cq/ConstantQ.h cq/CQBase.h 181 vamp/CQVamp.o: cq/CQSpectrogram.h cq/ConstantQ.h cq/CQBase.h
178 vamp/CQVamp.o: cq/CQParameters.h cq/CQKernel.h 182 vamp/CQVamp.o: cq/CQParameters.h cq/CQKernel.h