Mercurial > hg > piper-cpp

changeset 206:f7045f7995bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Dependencies
author Chris Cannam <cannam@all-day-breakfast.com>
date Thu, 09 Feb 2017 14:02:05 +0000
parents 587e9691a44e
children 8183c3be5592
files Makefile
diffstat 1 files changed, 83 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Thu Feb 09 12:54:00 2017 +0000
+++ b/Makefile	Thu Feb 09 14:02:05 2017 +0000
@@ -2,15 +2,16 @@
 VAMPSDK_DIR	:= ../vamp-plugin-sdk
 PIPER_DIR	:= ../piper
 
-CXXFLAGS	:= -Wall -Wextra -Werror -g3 -std=c++11
 INCFLAGS	:= -Iext -I$(VAMPSDK_DIR) -I. -I/usr/local/include
+CXXFLAGS	:= -Wall -Wextra -Werror -g3 -std=c++11 $(INCFLAGS)
 
 #LDFLAGS		:= -L$(VAMPSDK_DIR) -L/usr/local/lib -lvamp-hostsdk -lcapnp -lkj 
 LDFLAGS		:= $(VAMPSDK_DIR)/libvamp-hostsdk.a -lcapnp -lkj 
 
 LDFLAGS		+= -ldl
 
-TEST_SRCS 	:= test/vamp-client/tst_PluginStub.cpp
+TEST_SRCS 	:= test/main.cpp test/vamp-client/tst_PluginStub.cpp
+TEST_OBJS	:= $(TEST_SRCS:.cpp=.o)
 
 all:	o bin bin/piper-convert bin/piper-vamp-simple-server bin/test-suite
 
@@ -25,9 +26,9 @@
 
 bin/piper-vamp-simple-server: o/simple-server.o o/json11.o o/piper.capnp.o
 	c++ $(CXXFLAGS) $^ -o $@ $(LDFLAGS)
-	
-bin/test-suite: test/main.cpp $(TEST_SRCS)
-	c++ $(CXXFLAGS) $(INCFLAGS) $< $(TEST_SRCS) -o $@ $(LDFLAGS)
+
+bin/test-suite: $(TEST_OBJS)
+	c++ $(CXXFLAGS) $^ -o $@ $(LDFLAGS)
 	bin/test-suite
 
 o/piper.capnp.o:	vamp-capnp/piper.capnp.c++
@@ -41,11 +42,11 @@
 o/json11.o:	ext/json11/json11.cpp
 	c++ $(CXXFLAGS) -c $< -o $@
 
-o/convert.o:	vamp-server/convert.cpp vamp-capnp/piper.capnp.h vamp-capnp/VampnProto.h vamp-json/VampJson.h
-	c++ $(CXXFLAGS) $(INCFLAGS) -c $< -o $@
+o/convert.o:	vamp-server/convert.cpp
+	c++ $(CXXFLAGS) -c $< -o $@
 
-o/simple-server.o:	vamp-server/simple-server.cpp vamp-capnp/piper.capnp.h vamp-capnp/VampnProto.h vamp-json/VampJson.h
-	c++ $(CXXFLAGS) $(INCFLAGS) -c $< -o $@
+o/simple-server.o:	vamp-server/simple-server.cpp
+	c++ $(CXXFLAGS) -c $< -o $@
 
 test:	all
 	bin/test-suite -s -d yes
@@ -57,5 +58,78 @@
 distclean:	clean
 	rm -rf bin/*
 
+depend:
+	makedepend -Y. */*.cpp */*/*.cpp */*/*/*.cpp */*.c++
+
 # cancel implicit rule which otherwise could try to link %.capnp
 %:	%.o
