Fixed lv2.h issue.

git-svn-id: http://svn.drobilla.net/lad@164 a436a847-0d15-0410-975c-d299462d15a1

libslv2/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = include src slv2 examples doc
+SUBDIRS = src slv2 examples data doc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libslv2.pc

libslv2/configure.ac

@@ -2,7 +2,6 @@ AC_PREREQ(2.59)
 AC_INIT([libslv2],[0.0.1],[drobilla@connect.carleton.ca])
 AC_CONFIG_SRCDIR([src/plugin.c])
 AC_CONFIG_SRCDIR([slv2/plugin.h])
-AC_CONFIG_SRCDIR([include/lv2.h])
 AC_CONFIG_SRCDIR([examples/plugins/Amp-swh.lv2/amp.c])
 AC_CONFIG_SRCDIR([examples/hosts/test_host.c])
 AC_CONFIG_HEADER([config.h])
@@ -75,10 +74,10 @@ AM_CONDITIONAL(WITH_JACK, [test "$build_jack" = "yes"])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([src/Makefile])
 AC_CONFIG_FILES([slv2/Makefile])
-AC_CONFIG_FILES([include/Makefile])
 AC_CONFIG_FILES([examples/Makefile])
 AC_CONFIG_FILES([examples/plugins/Makefile])
 AC_CONFIG_FILES([examples/hosts/Makefile])
+AC_CONFIG_FILES([data/Makefile])
 AC_CONFIG_FILES([libslv2.pc])
 AC_CONFIG_FILES([doc/Makefile])
 AC_CONFIG_FILES([doc/reference.doxygen])

libslv2/data/Makefile.am

@@ -0,0 +1 @@
+EXTRA_DIST = lv2.ttl

libslv2/data/lv2.ttl

@@ -142,7 +142,7 @@ Plugins will write values to this array during their run method.
 # Mandatory Port RDF:Properties #
 #################################
 
-:Datatype a rdfs:Class ;
+:DataType a rdfs:Class ;
     rdfs:comment "A data type that can be stored in an LV2 port." .
 
 :dataType a rdf:Property ;
@@ -151,11 +151,11 @@ Plugins will write values to this array during their run method.
     rdfs:label   "Port Data type" ;
     rdfs:comment """
 Relates a Port to the data type(s) it can accept.  Hosts that do not support
-a specfied datatype MUST NOT instantiate the plugin, unless that port has
+a specified datatype MUST NOT instantiate the plugin, unless that port has
 the connectionOptional hint set (in which case the host can simply "connect"
 that port to NULL).
 
-If multiple datatypes are specfied the plugin must have some way to distinguish
+If multiple datatypes are specified the plugin must have some way to distinguish
 the values (any extension that defines a new data-type which wishes to allow
 this must deal with this issue somehow).
 """ .

libslv2/include/Makefile.am

@@ -1,3 +0,0 @@
-lv2includedir = $(includedir)
-
-lv2include_HEADERS = lv2.h

libslv2/slv2/Makefile.am

@@ -1,6 +1,7 @@
 slv2includedir = $(includedir)/slv2
 
 slv2include_HEADERS = \
+	lv2.h \
 	types.h \
 	private_types.h \
 	slv2.h \

libslv2/slv2/plugininstance.h

@@ -25,7 +25,7 @@ extern "C" {
 
 #include <assert.h>
 #include <dlfcn.h>
-#include <lv2.h>
+#include <slv2/lv2.h>
 #include <slv2/private_types.h>
 #include <slv2/plugininstance.h>
 #include <slv2/plugin.h>

libslv2/slv2/private_types.h

@@ -25,7 +25,7 @@ extern "C" {
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <lv2.h>
+#include <slv2/lv2.h>
 
 
 /* If you're a user of SLV2, stop reading this file RIGHT NOW.