Drop glibmm dependency in build stuff (raul depends only on glib).

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

3 files changed, 9 insertions, 11 deletions

diff --git a/raul.pc.in b/raul.pc.in
index 1f07f8d..316ed2c 100644
--- a/raul.pc.in
+++ b/raul.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: raul
 Version: @RAUL_VERSION@
 Description: A C++ convenience library for realtime audio applications
-Libs: -L${libdir} -lraul @GLIBMM_LIBS@ @GTHREAD_LIBS@
-Cflags: -I${includedir} @GLIBMM_CFLAGS@ @GTHREAD_CFLAGS@
+Libs: -L${libdir} -lraul @GLIB_LIBS@ @GTHREAD_LIBS@
+Cflags: -I${includedir} @GLIB_CFLAGS@ @GTHREAD_CFLAGS@
diff --git a/test/ringbuffer_test.cpp b/test/ringbuffer_test.cpp
index 87b81c6..3a36bb8 100644
--- a/test/ringbuffer_test.cpp
+++ b/test/ringbuffer_test.cpp
@@ -22,7 +22,7 @@ print_buf(size_t size, char* buf)
 int
 main()
 {
-	RingBuffer<char> rb(5);
+	RingBuffer rb(5);
 
 	char ev[] = { 'a', 'b', 'c' };
 
diff --git a/wscript b/wscript
index 3239e20..44c7067 100644
--- a/wscript
+++ b/wscript
@@ -47,8 +47,6 @@ def configure(conf):
 	conf.check_tool('compiler_cxx')
 	autowaf.check_pkg(conf, 'glib-2.0', atleast_version='2.2',
 					  uselib_store='GLIB', mandatory=True)
-	autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM',
-					  atleast_version='2.14.0', mandatory=True)
 	autowaf.check_pkg(conf, 'gthread-2.0', atleast_version='2.14.0',
 					  uselib_store='GTHREAD', mandatory=True)
 	
@@ -90,7 +88,7 @@ def build(bld):
 	bld.install_files('${INCLUDEDIR}/raul', bld.path.ant_glob('raul/*.h'))
 
 	# Pkgconfig file
-	autowaf.build_pc(bld, 'RAUL', RAUL_VERSION, 'GLIBMM GTHREAD')
+	autowaf.build_pc(bld, 'RAUL', RAUL_VERSION, 'GLIB GTHREAD')
 
 	lib_source = '''
 		src/Configuration.cpp
@@ -110,18 +108,18 @@ def build(bld):
 	obj.includes        = ['.', './src']
 	obj.name            = 'libraul'
 	obj.target          = 'raul'
-	obj.uselib          = 'GLIBMM GTHREAD'
+	obj.uselib          = 'GLIB GTHREAD'
 	obj.install_path    = '${LIBDIR}'
 	obj.vnum            = RAUL_LIB_VERSION
 	
 	if bld.env['BUILD_TESTS']:
 		# Static library (for unit test code coverage)
-		obj = bld(features = 'cxx cxxstaticlib')
+		obj = bld(features = 'cxx cxxstlib')
 		obj.source       = lib_source
 		obj.includes     = ['.', './src']
 		obj.name         = 'libraul_static'
 		obj.target       = 'raul_static'
-		obj.uselib       = 'GLIBMM GTHREAD'
+		obj.uselib       = 'GLIB GTHREAD'
 		obj.install_path = ''
 		obj.cxxflags     = [ '-fprofile-arcs',  '-ftest-coverage' ]
 
@@ -131,8 +129,8 @@ def build(bld):
 			obj.source       = i + '.cpp'
 			obj.includes     = ['.', './src']
 			obj.use          = 'libraul_static'
-			obj.uselib       = 'GLIB GLIBMM'
-			obj.libs         = 'gcov'
+			obj.uselib       = 'GLIB GTHREAD'
+			obj.linkflags    = '-lgcov'
 			obj.target       = i
 			obj.install_path = ''
 			obj.cxxflags     = [ '-fprofile-arcs',  '-ftest-coverage' ]