3 files changed, 22 insertions, 10 deletions
diff --git a/src/libs/client/Makefile.am b/src/libs/client/Makefile.am
index 72134359..e9314c55 100644
--- a/src/libs/client/Makefile.am
+++ b/src/libs/client/Makefile.am
@@ -8,15 +8,27 @@ module_LTLIBRARIES = libingen_client.la
 libingen_client_la_CXXFLAGS = \
 	-DPKGDATADIR=\"$(pkgdatadir)\" \
 	@INGEN_CFLAGS@ \
-	@RAUL_CFLAGS@ \
+	@GLIBMM_CFLAGS@ \
 	@LIBLO_CFLAGS@ \
-	@LXML2_CFLAGS@ @RASQAL_CFLAGS@ @RAPTOR_CFLAGS@ \
-	@LSIGCPP_CFLAGS@ @GLIBMM_CFLAGS@
+	@LSIGCPP_CFLAGS@ \
+	@GLIBMM_CFLAGS@ \
+	@LXML2_CFLAGS@ \
+	@RAPTOR_CFLAGS@ \
+	@RASQAL_CFLAGS@ \
+	@RAUL_CFLAGS@ \
+	@REDLANDMM_CFLAGS@ \
+	@SLV2_CFLAGS@
 
 libingen_client_la_LIBADD = \
-	@RAUL_LIBS@ @SLV2_LIBS@ @LIBLO_LIBS@ \
-	@LXML2_LIBS@ @RASQAL_LIBS@ @RAPTOR_LIBS@ \
-	@LSIGCPP_LIBS@ @GLIBMM_LIBS@
+	@GLIBMM_LIBS@ \
+	@LIBLO_LIBS@ \
+	@LSIGCPP_LIBS@ \
+	@LXML2_LIBS@ \
+	@RAPTOR_LIBS@ \
+	@RASQAL_LIBS@ \
+	@RAUL_LIBS@ \
+	@REDLANDMM_LIBS@ \
+	@SLV2_LIBS@
 
 libingen_client_la_SOURCES = \
 	$(top_srcdir)/ingen/src/common/interface/ClientInterface.hpp \
diff --git a/src/libs/client/PluginModel.cpp b/src/libs/client/PluginModel.cpp
index 069c0157..868af34d 100644
--- a/src/libs/client/PluginModel.cpp
+++ b/src/libs/client/PluginModel.cpp
@@ -32,7 +32,7 @@ SLV2World   PluginModel::_slv2_world   = NULL;
 SLV2Plugins PluginModel::_slv2_plugins = NULL;
 #endif
 
-Raul::RDF::World* PluginModel::_rdf_world = NULL;
+Redland::World* PluginModel::_rdf_world = NULL;
 	
 
 string
diff --git a/src/libs/client/PluginModel.hpp b/src/libs/client/PluginModel.hpp
index 75cf70f5..95a68dbe 100644
--- a/src/libs/client/PluginModel.hpp
+++ b/src/libs/client/PluginModel.hpp
@@ -95,11 +95,11 @@ public:
 	static string get_lv2_icon_path(SLV2Plugin plugin);
 #endif
 
-	static void set_rdf_world(Raul::RDF::World& world) {
+	static void set_rdf_world(Redland::World& world) {
 		_rdf_world = &world;
 	}
 
-	static Raul::RDF::World* rdf_world() { return _rdf_world; }
+	static Redland::World* rdf_world() { return _rdf_world; }
 
 private:
 	const Type   _type;
@@ -115,7 +115,7 @@ private:
 	mutable string _icon_path;
 #endif
 
-	static Raul::RDF::World* _rdf_world;
+	static Redland::World* _rdf_world;
 };