# HG changeset patch
# User Chris Cannam <cannam@all-day-breakfast.com>
# Date 1497516630 -3600
# Node ID 205f9a6240f511d12e128dd6f688e8d728fa2831
# Parent  dcd4bdf095e7ecc855343b5c4c26d896d07806c8
Use sord-single build

diff -r dcd4bdf095e7 -r 205f9a6240f5 Makefile
--- a/Makefile	Wed Jun 14 11:36:13 2017 +0100
+++ b/Makefile	Thu Jun 15 09:50:30 2017 +0100
@@ -1,17 +1,21 @@
 
 all:	prerequisites generator examples
 
-.PHONY:	prerequisites
 prerequisites:
 	./bin/check-prerequisites.sh
 
+clean:
+	$(MAKE) -C generator clean
+	$(MAKE) -C examples/vamp-example-plugins clean
+	$(MAKE) -C examples/vamp-test-plugin clean
+
 .PHONY:	generator
 generator:
 	$(MAKE) -C generator
 
 .PHONY: examples
 examples:
-	$(MAKE) -C examples/vamp-example-plugins clean em
-	$(MAKE) -C examples/vamp-test-plugin clean em
+	$(MAKE) -C examples/vamp-example-plugins em
+	$(MAKE) -C examples/vamp-test-plugin em
 	$(MAKE) -C examples/vamp-example-plugins test
 	$(MAKE) -C examples/vamp-test-plugin test
diff -r dcd4bdf095e7 -r 205f9a6240f5 generator/Makefile
--- a/generator/Makefile	Wed Jun 14 11:36:13 2017 +0100
+++ b/generator/Makefile	Thu Jun 15 09:50:30 2017 +0100
@@ -3,17 +3,21 @@
 PIPERCPP_DIR    := ../../piper-vamp-cpp
 PIPER_DIR	:= ../../piper
 
-##!!! review
-INCFLAGS	:= -I$(PIPERCPP_DIR)/ext -I/usr/include/sord-0 -I/usr/include/serd-0 -I$(VAMPSDK_DIR) -I$(PIPERCPP_DIR) -I/usr/local/include
+INCFLAGS	:= -I$(PIPERCPP_DIR) -I$(PIPERCPP_DIR)/ext -I$(PIPERCPP_DIR)/ext/serd -I$(PIPERCPP_DIR)/ext/sord -I$(VAMPSDK_DIR) -I/usr/local/include
+
+OBJECTS		:= ./generator.o $(PIPERCPP_DIR)/ext/sord/sord-single.o
 
 CXXFLAGS	:= -Wall -Wextra -g3 -std=c++11 $(INCFLAGS)
+CFLAGS		:= -Wall -g3 $(INCFLAGS)
 
-LDFLAGS		:= $(VAMPSDK_DIR)/libvamp-hostsdk.a -lsord-0 -lserd-0
+LDFLAGS		:= $(VAMPSDK_DIR)/libvamp-hostsdk.a
 
 LDFLAGS		+= -ldl
 
 all:		../bin/piper-vamp-stub-generator
 
-../bin/piper-vamp-stub-generator:	./generator.cpp
-		$(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS)
+../bin/piper-vamp-stub-generator:	$(OBJECTS)
+		$(CXX) $^ -o $@ $(LDFLAGS)
 
+clean:
+		rm -f $(OBJECTS)
diff -r dcd4bdf095e7 -r 205f9a6240f5 generator/generator.cpp
--- a/generator/generator.cpp	Wed Jun 14 11:36:13 2017 +0100
+++ b/generator/generator.cpp	Thu Jun 15 09:50:30 2017 +0100
@@ -36,7 +36,6 @@
 #include "vamp-json/VampJson.h"
 #include "vamp-support/RequestOrResponse.h"
 #include "vamp-support/LoaderRequests.h"
-#include "vamp-support/RdfTypes.h"
 
 #include <iostream>
 #include <sstream>
diff -r dcd4bdf095e7 -r 205f9a6240f5 test/node-load-test.js
--- a/test/node-load-test.js	Wed Jun 14 11:36:13 2017 +0100
+++ b/test/node-load-test.js	Thu Jun 15 09:50:30 2017 +0100
@@ -181,6 +181,9 @@
             adapterFlags: ["AdaptAllSafe"]
         }
     });
+
+//    note("Load request returned: " + JSON.stringify(response) + "\n");
+    
     checkSuccess(response);
 
     var blockSize = response.result.defaultConfiguration.framing.blockSize;