Merge lp:~timo-jyrinki/bamf/revert_477_479 into lp:bamf/0.2

Proposed by Timo Jyrinki
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 488
Merged at revision: 487
Proposed branch: lp:~timo-jyrinki/bamf/revert_477_479
Merge into: lp:bamf/0.2
Diff against target: 96 lines (+10/-13)
4 files modified
Makefile.am (+1/-1)
lib/libbamf/Makefile.am (+4/-2)
src/Makefile.am (+5/-8)
tests/bamfdaemon/Makefile.am (+0/-2)
To merge this branch: bzr merge lp:~timo-jyrinki/bamf/revert_477_479
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Review via email: mp+136636@code.launchpad.net

Commit message

Revert r479 and r477 as non-needed for stable release (were: include the tests data dir in distribution, Fix non-srcdir build)

Description of the change

Revert r479 and r477 as non-needed for stable release (were: include the tests data dir in distribution, Fix non-srcdir build)

To post a comment you must log in.
Łukasz Zemczak (sil2100) wrote :

It's really really sad seeing build fixes being reverted :( But well, that's the rule of SRUs... so +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-08-01 13:56:43 +0000
3+++ Makefile.am 2012-11-28 12:25:28 +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=yes
9+DISTCHECK_CONFIGURE_FLAGS = --enable-introspection=no --enable-gtk-doc
10
11
12=== modified file 'lib/libbamf/Makefile.am'
13--- lib/libbamf/Makefile.am 2012-11-27 13:40:26 +0000
14+++ lib/libbamf/Makefile.am 2012-11-28 12:25:28 +0000
15@@ -23,6 +23,7 @@
16 bamf-tab-source.c \
17 bamf-tab.c \
18 bamf-indicator.c \
19+ bamf-marshal.c \
20 $(NULL)
21
22 sources_h = \
23@@ -43,7 +44,8 @@
24 bamf-view-private.h \
25 $(sources_h) \
26 $(libbamf_sources) \
27- $(BUILT_SOURCES) \
28+ bamf-tab-source-glue.h \
29+ bamf-marshal.h \
30 $(NULL)
31
32 libbamf_la_LIBADD = \
33@@ -119,7 +121,7 @@
34 # GObject-2.0
35 #Bamf_0_2_gir_CFLAGS = --c-include='libbamf/libbamf.h' $(LIBBAMF_CFLAGS) -I$(top_srcdir)/lib -I$(top_builddir)/lib
36 #Bamf_0_2_gir_LIBS = libbamf.la
37-#Bamf_0_2_gir_FILES = $(introspection_sources)
38+#Bamf_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
39 #
40 #INTROSPECTION_GIRS += Bamf-0.2.gir
41 #
42
43=== modified file 'src/Makefile.am'
44--- src/Makefile.am 2012-08-01 14:27:31 +0000
45+++ src/Makefile.am 2012-11-28 12:25:28 +0000
46@@ -1,8 +1,7 @@
47-# Defined as these will be needed by Makefile.am.marshal
48 CLEANFILES =
49 DISTCLEANFILES =
50 BUILT_SOURCES =
51-EXTRA_DIST =
52+EXTRA_DIST =
53
54 include $(top_srcdir)/Makefile.am.marshal
55
56@@ -81,13 +80,14 @@
57 $(NULL)
58
59 bamfdaemon_SOURCES = \
60+ $(bamfdaemon_built_sources) \
61 $(bamfdaemon_sources) \
62 $(bamfdaemon_headers) \
63 $(NULL)
64
65-nodist_bamfdaemon_SOURCES = \
66- $(bamfdaemon_built_sources) \
67- $(NULL)
68+nodist_EXTRA_bamfdaemon_SOURCES = \
69+ $(bamfdaemon_gdbus_files) \
70+ $(NULL)
71
72 glib_marshal_list = bamf-marshal.list
73 glib_marshal_prefix = bamf_marshal
74@@ -144,9 +144,6 @@
75 --interface-prefix com.canonical.StatusNotifierApprover \
76 $<
77
78-dist-hook:
79- find $(top_distdir)/src -name bamf-gdbus-\*-generated.\* -exec rm -v {} \;
80-
81 BUILT_SOURCES += \
82 $(bamfdaemon_gdbus_files) \
83 $(NULL)
84
85=== modified file 'tests/bamfdaemon/Makefile.am'
86--- tests/bamfdaemon/Makefile.am 2012-08-01 13:56:43 +0000
87+++ tests/bamfdaemon/Makefile.am 2012-11-28 12:25:28 +0000
88@@ -82,8 +82,6 @@
89 -Xlinker -export-dynamic -Wl,-O1 -Wl,-Bsymbolic-functions \
90 $(NULL)
91
92-EXTRA_DIST = data
93-
94 # Run tests as part of make check
95 if ENABLE_HEADLESS_TESTS
96 check-local: test-headless

Subscribers

People subscribed via source and target branches

to all changes: