diff Makefile @ 60:8a4bcb3dc3a6

Replace exceptions throughout the JSON-handling and adapter code with string-arg error handling. No longer need exception handling enabled in Emscripten (with its consequent runtime overhead - though we still need to check whether this error handling regime is actually faster).

--- a/Makefile	Mon Sep 19 15:52:38 2016 +0100
+++ b/Makefile	Tue Sep 20 16:35:47 2016 +0100
@@ -6,7 +6,7 @@
 
 #!!! todo: proper dependencies
 
-all:	bin/vamp-json-cli bin/vamp-json-to-capnp bin/vampipe-convert bin/vampipe-server
+all:	bin/vampipe-convert bin/vampipe-server
 
 bin/vampipe-convert: o/vampipe-convert.o o/json11.o o/vamp.capnp.o
 	c++ $(CXXFLAGS) $^ -o $@ $(LDFLAGS)
@@ -14,12 +14,6 @@
 bin/vampipe-server: o/vampipe-server.o o/vamp.capnp.o
 	c++ $(CXXFLAGS) $^ -o $@ $(LDFLAGS)
 
-bin/vamp-json-to-capnp:	o/json-to-capnp.o o/json11.o
-	c++ $(CXXFLAGS) $^ -o $@ $(LDFLAGS)
-
-bin/vamp-json-cli:	o/json-cli.o o/json11.o
-	c++ $(CXXFLAGS) $^ -o $@ $(LDFLAGS)
-
 capnproto/vamp.capnp.h:	capnproto/vamp.capnp
 	capnp compile $< -oc++
 
@@ -35,15 +29,8 @@
 o/vampipe-server.o:	utilities/vampipe-server.cpp capnproto/vamp.capnp.h capnproto/VampnProto.h 
 	c++ $(CXXFLAGS) $(INCFLAGS) -c $< -o $@
 
-o/json-to-capnp.o:	utilities/json-to-capnp.cpp capnproto/vamp.capnp.h capnproto/VampnProto.h json/VampJson.h
-	c++ $(CXXFLAGS) $(INCFLAGS) -c $< -o $@
-
-o/json-cli.o:	utilities/json-cli.cpp json/VampJson.h
-	c++ $(CXXFLAGS) $(INCFLAGS) -c $< -o $@
-
 test:	all
-	VAMP_PATH=./vamp-plugin-sdk/examples test/test-json-cli.sh
-	VAMP_PATH=./vamp-plugin-sdk/examples test/test-json-to-capnp.sh
+	test/test-vampipe-server.sh
 
 clean:
 	rm -f */*.o capnproto/vamp.capnp.h capnproto/vamp.capnp.c++