Merge lp:~3v1n0/bamf/remove-gtk2 into lp:bamf/0.4

[Marco Trevisan (Treviño)]

Autconf, debian: remove the legacy gtk-2 support and factorize the test building code

Remove the gtk2 dependencies from build system. Don't build gtk2 packages anymore as they are not needed.

Also, cleanup the building of tests, factorizing the shared code into just one makefile.

[lp:~3v1n0/bamf/remove-gtk2]

506. By Marco Trevisan (Treviño) on 2012-11-15

debian: update changelog

[Michael Terry (mterry)]

* You should also remove libwnck-dev from debian/control.
* In debian/rules, you can drop all the -Bbuild flags. And if that makes the call a no-op (like override_dh_auto_build just being a call to dh_auto_build), you can drop the override stanza altogether.
* You can probably just drop LIBBAMF_VER, since we hardcode the 3 enough other places. But if you like to keep it, that's fine too.
* When building, I get the following warnings and error:
lib/libbamf/Makefile.am:81: BUILT_SOURCES multiply defined in condition TRUE ...
lib/libbamf/Makefile.am:3: ... `BUILT_SOURCES' previously defined here
lib/libbamf/Makefile.am: installing `./depcomp'
src/Makefile.am:113: BUILT_SOURCES multiply defined in condition TRUE ...
src/Makefile.am:4: ... `BUILT_SOURCES' previously defined here
automake-1.11: cannot open < tests/Makefile.am.tests: No such file or directory
dh_autoreconf: ./autogen.sh returned exit code 1

Looks like a typo of .tests vs .gtests

review: Needs Fixing

[lp:~3v1n0/bamf/remove-gtk2]

507. By Marco Trevisan (Treviño) on 2012-11-19

debian: update glib2 dependency and changelog

508. By Marco Trevisan (Treviño) on 2012-11-19

debian/rules: demoved the unneeded overrides

509. By Marco Trevisan (Treviño) on 2012-11-19

Autoconf: point to correct Makefile in testing.

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

> * You should also remove libwnck-dev from debian/control.

Done.

> * In debian/rules, you can drop all the -Bbuild flags. And if that makes the
> call a no-op (like override_dh_auto_build just being a call to dh_auto_build),
> you can drop the override stanza altogether.

Right, done as well.

> * When building, I get the following warnings and error:
> automake-1.11: cannot open < tests/Makefile.am.tests: No such file or
> Looks like a typo of .tests vs .gtests

Warnings are somewhat needed for now (but I'll get rid of them soon), typo fixed. Sorry for this, I just didn't remove the renamed file locally so I was not getting the issue at all. :/

[Michael Terry (mterry)]

Looks fine now. Thanks!

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-11-14 15:17:02 +0000
+++ configure.ac	2012-11-19 18:45:28 +0000
@@ -4,6 +4,7 @@
 AC_PREREQ([2.63])
 AC_INIT(bamf, 0.4.0, [e-mail])
 AC_PREREQ(2.62)
+AC_SUBST(LIBBAMF_VER, 3)
 
 AC_CONFIG_SRCDIR(src/main.c)
 AC_CONFIG_HEADERS(config.h)
@@ -13,7 +14,6 @@
 
 AC_CONFIG_MACRO_DIR([m4])
 
-
 GNOME_COMMON_INIT
 GNOME_COMPILE_WARNINGS(maximum)
 
@@ -39,17 +39,6 @@
 SHAMROCK_EXPAND_DATADIR
 
 #
-# gtk version
-#
-AC_ARG_WITH([gtk],
-  [AS_HELP_STRING([--with-gtk],
-    [Which version of gtk to use @<:@default=3@:>@])],
-  [],
-  [with_gtk=3])
-
-AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
-
-#
 # pkg-config
 #
 PKG_PROG_PKG_CONFIG
@@ -77,23 +66,13 @@
 #
 # libwnck
 #
-if test "x$with_gtk" = "x2"; then
-  PKG_CHECK_MODULES(WNCK, libwnck-1.0)
-else
-  PKG_CHECK_MODULES(WNCK, libwnck-3.0)
-  AC_DEFINE_UNQUOTED(USE_GTK3, , [Use GTK3])
-fi
+PKG_CHECK_MODULES(WNCK, libwnck-3.0)
 
 #
 # libgtop
 #
 PKG_CHECK_MODULES(GTOP, libgtop-2.0)
-
-if test "x$with_gtk" = "x2"; then
-  PKG_CHECK_MODULES(LIBWSBIND, glib-2.0 gdk-2.0 gdk-x11-2.0 gtk+-2.0)
-else
-  PKG_CHECK_MODULES(LIBWSBIND, glib-2.0 gdk-3.0 gdk-x11-3.0 gtk+-3.0)
-fi
+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)
 
@@ -153,11 +132,7 @@
 #
 # Gnome/GTK checks
 #
-if test "x$with_gtk" = "x2"; then
-  AM_PATH_GTK_2_0
-else
-  AM_PATH_GTK_3_0
-fi
+AM_PATH_GTK_3_0
 
 dnl CFLAGS
 CFLAGS="$CFLAGS -Wall -Werror -lm"
@@ -192,7 +167,6 @@
   Build Environment
     Install Prefix:     ${prefix}
     Introspection:      ${enable_introspection}
-    GTK+ Version:       ${with_gtk}
     Unity Webapps:      ${enable_webapps}
     Headless tests:     ${enable_headless_tests}
 

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-14 16:01:34 +0000
+++ debian/changelog	2012-11-19 18:45:28 +0000
@@ -12,6 +12,11 @@
 
   [ Marco Trevisan (Treviño) ]
   * Bumping version to 0.4.0
+  * debian/control:
+    - Removed the gtk2 dependencies and packages
+    - Dependency on libglib2.0-dev updated to match the configure.ac value
+  * debian/rules:
+    - Removed the unneded dh overrides
 
   [ Didier Roche ]
   * Automatic snapshot from revision 494 (bootstrap)

=== modified file 'debian/control'
--- debian/control	2012-11-07 19:51:56 +0000
+++ debian/control	2012-11-19 18:45:28 +0000
@@ -6,11 +6,9 @@
 Build-Depends: dbus-x11,
                debhelper (>= 9),
                dh-autoreconf,
-               libglib2.0-dev (>= 2.28.0~),
-               libwnck-dev,
+               libglib2.0-dev (>= 2.32.0),
                libwnck-3-dev,
                libgtop2-dev,
-               libgtk2.0-dev (>= 2.12.0),
                libgtk-3-dev (>= 3.0.0),
                libdbus-glib-1-dev,
                gtk-doc-tools,
@@ -18,7 +16,6 @@
                libgirepository1.0-dev,
                gir1.2-atk-1.0,
                gir1.2-glib-2.0,
-               gir1.2-gtk-2.0 (>= 2.19.5),
                gir1.2-gtk-3.0 (>= 3.0.0),
                gir1.2-pango-1.0,
                gir1.2-wnck-3.0,
@@ -42,19 +39,6 @@
  module that facilitates the matching of applications started
  through GDesktopAppInfo
 
-Package: libbamf0
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         bamfdaemon (= ${binary:Version}),
-Breaks: unity (<< 3.2.12)
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Description: Window matching library - shared library (gtk2)
- bamf matches application windows to desktop files
- .
- This package contains shared libraries to be used by gtk2 applications.
-
 Package: libbamf3-0
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -68,21 +52,6 @@
  .
  This package contains shared libraries to be used by applications.
 
-Package: libbamf-dev
-Section: libdevel
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libbamf0 (= ${binary:Version}),
-         libwnck-dev,
-         libglib2.0-dev (>= 2.23.0-1ubuntu3~),
-Suggests: libbamf-doc
-Description: Window matching library - development files (gtk2)
- bamf matches application windows to desktop files
- .
- This package contains files that are needed to build applications on
- gtk2 stack.
-
 Package: libbamf3-dev
 Section: libdevel
 Architecture: any

=== modified file 'debian/rules'
--- debian/rules	2012-11-14 15:04:32 +0000
+++ debian/rules	2012-11-19 18:45:28 +0000
@@ -11,30 +11,12 @@
 	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
 
 override_dh_auto_configure:
-	dh_auto_configure -Bbuild/gtk2 -- --enable-introspection=no \
-	                                  --enable-headless-tests \
-	                                  --disable-webapps \
-	                                  --with-gtk=2
-	dh_auto_configure -Bbuild/gtk3 -- --enable-introspection=no \
-	                                  --enable-gtk-doc \
-	                                  --enable-headless-tests \
-	                                  --with-gtk=3
-
-override_dh_auto_build:
-	dh_auto_build -Bbuild/gtk2
-	dh_auto_build -Bbuild/gtk3
-
-override_dh_auto_clean:
-	dh_auto_clean -Bbuild/gtk2
-	dh_auto_clean -Bbuild/gtk3
-
-override_dh_auto_test:
-	dh_auto_test -Bbuild/gtk2
-	dh_auto_test -Bbuild/gtk3
+	dh_auto_configure -- --enable-introspection=no \
+	                     --enable-gtk-doc \
+	                     --enable-headless-tests
 
 override_dh_auto_install:
-	dh_auto_install -Bbuild/gtk2
-	dh_auto_install -Bbuild/gtk3
+	dh_auto_install
 	find debian/tmp/usr/lib -name \*.la -exec rm {} \;
 	find debian/tmp/usr/lib -name \*.a -exec rm {} \;
 

=== modified file 'doc/reference/libbamf/Makefile.am'
--- doc/reference/libbamf/Makefile.am	2011-08-04 07:11:37 +0000
+++ doc/reference/libbamf/Makefile.am	2012-11-19 18:45:28 +0000
@@ -1,11 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-if USE_GTK3
-VER=3
-else
-VER=
-endif
-
 # automake requirements
 AUTOMAKE_OPTIONS = 1.7
 
@@ -57,11 +51,11 @@
   $(LIBWSBIND_LIBS) \
   $(GLIB_LIBS) \
   $(DBUS_LIBS) \
-  $(top_builddir)/lib/libbamf/libbamf$(VER).la
+  $(top_builddir)/lib/libbamf/libbamf$(LIBBAMF_VER).la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += 
+EXTRA_DIST +=

=== modified file 'lib/libbamf/Makefile.am'
--- lib/libbamf/Makefile.am	2012-10-12 10:30:22 +0000
+++ lib/libbamf/Makefile.am	2012-11-19 18:45:28 +0000
@@ -1,15 +1,7 @@
-if USE_GTK3
-VER=3
-lib_LTLIBRARIES = libbamf3.la
-else
-VER=
-lib_LTLIBRARIES = libbamf.la
-endif
-
 CLEANFILES =
 DISTCLEANFILES =
 BUILT_SOURCES =
-EXTRA_DIST = 
+EXTRA_DIST =
 
 include $(top_srcdir)/Makefile.am.marshal
 -include $(INTROSPECTION_MAKEFILE)
@@ -44,7 +36,9 @@
   libbamf.h \
   $(NULL)
 
-libbamf_la_SOURCES = \
+lib_LTLIBRARIES = libbamf3.la
+
+libbamf3_la_SOURCES = \
   bamf-factory.h \
   bamf-application-private.h \
   bamf-view-private.h \
@@ -52,17 +46,17 @@
   $(libbamf_sources) \
   $(NULL)
 
-nodist_libbamf_la_SOURCES = \
+nodist_libbamf3_la_SOURCES = \
   $(libbamf_built_sources)
   $(NULL)
 
-libbamf_la_LIBADD = \
+libbamf3_la_LIBADD = \
   $(LIBWSBIND_LIBS) \
   $(GLIB_LIBS) \
   $(DBUS_LIBS) \
   $(NULL)
 
-libbamf_la_CPPFLAGS = \
+libbamf3_la_CPPFLAGS = \
   -Wall -std=c99 \
   -fPIC \
   -DDATADIR=\""$(datadir)"\" \
@@ -75,17 +69,11 @@
   $(DBUS_CFLAGS) \
   $(NULL)
 
-libbamf_la_LDFLAGS = \
+libbamf3_la_LDFLAGS = \
   -shared \
   -export-symbols-regex "^bamf_" \
   $(NULL)
 
-libbamf3_la_SOURCES = $(libbamf_la_SOURCES)
-nodist_libbamf3_la_SOURCES = $(libbamf_built_sources)
-libbamf3_la_LIBADD = $(libbamf_la_LIBADD)
-libbamf3_la_CPPFLAGS = $(libbamf_la_CPPFLAGS)
-libbamf3_la_LDFLAGS = $(libbamf_la_LDFLAGS)
-
 glib_marshal_list = bamf-marshal.list
 glib_marshal_prefix = _bamf_marshal
 
@@ -103,13 +91,13 @@
 
 EXTRA_DIST += bamf-tab-source-glue.xml
 
-libbamf_includedir=$(includedir)/libbamf$(VER)/libbamf
+libbamf_includedir=$(includedir)/libbamf$(LIBBAMF_VER)/libbamf
 libbamf_include_HEADERS = \
 	$(libbamf_headers)
 
 libbamf_pcdir = $(libdir)/pkgconfig
 libbamf_pc_DATA = \
-	libbamf$(VER).pc
+	libbamf$(LIBBAMF_VER).pc
 
 
 #########################
@@ -127,7 +115,7 @@
 	$(libbamf_sources) \
 	$(NULL)
 
-Bamf-0.2.gir: libbamf.la
+Bamf-0.2.gir: libbamf$(LIBBAMF_VER).la
 Bamf_0_2_gir_INCLUDES = GObject-2.0 GLib-2.0
 Bamf_0_2_gir_CFLAGS = \
 	--warn-all \
@@ -136,9 +124,9 @@
 	-I$(top_srcdir)/lib \
 	-I$(top_builddir)/lib \
 	$(NULL)
-Bamf_0_2_gir_LIBS = libbamf.la
+Bamf_0_2_gir_LIBS = libbamf$(LIBBAMF_VER).la
 Bamf_0_2_gir_FILES = $(introspection_sources)
-Bamf_0_2_gir_EXPORT_PACKAGES = libbamf$(VER)
+Bamf_0_2_gir_EXPORT_PACKAGES = libbamf$(LIBBAMF_VER)
 
 INTROSPECTION_GIRS += Bamf-0.2.gir
 
@@ -159,7 +147,7 @@
 if HAVE_INTROSPECTION
 
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = libbamf$(VER).vapi
+vapi_DATA = libbamf$(LIBBAMF_VER).vapi
 
 $(vapi_DATA): $(INTROSPECTION_GIRS)
 	$(AM_V_GEN)$(VALA_API_GEN) --library=$(@:.vapi=) $<

=== modified file 'src/bamf-legacy-window.c'
--- src/bamf-legacy-window.c	2012-11-05 20:04:01 +0000
+++ src/bamf-legacy-window.c	2012-11-19 18:45:28 +0000
@@ -48,10 +48,6 @@
 {
   WnckWindow * legacy_window;
   char       * mini_icon_path;
-#ifndef USE_GTK3
-  char       * group_name;
-  char       * instance_name;
-#endif
   gulong       closed_id;
   gulong       name_changed_id;
   gulong       state_changed_id;
@@ -128,18 +124,7 @@
   if (!window)
     return NULL;
 
-#ifdef USE_GTK3
   return wnck_window_get_class_instance_name (window);
-
-#else
-  if (!self->priv->instance_name)
-    {
-      Window xid = wnck_window_get_xid (window);
-      bamf_xutils_get_window_class_hints (xid, &self->priv->instance_name, NULL);
-    }
-
-  return self->priv->instance_name;
-#endif
 }
 
 const char *
@@ -157,18 +142,7 @@
   if (!window)
     return NULL;
 
-#ifdef USE_GTK3
   return wnck_window_get_class_group_name (window);
-
-#else
-  if (!self->priv->group_name)
-    {
-      Window xid = wnck_window_get_xid (window);
-      bamf_xutils_get_window_class_hints (xid, NULL, &self->priv->group_name);
-    }
-
-  return self->priv->group_name;
-#endif
 }
 
 const char *
@@ -531,20 +505,6 @@
       self->priv->mini_icon_path = NULL;
     }
 
-#ifndef USE_GTK3
-  if (self->priv->group_name)
-    {
-      g_free (self->priv->group_name);
-      self->priv->group_name = NULL;
-    }
-
-  if (self->priv->instance_name)
-    {
-      g_free (self->priv->instance_name);
-      self->priv->instance_name = NULL;
-    }
-#endif
-
   if (self->priv->legacy_window)
     {
       g_signal_handler_disconnect (self->priv->legacy_window,

=== modified file 'src/bamf-xutils.c'
--- src/bamf-xutils.c	2012-10-09 08:32:34 +0000
+++ src/bamf-xutils.c	2012-11-19 18:45:28 +0000
@@ -175,4 +175,7 @@
 
   XFree (class_hint.res_class);
   XFree (class_hint.res_name);
+
+  if (close_display)
+    XCloseDisplay (xdisplay);
 }

=== added file 'tests/Makefile.am.gtests'
--- tests/Makefile.am.gtests	1970-01-01 00:00:00 +0000
+++ tests/Makefile.am.gtests	2012-11-19 18:45:28 +0000
@@ -0,0 +1,50 @@
+# Utility targets for testing. The variable $(TEST_BINARY) defines the binary
+# to be ran to perform the gtests.
+#
+# Author: Marco Trevisan <[e-mail]>
+
+# Run tests as part of make check
+if ENABLE_HEADLESS_TESTS
+check-local: test-headless
+
+XVFB_RUN = $(abs_top_srcdir)/tests/run-xvfb.sh
+LOG_PATH = headless-logs
+test-headless:
+	set -e; \
+	rm -rf $(LOG_PATH); \
+	mkdir $(LOG_PATH); \
+	export LOG_PATH=$(LOG_PATH); \
+	export XVFB_PATH=$(XVFB); \
+	export DISPLAY=""; \
+	source $(XVFB_RUN); \
+	\
+	$(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
+	source $(LOG_PATH)/sessionbus.sh; \
+	sleep 3; \
+	\
+	make test;
+# END HEADLESS TESTS
+else
+check-local: test
+endif
+
+
+test:
+	@gtester -k --verbose -o=$(TEST_BINARY)-results.xml ./$(TEST_BINARY)
+
+.PHONY: check-report full-report
+check-report: $(TEST_BINARY)
+	@gtester -k --verbose -o=$(TEST_BINARY)-results.xml -k ./$(TEST_BINARY) \
+		&& ( gtester-report $(TEST_BINARY)-results.xml \
+				| sed 's/GTester Unit Test Report</>GTester Unit Test Report (normal)</' \
+				> $(TEST_BINARY)-results.html ) \
+		&& gnome-open ./$(TEST_BINARY)-results.html
+
+full-report:
+		@gtester -k --verbose -o=$(TEST_BINARY)-results.xml -k -m=slow ./$(TEST_BINARY) \
+	  && ( gtester-report $(TEST_BINARY)-results.xml \
+	      | sed 's/>GTester Unit Test Report</>GTester Unit Test Report (normal)</' \
+	      > $(TEST_BINARY)-results.html )
+
+clean-generic:
+	rm -f $(TEST_BINARY)-results.xml $(TEST_BINARY)-results.html

=== modified file 'tests/bamfdaemon/Makefile.am'
--- tests/bamfdaemon/Makefile.am	2012-10-09 09:27:18 +0000
+++ tests/bamfdaemon/Makefile.am	2012-11-19 18:45:28 +0000
@@ -1,8 +1,6 @@
 noinst_PROGRAMS = \
   test-bamf
 
-XVFB_RUN=$(srcdir)/run-xvfb.sh
-
 bamf_test_extra_built_sources = \
 		$(top_builddir)/src/bamf-marshal.c \
 		$(top_builddir)/src/bamf-marshal.h \
@@ -85,7 +83,7 @@
   -I$(top_srcdir)/src \
   -I$(top_builddir)/src \
   -DWNCK_I_KNOW_THIS_IS_UNSTABLE \
-  -DTESTDIR=\""$(top_srcdir)/tests"\" \
+  -DTESTDIR=\""$(abs_top_srcdir)/tests"\" \
   $(GCC_FLAGS) \
   $(GTK_CFLAGS) \
   $(GLIB_CFLAGS) \
@@ -111,49 +109,5 @@
 		$(bamf_test_webapps_sources) \
 		$(NULL)
 
-# Run tests as part of make check
-if ENABLE_HEADLESS_TESTS
-check-local: test-headless
-else
-check-local: test
-endif
-
-test:
-	@gtester --verbose -k -o=test-bamf-results.xml ./test-bamf
-
-.PHONY: check-report full-report
-check-report:
-	@gtester --verbose -k -o=test-bamf-results.xml -k ./test-bamf \
-		&& ( gtester-report test-bamf-results.xml \
-				| sed 's/GTester Unit Test Report</>GTester Unit Test Report (normal)</' \
-				> test-bamf-results.html ) \
-		&& gnome-open ./test-bamf-results.html
-
-full-report:
-		@gtester --verbose-k -o=test-bamf-results.xml -k -m=slow ./test-bamf \
-	  && ( gtester-report test-bamf-results.xml \
-	      | sed 's/>GTester Unit Test Report</>GTester Unit Test Report (normal)</' \
-	      > test-bamf-results.html )
-
-clean-generic:
-	rm -f test-bamf-results.xml test-bamf-results.html
-
-# START HEADLESS TESTS
-if ENABLE_HEADLESS_TESTS
-LOG_PATH = headless-logs
-test-headless:
-	set -e; \
-	rm -rf $(LOG_PATH); \
-	mkdir $(LOG_PATH); \
-	export LOG_PATH=$(LOG_PATH); \
-	export XVFB_PATH=$(XVFB); \
-	export DISPLAY=""; \
-	source $(XVFB_RUN); \
-	\
-	$(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
-	source $(LOG_PATH)/sessionbus.sh; \
-	sleep 3; \
-	\
-	make test;
-endif
-# END HEADLESS TESTS
+TEST_BINARY = test-bamf
+include $(top_srcdir)/tests/Makefile.am.gtests

=== modified file 'tests/functional/Makefile.am'
--- tests/functional/Makefile.am	2012-08-22 17:31:46 +0000
+++ tests/functional/Makefile.am	2012-11-19 18:45:28 +0000
@@ -1,15 +1,10 @@
-if USE_GTK3
-VER=3
-else
-VER=
-endif
-
-NULL = 
+NULL =
 
 noinst_PROGRAMS = \
   alt-tabber \
   desktop-file-launcher \
-  interaction-tester
+  interaction-tester \
+  tab-source-test
 
 # alt-tabber
 alt_tabber_SOURCES = alt-tabber.c
@@ -29,8 +24,8 @@
   $(LIBWSBIND_LIBS) \
   $(GLIB_LIBS) \
   $(DBUS_LIBS) \
-  $(top_builddir)/lib/libbamf/libbamf$(VER).la
-  
+  $(top_builddir)/lib/libbamf/libbamf$(LIBBAMF_VER).la
+
 # tab-source-test
 tab_source_test_SOURCES = tab-source-test.c
 tab_source_test_CPPFLAGS = \
@@ -49,7 +44,7 @@
   $(LIBWSBIND_LIBS) \
   $(GLIB_LIBS) \
   $(DBUS_LIBS) \
-  $(top_builddir)/lib/libbamf/libbamf$(VER).la
+  $(top_builddir)/lib/libbamf/libbamf$(LIBBAMF_VER).la
 
 # interaction-tester
 interaction_tester_SOURCES = interaction-tester.c
@@ -69,7 +64,7 @@
   $(LIBWSBIND_LIBS) \
   $(GLIB_LIBS) \
   $(DBUS_LIBS) \
-  $(top_builddir)/lib/libbamf/libbamf$(VER).la
+  $(top_builddir)/lib/libbamf/libbamf$(LIBBAMF_VER).la
 
 
 # desktop-file-launcher

=== modified file 'tests/libbamf/Makefile.am'
--- tests/libbamf/Makefile.am	2012-02-03 07:18:24 +0000
+++ tests/libbamf/Makefile.am	2012-11-19 18:45:28 +0000
@@ -1,9 +1,3 @@
-if USE_GTK3
-VER=3
-else
-VER=
-endif
-
 noinst_PROGRAMS = \
   test-libbamf
 
@@ -18,7 +12,7 @@
   -I$(top_srcdir)/lib/libbamf \
   -I$(top_builddir)/lib/libbamf \
   -DWNCK_I_KNOW_THIS_IS_UNSTABLE \
-  -DTESTDIR=\""$(top_srcdir)/tests/libbamf"\" \
+  -DTESTDIR=\""$(abs_top_srcdir)/tests/libbamf"\" \
   $(GCC_FLAGS) \
   $(GTK_CFLAGS) \
   $(WNCK_CFLAGS) \
@@ -27,61 +21,12 @@
   $(GLIB_CFLAGS)
 
 test_libbamf_LDADD = \
-  $(top_builddir)/lib/libbamf/libbamf$(VER).la \
+  $(top_builddir)/lib/libbamf/libbamf$(LIBBAMF_VER).la \
   $(LIBWSBIND_LIBS) \
   $(WNCK_LIBS) \
   $(GLIB_LIBS) \
   $(GTK_LIBS) \
   $(DBUS_LIBS)
 
-# Run tests as part of make check
-if ENABLE_HEADLESS_TESTS
-check-local: test-headless
-else
-check-local: test
-endif
-
-test:
-	@gtester -k -o=test-libbamf-results.xml ./test-libbamf
-
-.PHONY: check-report full-report
-check-report:
-	@gtester -k -o=test-libbamf-results.xml -k ./test-libbamf \
-		&& ( gtester-report test-libbamf-results.xml \
-				| sed 's/GTester Unit Test Report</>GTester Unit Test Report (normal)</' \
-				> test-libbamf-results.html ) \
-		&& gnome-open ./test-libbamf-results.html
-
-full-report:
-		@gtester -k -o=test-libbamf-results.xml -k -m=slow ./test-libbamf \
-	  && ( gtester-report test-libbamf-results.xml \
-	      | sed 's/>GTester Unit Test Report</>GTester Unit Test Report (normal)</' \
-	      > test-libbamf-results.html )
-
-clean-generic:
-	rm -f test-libbamf-results.xml test-libbamf-results.html
-
-# START HEADLESS TESTS
-if ENABLE_HEADLESS_TESTS
-DISPLAY = :27
-LOG_PATH = headless-logs
-test-headless:
-	set -e; \
-	export DISPLAY=$(DISPLAY); \
-	rm -rf $(LOG_PATH); \
-	mkdir $(LOG_PATH); \
-	$(XVFB) $(DISPLAY) -screen 0 1024x768x8 > $(LOG_PATH)/Xvfb.out 2>&1 & \
-	sleep 1; \
-	\
-	$(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
-	source $(LOG_PATH)/sessionbus.sh; \
-	sleep 1; \
-	\
-	make test; \
-	sleep 1; \
-	\
-	kill `grep DBUS_SESSION_BUS_PID $(LOG_PATH)/sessionbus.sh | grep -oE '[0-9]+'`; \
-	pkill Xvfb;
-	
-endif
-# END HEADLESS TESTS
+TEST_BINARY = test-libbamf
+include $(top_srcdir)/tests/Makefile.am.gtests

=== renamed file 'tests/bamfdaemon/run-xvfb.sh' => 'tests/run-xvfb.sh'