Merge lp:~3v1n0/bamf/missing_files_v2 into lp:bamf/0.4

[Marco Trevisan (Treviño)]

tests: include the tests data dir in distribution

We still miss the test data in distribution, or make distcheck won't work ;)

[lp:~3v1n0/bamf/missing_files_v2]

480. By Marco Trevisan (Treviño) on 2012-08-01

Bamfdaemon, put BUILT_SOURCES back

481. By Marco Trevisan (Treviño) on 2012-08-01

BamfDaemon, correctly build the gdbus files

[Łukasz Zemczak (sil2100)]

After those 2 fixes everything builds correctly - thanks! Approve.

[Łukasz Zemczak (sil2100)]

+1

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2012-02-17 11:12:57 +0000
+++ Makefile.am	2012-08-01 14:31:21 +0000
@@ -10,5 +10,5 @@
   doc
 
 EXTRA_DIST = COPYING.LGPL autogen.sh build.rules.mk
-DISTCHECK_CONFIGURE_FLAGS = --enable-introspection=no --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --enable-introspection=no --enable-gtk-doc=yes
 
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-08-01 11:37:03 +0000
+++ src/Makefile.am	2012-08-01 14:31:21 +0000
@@ -1,7 +1,8 @@
+# Defined as these will be needed by Makefile.am.marshal
 CLEANFILES =
 DISTCLEANFILES =
 BUILT_SOURCES =
-EXTRA_DIST = 
+EXTRA_DIST =
 
 include $(top_srcdir)/Makefile.am.marshal
 
@@ -80,14 +81,13 @@
 		$(NULL)
 
 bamfdaemon_SOURCES = \
-		$(bamfdaemon_built_sources) \
 		$(bamfdaemon_sources) \
 		$(bamfdaemon_headers) \
 		$(NULL)
 
-nodist_EXTRA_bamfdaemon_SOURCES = \
-	$(bamfdaemon_gdbus_files) \
-	$(NULL)
+nodist_bamfdaemon_SOURCES = \
+		$(bamfdaemon_built_sources) \
+		$(NULL)
 
 glib_marshal_list = bamf-marshal.list
 glib_marshal_prefix = bamf_marshal
@@ -144,6 +144,9 @@
 		--interface-prefix com.canonical.StatusNotifierApprover \
 		$<
 
+dist-hook:
+	find $(top_distdir)/src -name bamf-gdbus-\*-generated.\* -exec rm -v {} \;
+
 BUILT_SOURCES += \
 		$(bamfdaemon_gdbus_files) \
 		$(NULL)
 
=== modified file 'tests/bamfdaemon/Makefile.am'
--- tests/bamfdaemon/Makefile.am	2012-07-17 19:03:36 +0000
+++ tests/bamfdaemon/Makefile.am	2012-08-01 14:31:21 +0000
@@ -82,6 +82,8 @@
 		-Xlinker -export-dynamic -Wl,-O1 -Wl,-Bsymbolic-functions \
 		$(NULL)
 
+EXTRA_DIST = data
+
 # Run tests as part of make check
 if ENABLE_HEADLESS_TESTS
 check-local: test-headless