+
+# DO NOT DELETE
+
+vamp-capnp/piper-capnp.o: vamp-capnp/piper.capnp.c++ vamp-capnp/piper.capnp.h
+vamp-server/convert.o: vamp-json/VampJson.h vamp-support/PluginStaticData.h
+vamp-server/convert.o: vamp-support/PluginConfiguration.h
+vamp-server/convert.o: vamp-support/RequestResponse.h
+vamp-server/convert.o: vamp-support/PluginStaticData.h
+vamp-server/convert.o: vamp-support/PluginConfiguration.h
+vamp-server/convert.o: vamp-support/PluginHandleMapper.h
+vamp-server/convert.o: vamp-support/PluginOutputIdMapper.h
+vamp-server/convert.o: vamp-support/PluginOutputIdMapper.h
+vamp-server/convert.o: vamp-support/RequestResponseType.h
+vamp-server/convert.o: vamp-capnp/VampnProto.h vamp-capnp/piper.capnp.h
+vamp-server/convert.o: vamp-support/RequestOrResponse.h
+vamp-server/convert.o: vamp-support/RequestResponseType.h
+vamp-server/convert.o: vamp-support/RequestResponse.h
+vamp-server/convert.o: vamp-support/PreservingPluginHandleMapper.h
+vamp-server/convert.o: vamp-support/PluginHandleMapper.h
+vamp-server/convert.o: vamp-support/PreservingPluginOutputIdMapper.h
+vamp-server/simple-server.o: vamp-json/VampJson.h
+vamp-server/simple-server.o: vamp-support/PluginStaticData.h
+vamp-server/simple-server.o: vamp-support/PluginConfiguration.h
+vamp-server/simple-server.o: vamp-support/RequestResponse.h
+vamp-server/simple-server.o: vamp-support/PluginStaticData.h
+vamp-server/simple-server.o: vamp-support/PluginConfiguration.h
+vamp-server/simple-server.o: vamp-support/PluginHandleMapper.h
+vamp-server/simple-server.o: vamp-support/PluginOutputIdMapper.h
+vamp-server/simple-server.o: vamp-support/PluginOutputIdMapper.h
+vamp-server/simple-server.o: vamp-support/RequestResponseType.h
+vamp-server/simple-server.o: vamp-capnp/VampnProto.h vamp-capnp/piper.capnp.h
+vamp-server/simple-server.o: vamp-support/RequestOrResponse.h
+vamp-server/simple-server.o: vamp-support/RequestResponseType.h
+vamp-server/simple-server.o: vamp-support/RequestResponse.h
+vamp-server/simple-server.o: vamp-support/CountingPluginHandleMapper.h
+vamp-server/simple-server.o: vamp-support/PluginHandleMapper.h
+vamp-server/simple-server.o: vamp-support/AssignedPluginHandleMapper.h
+vamp-server/simple-server.o: vamp-support/DefaultPluginOutputIdMapper.h
+vamp-server/simple-server.o: vamp-support/LoaderRequests.h
+ext/json11/json11.o: ext/json11/json11.hpp
+ext/json11/test.o: ext/json11/json11.hpp
+test/vamp-client/tst_PluginStub.o: vamp-client/Loader.h
+test/vamp-client/tst_PluginStub.o: vamp-support/RequestResponse.h
+test/vamp-client/tst_PluginStub.o: vamp-support/PluginStaticData.h
+test/vamp-client/tst_PluginStub.o: vamp-support/PluginConfiguration.h
+test/vamp-client/tst_PluginStub.o: vamp-client/PluginClient.h
+test/vamp-client/tst_PluginStub.o: vamp-support/PluginConfiguration.h
+test/vamp-client/tst_PluginStub.o: vamp-client/PluginStub.h
+test/vamp-client/tst_PluginStub.o: vamp-support/PluginStaticData.h
+test/vamp-client/tst_PluginStub.o: vamp-client/PluginClient.h
+vamp-client/qt/test.o: vamp-client/qt/ProcessQtTransport.h
+vamp-client/qt/test.o: vamp-client/SynchronousTransport.h
+vamp-client/qt/test.o: vamp-client/Exceptions.h vamp-client/qt/AutoPlugin.h
+vamp-client/qt/test.o: vamp-client/CapnpRRClient.h vamp-client/Loader.h
+vamp-client/qt/test.o: vamp-support/RequestResponse.h
+vamp-client/qt/test.o: vamp-support/PluginStaticData.h
+vamp-client/qt/test.o: vamp-support/PluginConfiguration.h
+vamp-client/qt/test.o: vamp-client/PluginClient.h vamp-client/PluginStub.h
+vamp-client/qt/test.o: vamp-support/PluginStaticData.h
+vamp-client/qt/test.o: vamp-support/PluginConfiguration.h
+vamp-client/qt/test.o: vamp-client/SynchronousTransport.h
+vamp-client/qt/test.o: vamp-support/AssignedPluginHandleMapper.h
+vamp-client/qt/test.o: vamp-support/PluginHandleMapper.h
+vamp-client/qt/test.o: vamp-support/PluginOutputIdMapper.h
+vamp-client/qt/test.o: vamp-support/DefaultPluginOutputIdMapper.h
+vamp-client/qt/test.o: vamp-capnp/VampnProto.h vamp-capnp/piper.capnp.h
+vamp-client/qt/test.o: vamp-support/PluginHandleMapper.h
+vamp-client/qt/test.o: vamp-support/PluginOutputIdMapper.h
+vamp-client/qt/test.o: vamp-support/RequestResponseType.h
+vamp-capnp/piper.capnp.o: vamp-capnp/piper.capnp.h