summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-01-19 21:05:33 +0000
committerDavid Robillard <d@drobilla.net>2008-01-19 21:05:33 +0000
commit2356f96fbd6c9d70dedcd0d64bf0d72786ea36bb (patch)
tree7ac90d6ac91b65bde3235dbfcac31c33fa32c5d6
parentdb41487d2a0eeda9323b1c46cbb83957d5137454 (diff)
downloadingen-2356f96fbd6c9d70dedcd0d64bf0d72786ea36bb.tar.gz
ingen-2356f96fbd6c9d70dedcd0d64bf0d72786ea36bb.tar.bz2
ingen-2356f96fbd6c9d70dedcd0d64bf0d72786ea36bb.zip
LV2 packaging fixes for building from top level.
git-svn-id: http://svn.drobilla.net/lad/ingen@1075 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--configure.ac1
-rw-r--r--src/libs/engine/Makefile.am8
-rw-r--r--src/libs/engine/OSCBuffer.hpp2
3 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index d8cb3cce..4a092c39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,7 @@ abs_srcdir=`pwd`
cd $builddir
PKG_CHECK_MODULES([SLV2], [libslv2])
+PKG_CHECK_MODULES([LV2_OSC], [lv2_osc])
PKG_CHECK_MODULES([RAUL], [raul])
PKG_CHECK_MODULES([FLOWCANVAS], [flowcanvas])
diff --git a/src/libs/engine/Makefile.am b/src/libs/engine/Makefile.am
index 57870bbe..ee515581 100644
--- a/src/libs/engine/Makefile.am
+++ b/src/libs/engine/Makefile.am
@@ -14,7 +14,8 @@ libingen_engine_la_CXXFLAGS = \
@RAUL_CFLAGS@ \
@REDLAND_CFLAGS@ \
@REDLANDMM_CFLAGS@ \
- @SLV2_CFLAGS@
+ @SLV2_CFLAGS@ \
+ @LV2_OSC_CFLAGS@
libingen_engine_la_LDFLAGS = -no-undefined -module -avoid-version
libingen_engine_la_LIBADD = \
@@ -25,13 +26,12 @@ libingen_engine_la_LIBADD = \
@RAUL_LIBS@ \
@REDLAND_LIBS@ \
@REDLANDMM_LIBS@ \
- @SLV2_LIBS@
+ @SLV2_LIBS@ \
+ @LV2_OSC_LIBS@
AM_CFLAGS=-std=c99
libingen_engine_la_SOURCES = \
- ../../../../lv2/extensions/osc/lv2_osc.c \
- ../../../../lv2/extensions/osc/lv2_osc_print.c \
AudioBuffer.cpp \
AudioBuffer.hpp \
AudioDriver.hpp \
diff --git a/src/libs/engine/OSCBuffer.hpp b/src/libs/engine/OSCBuffer.hpp
index b939b764..701cc57f 100644
--- a/src/libs/engine/OSCBuffer.hpp
+++ b/src/libs/engine/OSCBuffer.hpp
@@ -20,7 +20,7 @@
#include "Buffer.hpp"
#include "interface/DataType.hpp"
-#include "../../../../lv2/extensions/osc/lv2_osc.h"
+#include "lv2/osc/lv2_osc.h"
namespace Ingen {