Mercurial > hg > constant-q-cpp
diff Makefile.inc @ 94:fa1709ed4a3c
Inverse runs; now merely needs to run correctly
| author | Chris Cannam <c.cannam@qmul.ac.uk> |
|---|---|
| date | Fri, 09 May 2014 15:16:48 +0100 |
| parents | bfc7cf71f2ef |
| children | fdd32f995b0d |
line wrap: on
line diff
--- a/Makefile.inc Fri May 09 11:41:44 2014 +0100 +++ b/Makefile.inc Fri May 09 15:16:48 2014 +0100 @@ -16,9 +16,11 @@ LDFLAGS := $(LDFLAGS) PLUGIN_LDFLAGS := $(LDFLAGS) $(PLUGIN_LDFLAGS) TEST_LDFLAGS := $(LDFLAGS) -lboost_unit_test_framework +PF_LDFLAGS := $(LDFLAGS) -lsndfile PLUGIN := cqvamp$(PLUGIN_EXT) TEST := $(LIB_DIR)/test +PF := $(LIB_DIR)/processfile LIB_HEADERS := $(LIB_DIR)/CQBase.h $(LIB_DIR)/CQKernel.h $(LIB_DIR)/ConstantQ.h $(LIB_DIR)/CQSpectrogram.h $(LIB_DIR)/CQInverse.h LIB_SOURCES := $(LIB_DIR)/CQKernel.cpp $(LIB_DIR)/ConstantQ.cpp $(LIB_DIR)/CQSpectrogram.cpp $(LIB_DIR)/CQInverse.cpp @@ -30,12 +32,15 @@ SOURCES := $(LIB_SOURCES) $(VAMP_SOURCES) OBJECTS := $(SOURCES:.cpp=.o) -TEST_SOURCES := $(LIB_DIR)/test.cpp $(SOURCES) -TEST_OBJECTS := $(TEST_SOURCES:.cpp=.o) +TEST_SOURCES := $(LIB_DIR)/test.cpp +TEST_OBJECTS := $(TEST_SOURCES:.cpp=.o) $(OBJECTS) + +PF_SOURCES := $(LIB_DIR)/processfile.cpp +PF_OBJECTS := $(PF_SOURCES:.cpp=.o) $(OBJECTS) LIBS := $(QMDSP_DIR)/libqm-dsp.a $(VAMPSDK_DIR)/libvamp-sdk.a -lpthread -all: $(PLUGIN) $(TEST) +all: $(PLUGIN) $(TEST) $(PF) $(PLUGIN): $(OBJECTS) $(CXX) -o $@ $^ $(LIBS) $(PLUGIN_LDFLAGS) @@ -43,14 +48,17 @@ $(TEST): $(TEST_OBJECTS) $(CXX) -o $@ $^ $(LIBS) $(TEST_LDFLAGS) +$(PF): $(PF_OBJECTS) + $(CXX) -o $@ $^ $(LIBS) $(PF_LDFLAGS) + clean: - rm -f $(OBJECTS) + rm -f $(OBJECTS) $(TEST_OBJECTS) $(PF_OBJECTS) distclean: clean rm -f $(PLUGIN) depend: - makedepend -Y -fMakefile.inc $(SOURCES) $(HEADERS) + makedepend -Y -fMakefile.inc $(SOURCES) $(TEST_SOURCES) $(PF_SOURCES) $(HEADERS) # DO NOT DELETE @@ -59,16 +67,21 @@ cpp-qm-dsp/ConstantQ.o: cpp-qm-dsp/CQKernel.h cpp-qm-dsp/CQSpectrogram.o: cpp-qm-dsp/CQSpectrogram.h cpp-qm-dsp/ConstantQ.h cpp-qm-dsp/CQSpectrogram.o: cpp-qm-dsp/CQBase.h cpp-qm-dsp/CQKernel.h -cpp-qm-dsp/CQInverse.o: cpp-qm-dsp/CQInverse.h cpp-qm-dsp/CQKernel.h +cpp-qm-dsp/CQInverse.o: cpp-qm-dsp/CQInverse.h cpp-qm-dsp/CQBase.h +cpp-qm-dsp/CQInverse.o: cpp-qm-dsp/CQKernel.h vamp/CQVamp.o: vamp/CQVamp.h cpp-qm-dsp/CQSpectrogram.h vamp/CQVamp.o: cpp-qm-dsp/ConstantQ.h cpp-qm-dsp/CQBase.h vamp/CQVamp.o: cpp-qm-dsp/CQKernel.h vamp/libmain.o: vamp/CQVamp.h cpp-qm-dsp/CQSpectrogram.h vamp/libmain.o: cpp-qm-dsp/ConstantQ.h cpp-qm-dsp/CQBase.h vamp/libmain.o: cpp-qm-dsp/CQKernel.h +cpp-qm-dsp/test.o: cpp-qm-dsp/CQSpectrogram.h cpp-qm-dsp/ConstantQ.h +cpp-qm-dsp/test.o: cpp-qm-dsp/CQBase.h cpp-qm-dsp/CQKernel.h +cpp-qm-dsp/processfile.o: cpp-qm-dsp/ConstantQ.h cpp-qm-dsp/CQBase.h +cpp-qm-dsp/processfile.o: cpp-qm-dsp/CQKernel.h cpp-qm-dsp/CQInverse.h cpp-qm-dsp/ConstantQ.o: cpp-qm-dsp/CQBase.h cpp-qm-dsp/CQKernel.h cpp-qm-dsp/CQSpectrogram.o: cpp-qm-dsp/ConstantQ.h cpp-qm-dsp/CQBase.h cpp-qm-dsp/CQSpectrogram.o: cpp-qm-dsp/CQKernel.h -cpp-qm-dsp/CQInverse.o: cpp-qm-dsp/CQKernel.h +cpp-qm-dsp/CQInverse.o: cpp-qm-dsp/CQBase.h cpp-qm-dsp/CQKernel.h vamp/CQVamp.o: cpp-qm-dsp/CQSpectrogram.h cpp-qm-dsp/ConstantQ.h vamp/CQVamp.o: cpp-qm-dsp/CQBase.h cpp-qm-dsp/CQKernel.h