BAMF

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

  1. missing_files_v2
  2. Merge into 0.4
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 481
Merged at revision: 479
Proposed branch: lp:~3v1n0/bamf/missing_files_v2
Merge into: lp:bamf/0.4
Diff against target: 65 lines (+11/-6)
3 files modified
Makefile.am (+1/-1)
src/Makefile.am (+8/-5)
tests/bamfdaemon/Makefile.am (+2/-0)
To merge this branch: bzr merge lp:~3v1n0/bamf/missing_files_v2
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Review via email: mp+117661@code.launchpad.net

Commit message

tests: include the tests data dir in distribution

Description of the change

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

To post a comment you must log in.
lp:~3v1n0/bamf/missing_files_v2 updated
480. By Marco Trevisan (Treviño)

Bamfdaemon, put BUILT_SOURCES back

481. By Marco Trevisan (Treviño)

BamfDaemon, correctly build the gdbus files

Revision history for this message
Łukasz Zemczak (sil2100) wrote :

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

Revision history for this message
Łukasz Zemczak (sil2100) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2012-02-17 11:12:57 +0000
3+++ Makefile.am 2012-08-01 14:31:21 +0000
4@@ -10,5 +10,5 @@
5 doc
6
7 EXTRA_DIST = COPYING.LGPL autogen.sh build.rules.mk
8-DISTCHECK_CONFIGURE_FLAGS = --enable-introspection=no --enable-gtk-doc
9+DISTCHECK_CONFIGURE_FLAGS = --enable-introspection=no --enable-gtk-doc=yes
10
11
12=== modified file 'src/Makefile.am'
13--- src/Makefile.am 2012-08-01 11:37:03 +0000
14+++ src/Makefile.am 2012-08-01 14:31:21 +0000
15@@ -1,7 +1,8 @@
16+# Defined as these will be needed by Makefile.am.marshal
17 CLEANFILES =
18 DISTCLEANFILES =
19 BUILT_SOURCES =
20-EXTRA_DIST =
21+EXTRA_DIST =
22
23 include $(top_srcdir)/Makefile.am.marshal
24
25@@ -80,14 +81,13 @@
26 $(NULL)
27
28 bamfdaemon_SOURCES = \
29- $(bamfdaemon_built_sources) \
30 $(bamfdaemon_sources) \
31 $(bamfdaemon_headers) \
32 $(NULL)
33
34-nodist_EXTRA_bamfdaemon_SOURCES = \
35- $(bamfdaemon_gdbus_files) \
36- $(NULL)
37+nodist_bamfdaemon_SOURCES = \
38+ $(bamfdaemon_built_sources) \
39+ $(NULL)
40
41 glib_marshal_list = bamf-marshal.list
42 glib_marshal_prefix = bamf_marshal
43@@ -144,6 +144,9 @@
44 --interface-prefix com.canonical.StatusNotifierApprover \
45 $<
46
47+dist-hook:
48+ find $(top_distdir)/src -name bamf-gdbus-\*-generated.\* -exec rm -v {} \;
49+
50 BUILT_SOURCES += \
51 $(bamfdaemon_gdbus_files) \
52 $(NULL)
53
54=== modified file 'tests/bamfdaemon/Makefile.am'
55--- tests/bamfdaemon/Makefile.am 2012-07-17 19:03:36 +0000
56+++ tests/bamfdaemon/Makefile.am 2012-08-01 14:31:21 +0000
57@@ -82,6 +82,8 @@
58 -Xlinker -export-dynamic -Wl,-O1 -Wl,-Bsymbolic-functions \
59 $(NULL)
60
61+EXTRA_DIST = data
62+
63 # Run tests as part of make check
64 if ENABLE_HEADLESS_TESTS
65 check-local: test-headless

Subscribers

People subscribed via source and target branches