changeset 232:71ea10a3cbe7 distinct-libraries

* Add template generator to Makefile
author cannam
date Fri, 07 Nov 2008 14:33:21 +0000
parents 90e3acb4a728
children 521734d2b498
files Makefile build/Doxyfile rdf/generator/template-generator.cpp
diffstat 3 files changed, 28 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Fri Nov 07 14:19:41 2008 +0000
+++ b/Makefile	Fri Nov 07 14:33:21 2008 +0000
@@ -16,6 +16,8 @@
 
 EXAMPLEDIR	= examples
 HOSTDIR		= host
+PCDIR		= pkgconfig
+RDFGENDIR	= rdf/generator
 
 ###
 ### Start of user-serviceable parts
@@ -28,6 +30,7 @@
 #   sdkstatic -- build only the static versions of the SDK libraries
 #   plugins   -- build the example plugins (and the SDK if required)
 #   host      -- build the simple Vamp plugin host (and the SDK if required)
+#   rdfgen    -- build the RDF template generator (and the SDK if required)
 #   test      -- build the host and example plugins, and run a quick test
 #   clean     -- remove binary targets
 #   distclean -- remove all targets
@@ -57,6 +60,10 @@
 #
 HOST_LIBS	= $(SRCDIR)/libvamp-hostsdk.a -lsndfile -ldl
 
+# Libraries required for the RDF template generator.
+#
+RDFGEN_LIBS	= $(SRCDIR)/libvamp-hostsdk.a -ldl
+
 # Locations for "make install".  This will need quite a bit of 
 # editing for non-Linux platforms.  Of course you don't necessarily
 # have to use "make install".
@@ -185,6 +192,12 @@
 HOST_TARGET	= \
 		$(HOSTDIR)/vamp-simple-host
 
+RDFGEN_OBJECTS	= \
+		$(RDFGENDIR)/template-generator.o
+
+RDFGEN_TARGET	= \
+		$(RDFGENDIR)/template-generator
+
 sdk:		sdkstatic $(SDK_DYNAMIC) $(HOSTSDK_DYNAMIC)
 
 sdkstatic:	$(SDK_STATIC) $(HOSTSDK_STATIC)
@@ -195,7 +208,9 @@
 
 host:		$(HOST_TARGET)
 
-all:		sdk plugins host test
+rdfgen:		$(RDFGEN_TARGET)
+
+all:		sdk plugins host rdfgen test
 
 $(SDK_STATIC):	$(SDK_OBJECTS) $(API_HEADERS) $(SDK_HEADERS)
 		$(AR) r $@ $(SDK_OBJECTS)
@@ -215,14 +230,17 @@
 $(HOST_TARGET):	$(HOST_OBJECTS) $(HOSTSDK_STATIC) $(HOST_HEADERS)
 		$(CXX) $(LDFLAGS) $(HOST_LDFLAGS) -o $@ $(HOST_OBJECTS) $(HOST_LIBS)
 
+$(RDFGEN_TARGET):	$(RDFGEN_OBJECTS) $(HOSTSDK_STATIC) 
+		$(CXX) $(LDFLAGS) $(RDFGEN_LDFLAGS) -o $@ $(RDFGEN_OBJECTS) $(RDFGEN_LIBS)
+
 test:		plugins host
 		VAMP_PATH=$(EXAMPLEDIR) $(HOST_TARGET) -l
 
 clean:		
-		rm -f $(SDK_OBJECTS) $(HOSTSDK_OBJECTS) $(PLUGIN_OBJECTS) $(HOST_OBJECTS)
+		rm -f $(SDK_OBJECTS) $(HOSTSDK_OBJECTS) $(PLUGIN_OBJECTS) $(HOST_OBJECTS) $(RDFGEN_OBJECTS)
 
 distclean:	clean
-		rm -f $(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC) $(HOSTSDK_DYNAMIC) $(PLUGIN_TARGET) $(HOST_TARGET) *~ */*~
+		rm -f $(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC) $(HOSTSDK_DYNAMIC) $(PLUGIN_TARGET) $(HOST_TARGET) $(RDFGEN_TARGET) *~ */*~
 
 install:	$(SDK_STATIC) $(SDK_DYNAMIC) $(HOSTSDK_STATIC) $(HOSTSDK_DYNAMIC) $(PLUGIN_TARGET) $(HOST_TARGET)
 		mkdir -p $(DESTDIR)$(INSTALL_API_HEADERS)
--- a/build/Doxyfile	Fri Nov 07 14:19:41 2008 +0000
+++ b/build/Doxyfile	Fri Nov 07 14:33:21 2008 +0000
@@ -515,7 +515,11 @@
 
 INPUT                  = vamp \
                          vamp-sdk \
-                         vamp-sdk/hostext \
+                         vamp-hostsdk \
+                         vamp-hostsdk/hostext \
+                         src/vamp-sdk \
+                         src/vamp-hostsdk \
+                         src/vamp-hostsdk/hostext \
                          examples \
                          host
 
--- a/rdf/generator/template-generator.cpp	Fri Nov 07 14:19:41 2008 +0000
+++ b/rdf/generator/template-generator.cpp	Fri Nov 07 14:33:21 2008 +0000
@@ -9,9 +9,10 @@
 #include <iostream>
 #include <fstream>
 #include <sstream>
-#include <sndfile.h>
 
 #include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 using std::cout;
 using std::cin;