Merge lp:~3v1n0/bamf/gir-package into lp:bamf/0.4

[Marco Trevisan (Treviño)]

libbamf: use proper GIR dirs and build the gir1.2-bamf-0.2 package

Enabled the construction of the Bamf gir package so that we can have bindings for free.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:517
http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/25/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/./build=pbuilder,distribution=quantal,flavor=amd64/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/./build=pbuilder,distribution=quantal,flavor=i386/25/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/25//rebuild/?

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

* Do we still need gir1.2-gtk-3.0 in the Build-Depends?
* Instead of override_dh_gencontrol, use --with gir (i.e. change rules to be "--with autoreconf,gir")
* The "usr/share/gir-1.0/Bamf-*.gir" file does actually belong in the -dev package. Only the typelib stuff goes into the gir1.2-* package
* You don't need to define GIR_TYPELIBDIR, use INTROSPECTION_TYPELIBDIR (defined by GOBJECT_INTROSPECTION_CHECK) instead
* Likewise, instead of GIR_DATADIR, use INTROSPECTION_GIRDIR
* I believe "0.2" is the wrong version for the gir. It should be Bamf-3.gir/Bamf-3.typelib and gir1.2-bamf-3 as the package name. (see libsecret-1 or libgtk-3 for naming parallels)
* Does ${shlibs:Depends} not add a dep on libbamf3-1 itself?

review: Needs Fixing

[Marco Trevisan (Treviño) (3v1n0)]

> * Do we still need gir1.2-gtk-3.0 in the Build-Depends?

No... I'm removing it as well.

