From 501c1c63c7081a09155eabf1086a2e65956095f5 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Mon, 26 Mar 2012 03:58:21 +0000
Subject: Update for latest LV2.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4106 a436a847-0d15-0410-975c-d299462d15a1
---
 src/client/wscript        |  2 +-
 src/gui/wscript           |  4 ++--
 src/serialisation/wscript |  2 +-
 src/server/wscript        |  4 ++--
 src/shared/wscript        |  2 +-
 wscript                   | 15 ++-------------
 6 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/client/wscript b/src/client/wscript
index 526c049f..453bc122 100644
--- a/src/client/wscript
+++ b/src/client/wscript
@@ -9,7 +9,7 @@ def build(bld):
               target          = 'ingen_client',
               install_path    = '${LIBDIR}',
               use             = 'libingen_shared')
-    autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE LILV SUIL RAUL SORD SIGCPP')
+    autowaf.use_lib(bld, obj, 'GLIBMM LV2 LILV SUIL RAUL SORD SIGCPP')
 
     obj.source = '''
         ClientStore.cpp
diff --git a/src/gui/wscript b/src/gui/wscript
index 8fc5058e..1a732f54 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -17,7 +17,7 @@ def build(bld):
             GNOMECANVAS
             GTKMM
             LILV
-            LV2CORE
+            LV2
             RAUL
             SIGCPP
             SORD
@@ -77,4 +77,4 @@ def build(bld):
               target       = 'ingen_gui_lv2',
               install_path = '${LV2DIR}/ingen.lv2/',
               use          = 'libingen_gui libingen_shared')
-    autowaf.use_lib(bld, obj, 'LV2_UI')
+    autowaf.use_lib(bld, obj, 'LV2')
diff --git a/src/serialisation/wscript b/src/serialisation/wscript
index 8adcb711..49698b6c 100644
--- a/src/serialisation/wscript
+++ b/src/serialisation/wscript
@@ -12,4 +12,4 @@ def build(bld):
               target          = 'ingen_serialisation',
               install_path    = '${LIBDIR}',
               use             = 'libingen_shared')
-    autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE LILV RAUL SORD SRATOM')
+    autowaf.use_lib(bld, obj, 'GLIBMM LV2 LILV RAUL SORD SRATOM')
diff --git a/src/server/wscript b/src/server/wscript
index 58a3918a..a5ecbc0f 100644
--- a/src/server/wscript
+++ b/src/server/wscript
@@ -59,7 +59,7 @@ def build(bld):
               target          = 'ingen_server',
               install_path    = '${LIBDIR}',
               use             = 'libingen_shared')
-    core_libs = 'GLIBMM GTHREAD LV2CORE LILV RAUL SORD'
+    core_libs = 'GLIBMM GTHREAD LV2 LILV RAUL SORD'
     autowaf.use_lib(bld, obj, core_libs)
 
     if bld.is_defined('HAVE_JACK'):
@@ -80,4 +80,4 @@ def build(bld):
               target       = 'ingen_lv2',
               install_path = '${LV2DIR}/ingen.lv2/',
               use          = 'libingen_server libingen_shared')
-    autowaf.use_lib(bld, obj, core_libs + ' LV2_STATE')
+    autowaf.use_lib(bld, obj, core_libs)
diff --git a/src/shared/wscript b/src/shared/wscript
index 70806a59..3a122306 100644
--- a/src/shared/wscript
+++ b/src/shared/wscript
@@ -10,7 +10,7 @@ def build(bld):
               vnum            = '0.0.0',
               install_path    = '${LIBDIR}',
               lib             = ['dl'])
-    autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE LILV RAUL SORD LV2_MIDI')
+    autowaf.use_lib(bld, obj, 'GLIBMM LV2 LILV RAUL SORD LV2_MIDI')
 
     obj.source = '''
             AtomReader.cpp
diff --git a/wscript b/wscript
index fd745a24..5f828f0e 100644
--- a/wscript
+++ b/wscript
@@ -89,17 +89,7 @@ def configure(conf):
                define_name='HAVE_POSIX_MEMALIGN',
                mandatory=False)
 
-    autowaf.check_pkg(conf, 'lv2core', uselib_store='LV2CORE')
-    autowaf.check_pkg(conf, 'lv2-lv2plug.in-ns-ext-atom',
-                      uselib_store='LV2_ATOM')
-    autowaf.check_pkg(conf, 'lv2-lv2plug.in-ns-ext-midi',
-                      uselib_store='LV2_MIDI')
-    autowaf.check_pkg(conf, 'lv2-lv2plug.in-ns-ext-patch',
-                      uselib_store='LV2_PATCH')
-    autowaf.check_pkg(conf, 'lv2-lv2plug.in-ns-ext-state',
-                      uselib_store='LV2_STATE')
-    autowaf.check_pkg(conf, 'lv2-lv2plug.in-ns-ext-worker',
-                      uselib_store='LV2_WORKER')
+    autowaf.check_pkg(conf, 'lv2', atleast_version='0.1.0', uselib_store='LV2')
 
     autowaf.define(conf, 'INGEN_VERSION', INGEN_VERSION)
 
@@ -165,8 +155,7 @@ def build(bld):
               defines      = 'VERSION="' + bld.env['INGEN_VERSION'] + '"',
               use          = 'libingen_shared',
               install_path = '${BINDIR}')
-    autowaf.use_lib(bld, obj, 'GTHREAD GLIBMM SORD RAUL LILV INGEN' +
-                    ' LV2CORE LV2_EVENT LV2_URI_MAP LV2_PERSIST')
+    autowaf.use_lib(bld, obj, 'GTHREAD GLIBMM SORD RAUL LILV INGEN LV2')
 
     bld.install_files('${DATADIR}/applications', 'src/ingen/ingen.desktop')
 
-- 
cgit v1.2.1