Merge lp:~ricotz/bamf/fix-distcheck into lp:bamf/0.4

Proposed by Rico Tzschichholz on 2012-10-09
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2012-10-10
Approved revision: 491
Merged at revision: 491
Proposed branch: lp:~ricotz/bamf/fix-distcheck
Merge into: lp:bamf/0.4
Diff against target: 287 lines (+75/-60)
3 files modified
lib/libbamf/Makefile.am (+33/-24)
src/Makefile.am (+20/-26)
tests/bamfdaemon/Makefile.am (+22/-10)
To merge this branch: bzr merge lp:~ricotz/bamf/fix-distcheck
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) 2012-10-09 Approve on 2012-10-10
jenkins continuous-integration Pending
Review via email: mp+128661@code.launchpad.net

Commit message

Autoconf: Exclude generated sources from tarball and fix "make distcheck"

Description of the change

Exclude generated sources from tarball and fix "make distcheck"

To post a comment you must log in.
Marco Trevisan (Treviño) (3v1n0) wrote :

Changes looks good, it works very well.
Thanks a lot!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/libbamf/Makefile.am'
2--- lib/libbamf/Makefile.am 2012-10-08 17:03:43 +0000
3+++ lib/libbamf/Makefile.am 2012-10-09 09:39:30 +0000
4@@ -14,6 +14,12 @@
5 include $(top_srcdir)/Makefile.am.marshal
6 -include $(INTROSPECTION_MAKEFILE)
7
8+libbamf_built_sources = \
9+ bamf-marshal.c \
10+ bamf-marshal.h \
11+ bamf-tab-source-glue.h \
12+ $(NULL)
13+
14 libbamf_sources = \
15 bamf-application.c \
16 bamf-control.c \
17@@ -26,7 +32,7 @@
18 bamf-indicator.c \
19 $(NULL)
20
21-sources_h = \
22+libbamf_headers = \
23 bamf-application.h \
24 bamf-indicator.h \
25 bamf-control.h \
26@@ -42,9 +48,12 @@
27 bamf-factory.h \
28 bamf-application-private.h \
29 bamf-view-private.h \
30- $(sources_h) \
31+ $(libbamf_headers) \
32 $(libbamf_sources) \
33- $(BUILT_SOURCES) \
34+ $(NULL)
35+
36+nodist_libbamf_la_SOURCES = \
37+ $(libbamf_built_sources)
38 $(NULL)
39
40 libbamf_la_LIBADD = \
41@@ -58,6 +67,7 @@
42 -fPIC \
43 -DDATADIR=\""$(datadir)"\" \
44 -I$(top_srcdir)/lib \
45+ -I$(top_builddir)/lib \
46 -I$(top_srcdir)/lib/libbamf \
47 -I$(top_builddir)/lib/libbamf \
48 $(LIBWSBIND_CFLAGS) \
49@@ -71,36 +81,35 @@
50 $(NULL)
51
52 libbamf3_la_SOURCES = $(libbamf_la_SOURCES)
53+nodist_libbamf3_la_SOURCES = $(libbamf_built_sources)
54 libbamf3_la_LIBADD = $(libbamf_la_LIBADD)
55 libbamf3_la_CPPFLAGS = $(libbamf_la_CPPFLAGS)
56 libbamf3_la_LDFLAGS = $(libbamf_la_LDFLAGS)
57
58-DISTCLEANFILES += \
59- bamf-tab-source-glue.h \
60- $(NULL)
61-
62 glib_marshal_list = bamf-marshal.list
63 glib_marshal_prefix = _bamf_marshal
64
65+# resetting BUILT_SOURCES here is intended
66+BUILT_SOURCES = \
67+ $(libbamf_built_sources) \
68+ $(NULL)
69+
70+CLEANFILES += \
71+ $(libbamf_built_sources) \
72+ $(NULL)
73+
74 bamf-tab-source-glue.h: bamf-tab-source-glue.xml
75 $(AM_V_GEN)$(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=bamf_tab_source --mode=glib-server --output=$@ $<
76
77-BUILT_SOURCES += \
78- bamf-tab-source-glue.h \
79- $(NULL)
80-
81-EXTRA_DIST += \
82- bamf-tab-source-glue.xml \
83- $(NULL)
84-
85-
86-library_includedir=$(includedir)/libbamf$(VER)/libbamf
87-library_include_HEADERS = \
88- $(sources_h)
89+EXTRA_DIST += bamf-tab-source-glue.xml
90+
91+libbamf_includedir=$(includedir)/libbamf$(VER)/libbamf
92+libbamf_include_HEADERS = \
93+ $(libbamf_headers)
94
95 libbamf_pcdir = $(libdir)/pkgconfig
96 libbamf_pc_DATA = \
97- libbamf$(VER).pc
98+ libbamf$(VER).pc
99
100
101 #########################
102@@ -114,7 +123,7 @@
103 if HAVE_INTROSPECTION
104
105 introspection_sources = \
106- $(sources_h) \
107+ $(libbamf_headers) \
108 $(libbamf_sources) \
109 $(NULL)
110
111@@ -134,12 +143,12 @@
112 INTROSPECTION_GIRS += Bamf-0.2.gir
113
114 girdir = $(datadir)/gir-1.0
115-dist_gir_DATA = $(INTROSPECTION_GIRS)
116+gir_DATA = $(INTROSPECTION_GIRS)
117
118 typelibdir = $(libdir)/girepository-1.0
119 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
120
121-CLEANFILES += $(dist_gir_DATA) $(typelib_DATA)
122+CLEANFILES += $(gir_DATA) $(typelib_DATA)
123
124 endif
125
126@@ -155,7 +164,7 @@
127 $(vapi_DATA): $(INTROSPECTION_GIRS)
128 $(AM_V_GEN)$(VALA_API_GEN) --library=$(@:.vapi=) $<
129
130-DISTCLEANFILES += $(vapi_DATA)
131+CLEANFILES += $(vapi_DATA)
132
133 endif
134
135
136=== modified file 'src/Makefile.am'
137--- src/Makefile.am 2012-10-08 10:24:47 +0000
138+++ src/Makefile.am 2012-10-09 09:39:30 +0000
139@@ -6,11 +6,6 @@
140
141 include $(top_srcdir)/Makefile.am.marshal
142
143-INCLUDE = \
144- -I. \
145- -I$(srcdir) \
146- $(NULL)
147-
148 bamfdaemondir = $(libexecdir)
149
150 bamfdaemon_PROGRAMS = \
151@@ -95,6 +90,10 @@
152 $(bamfdaemon_headers) \
153 $(NULL)
154
155+nodist_bamfdaemon_SOURCES = \
156+ $(bamfdaemon_built_sources) \
157+ $(NULL)
158+
159 if HAVE_WEBAPPS
160 bamfdaemon_SOURCES += \
161 $(bamfdaemon_webapps_sources) \
162@@ -102,13 +101,23 @@
163 $(NULL)
164 endif
165
166-nodist_bamfdaemon_SOURCES = \
167- $(bamfdaemon_built_sources) \
168+EXTRA_DIST += \
169+ $(bamfdaemon_webapps_sources) \
170+ $(bamfdaemon_webapps_headers) \
171 $(NULL)
172
173 glib_marshal_list = bamf-marshal.list
174 glib_marshal_prefix = bamf_marshal
175
176+# resetting BUILT_SOURCES here is intended
177+BUILT_SOURCES = \
178+ $(bamfdaemon_built_sources) \
179+ $(NULL)
180+
181+CLEANFILES += \
182+ $(bamfdaemon_built_sources) \
183+ $(NULL)
184+
185 bamfdaemon_LDADD = \
186 $(X_LIBS) \
187 $(GLIB_LIBS) \
188@@ -122,7 +131,8 @@
189 -Wall -std=c99 \
190 -DDATADIR=\""$(datadir)"\" \
191 -DWNCK_I_KNOW_THIS_IS_UNSTABLE \
192- -I$(top_srcdir)/src \
193+ -I$(srcdir) \
194+ -I$(builddir) \
195 $(GLIB_CFLAGS) \
196 $(GTK_CFLAGS) \
197 $(WNCK_CFLAGS) \
198@@ -163,23 +173,7 @@
199 --interface-prefix com.canonical.StatusNotifierApprover \
200 $<
201
202-dist-hook:
203- find $(top_distdir)/src -name bamf-gdbus-\*-generated.\* -exec rm -v {} \;
204-
205-BUILT_SOURCES += \
206- $(bamfdaemon_gdbus_files) \
207- $(NULL)
208-
209 EXTRA_DIST += \
210 $(bamfdaemon_xml_gdbus_files) \
211- $(bamfdaemon_webapps_sources) \
212- $(bamfdaemon_webapps_headers) \
213- $(NULL)
214-
215-DISTCLEANFILES += \
216- $(bamfdaemon_built_sources) \
217- $(NULL)
218-
219-CLEANFILES += \
220- $(bamfdaemon_built_sources) \
221- $(NULL)
222+ $(NULL)
223+
224
225=== modified file 'tests/bamfdaemon/Makefile.am'
226--- tests/bamfdaemon/Makefile.am 2012-10-08 10:24:47 +0000
227+++ tests/bamfdaemon/Makefile.am 2012-10-09 09:39:30 +0000
228@@ -3,6 +3,19 @@
229
230 XVFB_RUN=$(srcdir)/run-xvfb.sh
231
232+bamf_test_extra_built_sources = \
233+ $(top_builddir)/src/bamf-marshal.c \
234+ $(top_builddir)/src/bamf-marshal.h \
235+ $(top_builddir)/src/bamf-gdbus-generated.c \
236+ $(top_builddir)/src/bamf-gdbus-generated.h \
237+ $(top_builddir)/src/bamf-gdbus-view-generated.c \
238+ $(top_builddir)/src/bamf-gdbus-view-generated.h \
239+ $(top_builddir)/src/bamf-gdbus-browser-generated.c \
240+ $(top_builddir)/src/bamf-gdbus-browser-generated.h \
241+ $(top_builddir)/src/bamf-gdbus-indicator-source-generated.c \
242+ $(top_builddir)/src/bamf-gdbus-indicator-source-generated.h \
243+ $(NULL)
244+
245 bamf_test_extra_sources = \
246 $(top_srcdir)/src/bamf-daemon.c \
247 $(top_srcdir)/src/bamf-legacy-window.c \
248@@ -17,11 +30,6 @@
249 $(top_srcdir)/src/bamf-indicator.c \
250 $(top_srcdir)/src/bamf-indicator-source.c \
251 $(top_srcdir)/src/bamf-xutils.c \
252- $(top_builddir)/src/bamf-marshal.c \
253- $(top_builddir)/src/bamf-gdbus-generated.c \
254- $(top_builddir)/src/bamf-gdbus-view-generated.c \
255- $(top_builddir)/src/bamf-gdbus-browser-generated.c \
256- $(top_builddir)/src/bamf-gdbus-indicator-source-generated.c \
257 $(NULL)
258
259 bamf_test_extra_headers = \
260@@ -40,11 +48,6 @@
261 $(top_srcdir)/src/bamf-indicator-source.h \
262 $(top_srcdir)/src/bamf-indicator.h \
263 $(top_srcdir)/src/bamf-xutils.h \
264- $(top_builddir)/src/bamf-marshal.h \
265- $(top_builddir)/src/bamf-gdbus-generated.h \
266- $(top_builddir)/src/bamf-gdbus-view-generated.h \
267- $(top_builddir)/src/bamf-gdbus-browser-generated.h \
268- $(top_builddir)/src/bamf-gdbus-indicator-source-generated.h \
269 $(NULL)
270
271 bamf_test_webapps_sources = \
272@@ -62,6 +65,15 @@
273 test-window.c \
274 test-matcher.c
275
276+nodist_test_bamf_SOURCES = \
277+ $(bamf_test_extra_built_sources)
278+
279+BUILT_SOURCES = \
280+ $(bamf_test_extra_built_sources)
281+
282+CLEANFILES = \
283+ $(bamf_test_extra_built_sources)
284+
285 if HAVE_WEBAPPS
286 test_bamf_SOURCES += \
287 $(bamf_test_webapps_sources) \

Subscribers

People subscribed via source and target branches