> * Instead of override_dh_gencontrol, use --with gir (i.e. change rules to be "
> --with autoreconf,gir")

Done, thanks

> * The "usr/share/gir-1.0/Bamf-*.gir" file does actually belong in the -dev
> package. Only the typelib stuff goes into the gir1.2-* package

Moved.

> * You don't need to define GIR_TYPELIBDIR, use INTROSPECTION_TYPELIBDIR
> (defined by GOBJECT_INTROSPECTION_CHECK) instead
> * Likewise, instead of GIR_DATADIR, use INTROSPECTION_GIRDIR

Replaced... I was thinking if we had them already defined. Thanks.

> * I believe "0.2" is the wrong version for the gir. It should be
> Bamf-3.gir/Bamf-3.typelib and gir1.2-bamf-3 as the package name. (see
> libsecret-1 or libgtk-3 for naming parallels)

Mh ok... Shouldn't be gir1.2-bamf-3-1 at this point?

> * Does ${shlibs:Depends} not add a dep on libbamf3-1 itself?

It wasn't before... Now it seems to add it.
But it's actually done by ${gir:Depends} since I'm getting this:

dpkg-gencontrol: warning: Depends field of package gir1.2-bamf-3.0: unknown substitution variable ${shlibs:Depends}

Should we get rid of it, right?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:524
http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/26/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/./build=pbuilder,distribution=quantal,flavor=amd64/26/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/./build=pbuilder,distribution=quantal,flavor=i386/26/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/bamf-mbs-ci/26//rebuild/?

review: Needs Fixing (continuous-integration)

[Rico Tzschichholz (ricotz)]

The gir/typelib should be called Bamf-0.4.gir/typelib and the debian package gir1.2-bamf-0.4
It is an API suffix following API changes.

[Michael Terry (mterry)]

I don't believe you're right about 0.4. I think it should be named after the library name/versioning alone.

See http://lists.debian.org/debian-gtk-gnome/2009/09/msg00011.html

The examples they use show no SONAME, but do use the parallel-installable-version in the library name for the typelib. And for bamf, we are currently at libbamf3, so the gir should be Bamf-3.typelib and the package name gir1.2-bamf-3 I believe. Much like gir1.2-secret-1.

[Michael Terry (mterry)]

So, Marco, I know we were waiting on feedback from others, but didrocks pointed me at that Debian email, and it seems relatively clear.

[Marco Trevisan (Treviño) (3v1n0)]

> And for bamf, we are currently
> at libbamf3, so the gir should be Bamf-3.typelib and the package name
> gir1.2-bamf-3 I believe. Much like gir1.2-secret-1.

So... At this point, this branch is fine as it is, isn't it?

[Rico Tzschichholz (ricotz)]

> I don't believe you're right about 0.4. I think it should be named after the
> library name/versioning alone.
>
> See http://lists.debian.org/debian-gtk-gnome/2009/09/msg00011.html
>
> The examples they use show no SONAME, but do use the parallel-installable-
> version in the library name for the typelib. And for bamf, we are currently
> at libbamf3, so the gir should be Bamf-3.typelib and the package name
> gir1.2-bamf-3 I believe. Much like gir1.2-secret-1.

Looking at the debian policy doesn't say much. The usage of gir/typelib isn't bound to the actually library (with its soname) behind it. So if there are ABI breaks it is no concern for the GI bindings to work.
Telepathy-Logger might be a good example here which has a stable API (0.2) but not ABI (currently 3).
So using 0.4, as i mentioned, is the right choice here.

[Michael Terry (mterry)]

@Marco, right you are. This branch already uses 3 as the gir version. But I guess I'll wait to approve until we finish discussing 3 vs 0.4.

@Rico, you're talking more about using the version number of the package, not the API number. 3 is the API here. (The 3 denotes the parallel-installable version number of libbamf3. Much like the 3 in GTK+ 3.) It's not the SONAME.

[Michael Terry (mterry)]

Alright, I think we agreed on IRC that 3 is fine. Rico's concern was that we weren't treating the library version as an API guarantee like we should (which we hadn't in the past when removing API but keeping the 3). But that was a one-off laziness thing, not a policy.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/bamf-mbs-autolanding/50/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-mbs-autolanding/./build=panda-pbuilder,distribution=raring,flavor=armhf/50/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/50/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/50/console

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

I believe you need to add GOBJECT_INTROSPECTION_REQUIRE([1.29]) to configure.ac.
(exact version is iffy, I just stole that number from another app)

[Francis Ginther (fginther)]

I as able to reproduce this inside a pbuilder chroot. The failure looks like a missing build dependency. From the logs:

...
checking for X... yes
checking for gobject-introspection... yes
checking for vapigen... no
...

As a results ${vapigen} appears to be an empty string.

Adding "valac-0.18" to debian/dontrol resolved the issue on my pbuilder.

[lp:~3v1n0/bamf/gir-package]

525. By Marco Trevisan (Treviño) on 2013-01-09

configure.ac: add more errors when checking build tools

526. By Marco Trevisan (Treviño) on 2013-01-09

debian/control: add valac as build depends

=== modified file '.bzrignore'
--- .bzrignore	2012-12-19 18:27:38 +0000
+++ .bzrignore	2013-01-09 23:53:22 +0000
@@ -6,8 +6,7 @@
 autom4te.cache/
 compile
 config.guess
-config.h
-config.h.in
+config.h*
 config.log
 config.status
 config.sub
@@ -32,11 +31,23 @@
 module/libgiodbus_la-gapplaunchhandlerdbus.lo
 src/Makefile
 src/Makefile.in
-src/*-generated.c
-src/*-generated.h
+lib/libbamf/libbamf*.la
+lib/libbamf/libbamf*.pc
+lib/libbamf/libbamf*.vapi
+lib/libbamf/libbamf_la-bamf-application.lo
+lib/libbamf/libbamf_la-bamf-matcher.lo
+lib/libbamf/libbamf_la-bamf-proxy.lo
+lib/libbamf/libbamf_la-bamf-view.lo
+lib/libbamf/Bamf-*.gir
+lib/libbamf/Bamf-*.typelib
+lib/libbamf/bamf-marshal.c
+lib/libbamf/bamf-marshal.h
+lib/libbamf/bamf-tab-source-glue.h
+lib/libbamf/stamp-marshal
+src/bamfdbus-glue.h
 *.lo
 gtk-doc.make
-bamf-0.2.34.tar.gz
+bamf-*.tar.gz
 data/org.ayatana.bamf.service
 doc/reference/libbamf/html
 doc/reference/libbamf/html-build.stamp
@@ -61,19 +72,13 @@
 doc/reference/libbamf/tmpl-build.stamp
 doc/reference/libbamf/tmpl.stamp
 doc/reference/libbamf/xml
-lib/libbamf/Bamf-0.2.gir
-lib/libbamf/Bamf-0.2.typelib
-lib/libbamf/bamf-marshal.c
-lib/libbamf/bamf-marshal.h
-lib/libbamf/bamf-tab-source-glue.h
-lib/libbamf/stamp-marshal
-lib/libbamf/libbamf3.la
-lib/libbamf/libbamf3.pc
-lib/libbamf/libbamf3.vapi
+debian/*/
 m4/gtk-doc.m4
 module/libgiobamf.la
 src/bamf-marshal.h
 src/bamf-marshal.c
+src/bamf-gdbus*-generated.h
+src/bamf-gdbus*-generated.c
 src/bamfdaemon
 src/stamp-marshal
 tests/bamfdaemon/test-bamf

=== modified file 'configure.ac'
--- configure.ac	2012-12-19 18:22:35 +0000
+++ configure.ac	2013-01-09 23:53:22 +0000
@@ -24,9 +24,7 @@
 AC_SUBST(ACLOCAL_AMFLAFS, "$ACLOCAL_FLAGS -I m4")
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test "x$PKG_CONFIG" = "xno"; then
-        AC_MSG_ERROR([You need to install pkg-config])
-fi
+if test "x$PKG_CONFIG" = "xno"; then AC_MSG_ERROR([You need to install pkg-config]); fi
 
 # Checks for programs.
 AC_PROG_CC
@@ -47,11 +45,14 @@
 # glib
 #
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32.0 gio-2.0 >= 2.30.0 gio-unix-2.0)
+AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
+if test -z "$GLIB_GENMARSHAL"; then AC_MSG_ERROR([glib-genmarshal is required but was not found]); fi
 
 #
 # gdbus-codegen
 #
-AC_PATH_PROG([GDBUS_CODEGEN], [gdbus-codegen], AC_MSG_ERROR([gdbus-codegen is required but was not found]))
+AC_PATH_PROG([GDBUS_CODEGEN], [gdbus-codegen])
+if test -z "$GDBUS_CODEGEN"; then AC_MSG_ERROR([gdbus-codegen is required but was not found]); fi
 
 #
 # dbus
@@ -72,9 +73,6 @@
 # libgtop
 #
 PKG_CHECK_MODULES(GTOP, libgtop-2.0)
-PKG_CHECK_MODULES(LIBWSBIND, glib-2.0 gdk-3.0 gdk-x11-3.0 gtk+-3.0)
-AC_SUBST(LIBWSBIND_CFLAGS)
-AC_SUBST(LIBWSBIND_LIBS)
 
 #
 # x11
@@ -91,8 +89,14 @@
 # Vala API Generation
 ###########################
 
-AC_PATH_PROG([VALA_API_GEN], [vapigen])
-AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
+if test "$enable_introspection" = "yes"; then
+  AC_PATH_PROG([VALA_API_GEN], [vapigen])
+  if test -z "$VALA_API_GEN"; then
+    AC_MSG_ERROR([vapigen is needed to build introspection])
+    HAVE_INTROSPECTION=0
+    enable_introspection="no"
+  fi
+fi
 
 ###########################
 # GTK-DOC
@@ -127,6 +131,10 @@
 if test "x$enable_headless_tests" = "xyes"; then
   AC_PATH_PROG([XVFB],[Xvfb])
   AC_PATH_PROG([DBUS_LAUNCH],[dbus-launch])
+
+  if test -z "$XVFB" -o -z "$DBUS_LAUNCH"; then
+    AC_MSG_ERROR([Xvfb and dbus-launch are needed for headless-tests])
+  fi
 fi
 
 ###########################

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-19 16:21:01 +0000
+++ debian/changelog	2013-01-09 23:53:22 +0000
@@ -9,6 +9,8 @@
   * Remove the unneeded library dependencies on libwnck
   * Bump the SONAME
   * Update the package version to libbamf3-1
+  * Enable the gir1.2-bamf-3 package building
+  * Add valac as build-depend
 
  -- Didier Roche <[e-mail]>  Wed, 05 Dec 2012 17:34:41 +0100
 

=== modified file 'debian/control'
--- debian/control	2012-12-19 16:23:32 +0000
+++ debian/control	2013-01-09 23:53:22 +0000
@@ -5,21 +5,18 @@
 Uploaders: Andrea Veri <[e-mail]>
 Build-Depends: dbus-x11,
                debhelper (>= 9),
+               gir1.2-glib-2.0,
                dh-autoreconf,
+               gobject-introspection (>= 0.6.5-3),
+               gtk-doc-tools,
+               libdbus-glib-1-dev,
                libglib2.0-dev (>= 2.32.0),
-               libwnck-3-dev,
                libgtop2-dev,
                libgtk-3-dev (>= 3.0.0),
-               libdbus-glib-1-dev,
-               gtk-doc-tools,
-               gobject-introspection (>= 0.6.5-3),
+               libunity-webapps-dev (>= 2.3.3),
+               libwnck-3-dev,
                libgirepository1.0-dev,
-               gir1.2-atk-1.0,
-               gir1.2-glib-2.0,
-               gir1.2-gtk-3.0 (>= 3.0.0),
-               gir1.2-pango-1.0,
-               gir1.2-wnck-3.0,
-               libunity-webapps-dev (>= 2.3.3),
+               valac,
                xvfb,
 Standards-Version: 3.9.3
 Homepage: https://launchpad.net/bamf
@@ -94,15 +91,14 @@
  .
  This package contains debugging symbols for the daemon and library.
 
-#Package: gir1.2-bamf-0.2
-#Section: libs
-#Architecture: any
-#Depends: ${gir:Depends},
-#         ${shlibs:Depends},
-#         ${misc:Depends}
-#Description: GObject introspection data for the Bamf 0 library
-# This package contains introspection data for the Bamf library.
-# .
-# It can be used by packages using the GIRepository format to generate
-# dynamic bindings.
+Package: gir1.2-bamf-3
+Section: libs
+Architecture: any
+Depends: ${gir:Depends},
+         ${misc:Depends},
+Description: GObject introspection data for the Bamf library
+ This package contains introspection data for the Bamf library.
+ .
+ It can be used by packages using the GIRepository format to generate
+ dynamic bindings.
 

=== renamed file 'debian/gir1.2-bamf-0.2.install' => 'debian/gir1.2-bamf-3.install'
--- debian/gir1.2-bamf-0.2.install	2010-12-17 12:35:53 +0000
+++ debian/gir1.2-bamf-3.install	2013-01-09 23:53:22 +0000
@@ -1,1 +1,1 @@
-#debian/tmp/usr/lib/girepository-1.0/
+usr/lib/girepository-1.0/Bamf-*.typelib

=== removed file 'debian/libbamf-dev.install'
--- debian/libbamf-dev.install	2011-03-29 19:53:03 +0000
+++ debian/libbamf-dev.install	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-debian/tmp/usr/include/libbamf/libbamf/
-debian/tmp/usr/lib/*/pkgconfig/libbamf.pc
-debian/tmp/usr/lib/*/libbamf.so
-#debian/tmp/usr/share/vala/vapi/
-#debian/tmp/usr/share/gir-1.0/

=== modified file 'debian/libbamf3-dev.install'
--- debian/libbamf3-dev.install	2011-06-17 16:42:00 +0000
+++ debian/libbamf3-dev.install	2013-01-09 23:53:22 +0000
@@ -1,5 +1,5 @@
-debian/tmp/usr/include/libbamf3/libbamf/
-debian/tmp/usr/lib/*/pkgconfig/libbamf3.pc
-debian/tmp/usr/lib/*/libbamf3.so
-#debian/tmp/usr/share/vala/vapi/
-#debian/tmp/usr/share/gir-1.0/
+usr/include/libbamf3/libbamf/
+usr/lib/*/pkgconfig/libbamf3.pc
+usr/lib/*/libbamf3.so
+usr/share/vala/vapi/
+usr/share/gir-1.0/

=== modified file 'debian/rules'
--- debian/rules	2012-11-19 18:43:21 +0000
+++ debian/rules	2013-01-09 23:53:22 +0000
@@ -5,13 +5,13 @@
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
 %:
-	dh $@ --with autoreconf
+	dh $@ --with autoreconf,gir
 
 override_dh_autoreconf:
 	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-introspection=no \
+	dh_auto_configure -- --enable-introspection=yes \
 	                     --enable-gtk-doc \
 	                     --enable-headless-tests
 

=== modified file 'doc/reference/libbamf/Makefile.am'
--- doc/reference/libbamf/Makefile.am	2012-11-15 17:45:29 +0000
+++ doc/reference/libbamf/Makefile.am	2013-01-09 23:53:22 +0000
@@ -43,12 +43,12 @@
 # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
 INCLUDES= \
   -I$(top_srcdir)/lib/libbamf   \
-  $(LIBWSBIND_CFLAGS) \
+  $(GTK_CFLAGS) \
   $(GLIB_CFLAGS) \
   $(DBUS_CFLAGS)
 
 GTKDOC_LIBS = \
-  $(LIBWSBIND_LIBS) \
+  $(GTK_LIBS) \
   $(GLIB_LIBS) \
   $(DBUS_LIBS) \
   $(top_builddir)/lib/libbamf/libbamf$(LIBBAMF_VER).la

=== renamed file 'lib/libbamf/Bamf-0.2.metadata' => 'lib/libbamf/Bamf-3.metadata'
=== modified file 'lib/libbamf/Makefile.am'
--- lib/libbamf/Makefile.am	2012-12-19 16:01:25 +0000
+++ lib/libbamf/Makefile.am	2013-01-09 23:53:22 +0000
@@ -49,7 +49,6 @@
   $(NULL)
 
 libbamf3_la_LIBADD = \
-  $(LIBWSBIND_LIBS) \
   $(GLIB_LIBS) \
   $(DBUS_LIBS) \
   $(NULL)
@@ -62,7 +61,6 @@
   -I$(top_builddir)/lib \
   -I$(top_srcdir)/lib/libbamf \
   -I$(top_builddir)/lib/libbamf \
-  $(LIBWSBIND_CFLAGS) \
   $(GLIB_CFLAGS) \
   $(DBUS_CFLAGS) \
   $(COVERAGE_CFLAGS) \
@@ -102,39 +100,37 @@
 
 
 #########################
-# GObject Introsepction 
+# GObject Introsepction
 #########################
 
-INTROSPECTION_GIRS = 
+if HAVE_INTROSPECTION
+
+INTROSPECTION_GIRS = Bamf-3.gir
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
-if HAVE_INTROSPECTION
-
 introspection_sources = \
 	$(libbamf_headers) \
 	$(libbamf_sources) \
 	$(NULL)
 
-Bamf-0.2.gir: libbamf$(LIBBAMF_VER).la
-Bamf_0_2_gir_INCLUDES = GObject-2.0 GLib-2.0
-Bamf_0_2_gir_CFLAGS = \
+Bamf-3.gir: libbamf$(LIBBAMF_VER).la
+Bamf_3_gir_INCLUDES = GObject-2.0 GLib-2.0
+Bamf_3_gir_CFLAGS = \
 	--warn-all \
 	--c-include='libbamf/libbamf.h' \
 	$(DBUS_CFLAGS) \
 	-I$(top_srcdir)/lib \
 	-I$(top_builddir)/lib \
 	$(NULL)
-Bamf_0_2_gir_LIBS = libbamf$(LIBBAMF_VER).la
-Bamf_0_2_gir_FILES = $(introspection_sources)
-Bamf_0_2_gir_EXPORT_PACKAGES = libbamf$(LIBBAMF_VER)
-
-INTROSPECTION_GIRS += Bamf-0.2.gir
-
-girdir = $(datadir)/gir-1.0
+Bamf_3_gir_LIBS = libbamf$(LIBBAMF_VER).la
+Bamf_3_gir_FILES = $(introspection_sources)
+Bamf_3_gir_EXPORT_PACKAGES = libbamf$(LIBBAMF_VER)
+
+girdir = $(INTROSPECTION_GIRDIR)
 gir_DATA = $(INTROSPECTION_GIRS)
 
-typelibdir = $(libdir)/girepository-1.0
+typelibdir = $(INTROSPECTION_TYPELIBDIR)
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES += $(gir_DATA) $(typelib_DATA)

=== modified file 'tests/functional/Makefile.am'
--- tests/functional/Makefile.am	2012-11-14 19:30:00 +0000
+++ tests/functional/Makefile.am	2013-01-09 23:53:22 +0000
@@ -15,13 +15,13 @@
   -I$(top_builddir)/lib/libbamf \
   -DDATADIR=\""$(datadir)"\" \
   -DWNCK_I_KNOW_THIS_IS_UNSTABLE \
-  $(LIBWSBIND_CFLAGS) \
+  $(GTK_CFLAGS) \
   $(GLIB_CFLAGS) \
   $(DBUS_CFLAGS) \
   $(NULL)
 
 alt_tabber_LDADD = \
-  $(LIBWSBIND_LIBS) \
+  $(GTK_LIBS) \
   $(GLIB_LIBS) \
   $(DBUS_LIBS) \
   $(top_builddir)/lib/libbamf/libbamf$(LIBBAMF_VER).la
@@ -35,13 +35,13 @@
   -I$(top_builddir)/lib/libbamf \
   -DDATADIR=\""$(datadir)"\" \
   -DWNCK_I_KNOW_THIS_IS_UNSTABLE \
-  $(LIBWSBIND_CFLAGS) \
+  $(GTK_CFLAGS) \
   $(GLIB_CFLAGS) \
   $(DBUS_CFLAGS) \
   $(NULL)
 
 tab_source_test_LDADD = \
-  $(LIBWSBIND_LIBS) \
+  $(GTK_LIBS) \
   $(GLIB_LIBS) \
   $(DBUS_LIBS) \
   $(top_builddir)/lib/libbamf/libbamf$(LIBBAMF_VER).la
@@ -55,13 +55,13 @@
   -I$(top_builddir)/lib/libbamf \
   -DDATADIR=\""$(datadir)"\" \
   -DWNCK_I_KNOW_THIS_IS_UNSTABLE \
-  $(LIBWSBIND_CFLAGS) \
+  $(GTK_CFLAGS) \
   $(GLIB_CFLAGS) \
   $(DBUS_CFLAGS) \
   $(NULL)
 
 interaction_tester_LDADD = \
-  $(LIBWSBIND_LIBS) \
+  $(GTK_LIBS) \
   $(GLIB_LIBS) \
   $(DBUS_LIBS) \
   $(top_builddir)/lib/libbamf/libbamf$(LIBBAMF_VER).la
@@ -69,5 +69,5 @@
 
 # desktop-file-launcher
 desktop_file_launcher_SOURCES = desktop-file-launcher.c
-desktop_file_launcher_CPPFLAGS = $(GLIB_CFLAGS) $(LIBWSBIND_CFLAGS)
-desktop_file_launcher_LDFLAGS = $(GLIB_LIBS) $(LIBWSBIND_LIBS)
+desktop_file_launcher_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS)
+desktop_file_launcher_LDFLAGS = $(GLIB_LIBS) $(GTK_LIBS)

=== modified file 'tests/libbamf/Makefile.am'
--- tests/libbamf/Makefile.am	2012-12-19 16:01:25 +0000
+++ tests/libbamf/Makefile.am	2013-01-09 23:53:22 +0000
@@ -13,16 +13,12 @@
   -I$(top_builddir)/lib/libbamf \
   -DTESTDIR=\""$(abs_top_srcdir)/tests/libbamf"\" \
   $(GCC_FLAGS) \
-  $(GTK_CFLAGS) \
-  $(LIBWSBIND_CFLAGS) \
   $(DBUS_CFLAGS) \
   $(GLIB_CFLAGS)
 
 test_libbamf_LDADD = \
   $(top_builddir)/lib/libbamf/libbamf$(LIBBAMF_VER).la \
-  $(LIBWSBIND_LIBS) \
   $(GLIB_LIBS) \
-  $(GTK_LIBS) \
   $(DBUS_LIBS)
 
 TEST_BINARY = test-libbamf

=== modified file 'tests/libbamf/test-libbamf.c'
--- tests/libbamf/test-libbamf.c	2012-10-27 07:31:54 +0000
+++ tests/libbamf/test-libbamf.c	2013-01-09 23:53:22 +0000
@@ -1,23 +1,21 @@
-//  
+//
 //  Copyright (C) 2009 Canonical Ltd.
-// 
+//
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
 //  the Free Software Foundation, either version 3 of the License, or
 //  (at your option) any later version.
-// 
+//
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-// 
+//
 
 #include <stdio.h>
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
 #include <glib.h>
 
 #include <dbus/dbus-glib.h>
@@ -26,7 +24,7 @@
 
 
 void test_matcher_create_suite (void);
- 
+
 gint
 main (gint argc, gchar *argv[])
 {
@@ -35,11 +33,9 @@
 #endif
   g_test_init (&argc, &argv, NULL);
 
-  gtk_init (&argc, &argv);
-
   dbus_g_thread_init ();
 
   test_matcher_create_suite ();
-  
+
   return g_test_run ();
 }