BAMF

Merge lp:~timo-jyrinki/bamf/0.3-revertrevert into lp:bamf/0.3

  1. 0.3-revertrevert
  2. Merge into bamf-0.3
Proposed by Timo Jyrinki
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 495
Merged at revision: 495
Proposed branch: lp:~timo-jyrinki/bamf/0.3-revertrevert
Merge into: lp:bamf/0.3
Diff against target: 630 lines (+171/-76)
13 files modified
config.h.in (+3/-0)
configure.in (+11/-2)
lib/libbamf/Makefile.am (+37/-24)
lib/libbamf/bamf-application.c (+12/-0)
lib/libbamf/bamf-control.c (+5/-0)
lib/libbamf/bamf-matcher.c (+5/-5)
lib/libbamf/bamf-tab-source.c (+13/-0)
lib/libbamf/bamf-view.c (+4/-3)
lib/libbamf/bamf-view.h (+1/-1)
lib/libbamf/bamf-window.c (+1/-1)
src/Makefile.am (+35/-26)
src/bamf-matcher.c (+6/-0)
tests/bamfdaemon/Makefile.am (+38/-14)
To merge this branch: bzr merge lp:~timo-jyrinki/bamf/0.3-revertrevert
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Review via email: mp+132872@code.launchpad.net

Commit message

Revert the revert in r494, cleanups were not rejected after all.

Description of the change

Revert the revert in r494, cleanups were not rejected after all.

To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Just one comment here: :D

Confusing, but that's the right way to go ;)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.h.in'
2--- config.h.in 2012-10-31 11:12:56 +0000
3+++ config.h.in 2012-11-05 11:57:23 +0000
4@@ -30,6 +30,9 @@
5 /* Define to 1 if you have the <unistd.h> header file. */
6 #undef HAVE_UNISTD_H
7
8+/* Use libunity-webapps */
9+#undef HAVE_WEBAPPS
10+
11 /* Define to the sub-directory in which libtool stores uninstalled libraries.
12 */
13 #undef LT_OBJDIR
14
15=== modified file 'configure.in'
16--- configure.in 2012-10-31 11:12:56 +0000
17+++ configure.in 2012-11-05 11:57:23 +0000
18@@ -123,8 +123,16 @@
19 ###########################
20 # libunity_webapps
21 ###########################
22-PKG_CHECK_MODULES(LIBUNITY_WEBAPPS, libunity_webapps-0.2)
23-
24+AC_ARG_ENABLE([webapps],
25+ AS_HELP_STRING([--enable-webapps],
26+ [Enable libunity-webapps support]),
27+ [enable_webapps=$enableval],
28+ [enable_webapps=yes])
29+if test "x$enable_webapps" = "xyes"; then
30+ PKG_CHECK_MODULES(LIBUNITY_WEBAPPS, libunity_webapps-0.2)
31+ AC_DEFINE_UNQUOTED(HAVE_WEBAPPS, , [Use libunity-webapps])
32+fi
33+AM_CONDITIONAL([HAVE_WEBAPPS], [test "x$enable_webapps" = "xyes"])
34 AC_SUBST(LIBUNITY_WEBAPPS_CFLAGS)
35 AC_SUBST(LIBUNITY_WEBAPPS_LIBS)
36
37@@ -185,6 +193,7 @@
38 Install Prefix: ${prefix}
39 Introspection: ${enable_introspection}
40 GTK+ Version: ${with_gtk}
41+ Unity Webapps: ${enable_webapps}
42 Headless tests: ${enable_headless_tests}
43
44 EOF
45
46=== modified file 'lib/libbamf/Makefile.am'
47--- lib/libbamf/Makefile.am 2012-10-31 11:12:56 +0000
48+++ lib/libbamf/Makefile.am 2012-11-05 11:57:23 +0000
49@@ -14,6 +14,12 @@
50 include $(top_srcdir)/Makefile.am.marshal
51 -include $(INTROSPECTION_MAKEFILE)
52
53+libbamf_built_sources = \
54+ bamf-marshal.c \
55+ bamf-marshal.h \
56+ bamf-tab-source-glue.h \
57+ $(NULL)
58+
59 libbamf_sources = \
60 bamf-application.c \
61 bamf-control.c \
62@@ -26,7 +32,7 @@
63 bamf-indicator.c \
64 $(NULL)
65
66-sources_h = \
67+libbamf_headers = \
68 bamf-application.h \
69 bamf-indicator.h \
70 bamf-control.h \
71@@ -42,9 +48,12 @@
72 bamf-factory.h \
73 bamf-application-private.h \
74 bamf-view-private.h \
75- $(sources_h) \
76+ $(libbamf_headers) \
77 $(libbamf_sources) \
78- $(BUILT_SOURCES) \
79+ $(NULL)
80+
81+nodist_libbamf_la_SOURCES = \
82+ $(libbamf_built_sources)
83 $(NULL)
84
85 libbamf_la_LIBADD = \
86@@ -58,6 +67,7 @@
87 -fPIC \
88 -DDATADIR=\""$(datadir)"\" \
89 -I$(top_srcdir)/lib \
90+ -I$(top_builddir)/lib \
91 -I$(top_srcdir)/lib/libbamf \
92 -I$(top_builddir)/lib/libbamf \
93 $(LIBWSBIND_CFLAGS) \
94@@ -71,36 +81,35 @@
95 $(NULL)
96
97 libbamf3_la_SOURCES = $(libbamf_la_SOURCES)
98+nodist_libbamf3_la_SOURCES = $(libbamf_built_sources)
99 libbamf3_la_LIBADD = $(libbamf_la_LIBADD)
100 libbamf3_la_CPPFLAGS = $(libbamf_la_CPPFLAGS)
101 libbamf3_la_LDFLAGS = $(libbamf_la_LDFLAGS)
102
103-DISTCLEANFILES += \
104- bamf-tab-source-glue.h \
105- $(NULL)
106-
107 glib_marshal_list = bamf-marshal.list
108 glib_marshal_prefix = _bamf_marshal
109
110+# resetting BUILT_SOURCES here is intended
111+BUILT_SOURCES = \
112+ $(libbamf_built_sources) \
113+ $(NULL)
114+
115+CLEANFILES += \
116+ $(libbamf_built_sources) \
117+ $(NULL)
118+
119 bamf-tab-source-glue.h: bamf-tab-source-glue.xml
120 $(AM_V_GEN)$(DBUS_GLIB_BIN)/dbus-binding-tool --prefix=bamf_tab_source --mode=glib-server --output=$@ $<
121
122-BUILT_SOURCES += \
123- bamf-tab-source-glue.h \
124- $(NULL)
125-
126-EXTRA_DIST += \
127- bamf-tab-source-glue.xml \
128- $(NULL)
129-
130-
131-library_includedir=$(includedir)/libbamf$(VER)/libbamf
132-library_include_HEADERS = \
133- $(sources_h)
134+EXTRA_DIST += bamf-tab-source-glue.xml
135+
136+libbamf_includedir=$(includedir)/libbamf$(VER)/libbamf
137+libbamf_include_HEADERS = \
138+ $(libbamf_headers)
139
140 libbamf_pcdir = $(libdir)/pkgconfig
141 libbamf_pc_DATA = \
142- libbamf$(VER).pc
143+ libbamf$(VER).pc
144
145
146 #########################
147@@ -113,11 +122,15 @@
148
149 if HAVE_INTROSPECTION
150
151-introspection_sources = $(libbamf_la_SOURCES)
152+introspection_sources = \
153+ $(libbamf_headers) \
154+ $(libbamf_sources) \
155+ $(NULL)
156
157 Bamf-0.2.gir: libbamf.la
158 Bamf_0_2_gir_INCLUDES = GObject-2.0 GLib-2.0
159 Bamf_0_2_gir_CFLAGS = \
160+ --warn-all \
161 --c-include='libbamf/libbamf.h' \
162 $(DBUS_CFLAGS) \
163 -I$(top_srcdir)/lib \
164@@ -130,12 +143,12 @@
165 INTROSPECTION_GIRS += Bamf-0.2.gir
166
167 girdir = $(datadir)/gir-1.0
168-dist_gir_DATA = $(INTROSPECTION_GIRS)
169+gir_DATA = $(INTROSPECTION_GIRS)
170
171 typelibdir = $(libdir)/girepository-1.0
172 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
173
174-CLEANFILES += $(dist_gir_DATA) $(typelib_DATA)
175+CLEANFILES += $(gir_DATA) $(typelib_DATA)
176
177 endif
178
179@@ -151,7 +164,7 @@
180 $(vapi_DATA): $(INTROSPECTION_GIRS)
181 $(AM_V_GEN)$(VALA_API_GEN) --library=$(@:.vapi=) $<
182
183-DISTCLEANFILES += $(vapi_DATA)
184+CLEANFILES += $(vapi_DATA)
185
186 endif
187
188
189=== modified file 'lib/libbamf/bamf-application.c'
190--- lib/libbamf/bamf-application.c 2012-10-31 11:12:56 +0000
191+++ lib/libbamf/bamf-application.c 2012-11-05 11:57:23 +0000
192@@ -72,6 +72,12 @@
193 int show_stubs;
194 };
195
196+/**
197+ * bamf_application_get_supported_mime_types:
198+ * @application: a #BamfApplication
199+ *
200+ * Returns: (transfer full) (array zero-terminated=1): A string array containing the supported mime-types.
201+ */
202 gchar **
203 bamf_application_get_supported_mime_types (BamfApplication *application)
204 {
205@@ -402,6 +408,12 @@
206 }
207 }
208
209+/**
210+ * bamf_application_get_focusable_child:
211+ * @application: a #BamfApplication
212+ *
213+ * Returns: (transfer none): The focusable child for this application.
214+ */
215 BamfView *
216 bamf_application_get_focusable_child (BamfApplication *application)
217 {
218
219=== modified file 'lib/libbamf/bamf-control.c'
220--- lib/libbamf/bamf-control.c 2012-10-31 11:12:56 +0000
221+++ lib/libbamf/bamf-control.c 2012-11-05 11:57:23 +0000
222@@ -112,6 +112,11 @@
223 }
224 }
225
226+/**
227+ * bamf_control_get_default:
228+ *
229+ * Returns: (transfer none): The default #BamfControl reference.
230+ */
231 BamfControl *
232 bamf_control_get_default (void)
233 {
234
235=== modified file 'lib/libbamf/bamf-matcher.c'
236--- lib/libbamf/bamf-matcher.c 2012-10-31 11:12:56 +0000
237+++ lib/libbamf/bamf-matcher.c 2012-11-05 11:57:23 +0000
238@@ -97,7 +97,7 @@
239 0, NULL, NULL,
240 g_cclosure_marshal_VOID__OBJECT,
241 G_TYPE_NONE, 1,
242- G_TYPE_OBJECT);
243+ BAMF_TYPE_VIEW);
244
245 matcher_signals [VIEW_CLOSED] =
246 g_signal_new ("view-closed",
247@@ -106,7 +106,7 @@
248 0, NULL, NULL,
249 g_cclosure_marshal_VOID__OBJECT,
250 G_TYPE_NONE, 1,
251- G_TYPE_OBJECT);
252+ BAMF_TYPE_VIEW);
253
254
255 matcher_signals [ACTIVE_APPLICATION_CHANGED] =
256@@ -116,7 +116,7 @@
257 0, NULL, NULL,
258 _bamf_marshal_VOID__OBJECT_OBJECT,
259 G_TYPE_NONE, 2,
260- G_TYPE_OBJECT, G_TYPE_OBJECT);
261+ BAMF_TYPE_VIEW, BAMF_TYPE_VIEW);
262
263 matcher_signals [ACTIVE_WINDOW_CHANGED] =
264 g_signal_new ("active-window-changed",
265@@ -125,7 +125,7 @@
266 0, NULL, NULL,
267 _bamf_marshal_VOID__OBJECT_OBJECT,
268 G_TYPE_NONE, 2,
269- G_TYPE_OBJECT, G_TYPE_OBJECT);
270+ BAMF_TYPE_VIEW, BAMF_TYPE_VIEW);
271
272 matcher_signals [STACKING_ORDER_CHANGED] =
273 g_signal_new ("stacking-order-changed",
274@@ -729,7 +729,7 @@
275 /**
276 * bamf_matcher_register_favorites:
277 * @matcher: a #BamfMatcher
278- * @favorites: an array of strings, each containing an absolute path to a .desktop file
279+ * @favorites: (array): an array of strings, each containing an absolute path to a .desktop file
280 *
281 * Used to effect how bamf performs matching. Desktop files passed to this method will
282 * be prefered by bamf to system desktop files.
283
284=== modified file 'lib/libbamf/bamf-tab-source.c'
285--- lib/libbamf/bamf-tab-source.c 2012-10-31 11:12:56 +0000
286+++ lib/libbamf/bamf-tab-source.c 2012-11-05 11:57:23 +0000
287@@ -68,6 +68,12 @@
288 return TRUE;
289 }
290
291+/**
292+ * bamf_tab_source_get_tab_ids:
293+ * @source: a #BamfTabSource
294+ *
295+ * Returns: (transfer none) (allow-none) (array zero-terminated=1): A string array containing the IDs of this #BamfTabSource.
296+ */
297 char **
298 bamf_tab_source_get_tab_ids (BamfTabSource *source)
299 {
300@@ -79,6 +85,13 @@
301 return NULL;
302 }
303
304+/**
305+ * bamf_tab_source_get_tab_preview:
306+ * @source: a #BamfTabSource
307+ * @tab_id: an ID
308+ *
309+ * Returns: (transfer none) (allow-none): A #GArray containing the preview for the given ID of this #BamfTabSource.
310+ */
311 GArray *
312 bamf_tab_source_get_tab_preview (BamfTabSource *source,
313 char *tab_id)
314
315=== modified file 'lib/libbamf/bamf-view.c'
316--- lib/libbamf/bamf-view.c 2012-10-31 11:12:56 +0000
317+++ lib/libbamf/bamf-view.c 2012-11-05 11:57:23 +0000
318@@ -270,7 +270,7 @@
319 * bamf_view_user_visible:
320 * @view: a #BamfView
321 *
322- * Returns a boolean useful for determining if a particular view is "user visible". User visible
323+ * Returns: a boolean useful for determining if a particular view is "user visible". User visible
324 * is a concept relating to whether or not a window should be shown in a launcher tasklist.
325 */
326 gboolean
327@@ -1062,7 +1062,7 @@
328 g_signal_new ("child-moved",
329 G_OBJECT_CLASS_TYPE (klass),
330 G_SIGNAL_RUN_FIRST,
331- 0,
332+ G_STRUCT_OFFSET (BamfViewClass, child_moved),
333 NULL, NULL,
334 g_cclosure_marshal_VOID__OBJECT,
335 G_TYPE_NONE, 1,
336@@ -1102,7 +1102,8 @@
337 g_signal_new ("name-changed",
338 G_OBJECT_CLASS_TYPE (klass),
339 0,
340- 0, NULL, NULL,
341+ G_STRUCT_OFFSET (BamfViewClass, name_changed),
342+ NULL, NULL,
343 _bamf_marshal_VOID__STRING_STRING,
344 G_TYPE_NONE, 2,
345 G_TYPE_STRING,
346
347=== modified file 'lib/libbamf/bamf-view.h'
348--- lib/libbamf/bamf-view.h 2012-10-31 11:12:56 +0000
349+++ lib/libbamf/bamf-view.h 2012-11-05 11:57:23 +0000
350@@ -95,13 +95,13 @@
351 void (*urgent_changed) (BamfView *view, gboolean urgent);
352 void (*user_visible_changed) (BamfView *view, gboolean user_visible);
353 void (*name_changed) (BamfView *view, gchar* old_name, gchar* new_name);
354+ void (*child_moved) (BamfView *view, BamfView *child);
355
356 /*< private >*/
357 void (*_view_padding1) (void);
358 void (*_view_padding2) (void);
359 void (*_view_padding3) (void);
360 void (*_view_padding4) (void);
361- void (*_view_padding5) (void);
362 };
363
364 GType bamf_view_get_type (void) G_GNUC_CONST;
365
366=== modified file 'lib/libbamf/bamf-window.c'
367--- lib/libbamf/bamf-window.c 2012-10-31 11:12:56 +0000
368+++ lib/libbamf/bamf-window.c 2012-11-05 11:57:23 +0000
369@@ -79,7 +79,7 @@
370 * bamf_window_get_transient:
371 * @self: a #BamfWindow
372 *
373- * Returns: (transfer none) (nullable): A transient for this #BamfWindow.
374+ * Returns: (transfer none) (allow-none): A transient for this #BamfWindow.
375 */
376
377 BamfWindow * bamf_window_get_transient (BamfWindow *self)
378
379=== modified file 'src/Makefile.am'
380--- src/Makefile.am 2012-10-31 11:12:56 +0000
381+++ src/Makefile.am 2012-11-05 11:57:23 +0000
382@@ -6,11 +6,6 @@
383
384 include $(top_srcdir)/Makefile.am.marshal
385
386-INCLUDE = \
387- -I. \
388- -I$(srcdir) \
389- $(NULL)
390-
391 bamfdaemondir = $(libexecdir)
392
393 bamfdaemon_PROGRAMS = \
394@@ -53,9 +48,6 @@
395 bamf-application.c \
396 bamf-window.c \
397 bamf-tab.c \
398- bamf-unity-webapps-tab.c \
399- bamf-unity-webapps-observer.c \
400- bamf-unity-webapps-application.c \
401 bamf-indicator-source.c \
402 bamf-indicator.c \
403 bamf-xutils.c \
404@@ -76,12 +68,21 @@
405 bamf-window.h \
406 bamf-application.h \
407 bamf-tab.h \
408+ bamf-indicator-source.h \
409+ bamf-indicator.h \
410+ bamf-xutils.h \
411+ $(NULL)
412+
413+bamfdaemon_webapps_sources = \
414+ bamf-unity-webapps-tab.c \
415+ bamf-unity-webapps-observer.c \
416+ bamf-unity-webapps-application.c \
417+ $(NULL)
418+
419+bamfdaemon_webapps_headers = \
420 bamf-unity-webapps-tab.h \
421 bamf-unity-webapps-observer.h \
422 bamf-unity-webapps-application.h \
423- bamf-indicator-source.h \
424- bamf-indicator.h \
425- bamf-xutils.h \
426 $(NULL)
427
428 bamfdaemon_SOURCES = \
429@@ -93,9 +94,30 @@
430 $(bamfdaemon_built_sources) \
431 $(NULL)
432
433+if HAVE_WEBAPPS
434+bamfdaemon_SOURCES += \
435+ $(bamfdaemon_webapps_sources) \
436+ $(bamfdaemon_webapps_headers) \
437+ $(NULL)
438+endif
439+
440+EXTRA_DIST += \
441+ $(bamfdaemon_webapps_sources) \
442+ $(bamfdaemon_webapps_headers) \
443+ $(NULL)
444+
445 glib_marshal_list = bamf-marshal.list
446 glib_marshal_prefix = bamf_marshal
447
448+# resetting BUILT_SOURCES here is intended
449+BUILT_SOURCES = \
450+ $(bamfdaemon_built_sources) \
451+ $(NULL)
452+
453+CLEANFILES += \
454+ $(bamfdaemon_built_sources) \
455+ $(NULL)
456+
457 bamfdaemon_LDADD = \
458 $(X_LIBS) \
459 $(GLIB_LIBS) \
460@@ -109,7 +131,8 @@
461 -Wall -std=c99 \
462 -DDATADIR=\""$(datadir)"\" \
463 -DWNCK_I_KNOW_THIS_IS_UNSTABLE \
464- -I$(top_srcdir)/src \
465+ -I$(srcdir) \
466+ -I$(builddir) \
467 $(GLIB_CFLAGS) \
468 $(GTK_CFLAGS) \
469 $(WNCK_CFLAGS) \
470@@ -150,21 +173,7 @@
471 --interface-prefix com.canonical.StatusNotifierApprover \
472 $<
473
474-dist-hook:
475- find $(top_distdir)/src -name bamf-gdbus-\*-generated.\* -exec rm -v {} \;
476-
477-BUILT_SOURCES += \
478- $(bamfdaemon_gdbus_files) \
479- $(NULL)
480-
481 EXTRA_DIST += \
482 $(bamfdaemon_xml_gdbus_files) \
483 $(NULL)
484
485-DISTCLEANFILES += \
486- $(bamfdaemon_built_sources) \
487- $(NULL)
488-
489-CLEANFILES += \
490- $(bamfdaemon_built_sources) \
491- $(NULL)
492
493=== modified file 'src/bamf-matcher.c'
494--- src/bamf-matcher.c 2012-10-31 11:12:56 +0000
495+++ src/bamf-matcher.c 2012-11-05 11:57:23 +0000
496@@ -27,7 +27,9 @@
497 #include "bamf-legacy-screen.h"
498 #include "bamf-indicator-source.h"
499
500+#ifdef HAVE_WEBAPPS
501 #include "bamf-unity-webapps-application.h"
502+#endif
503 #include <strings.h>
504
505 G_DEFINE_TYPE (BamfMatcher, bamf_matcher, BAMF_DBUS_TYPE_MATCHER_SKELETON);
506@@ -2891,6 +2893,7 @@
507 return TRUE;
508 }
509
510+#ifdef HAVE_WEBAPPS
511 static void
512 on_webapp_child_added (BamfView *application,
513 BamfView *child,
514@@ -2917,6 +2920,7 @@
515 self);
516 bamf_unity_webapps_application_add_existing_interests (BAMF_UNITY_WEBAPPS_APPLICATION (application));
517 }
518+#endif
519
520 static void
521 bamf_matcher_init (BamfMatcher * self)
522@@ -3010,12 +3014,14 @@
523 g_signal_connect (self, "handle-window-stack-for-monitor",
524 G_CALLBACK (on_dbus_handle_window_stack_for_monitor), self);
525
526+#ifdef HAVE_WEBAPPS
527 priv->webapps_observer = bamf_unity_webapps_observer_new ();
528
529 g_signal_connect (priv->webapps_observer,
530 "application-appeared",
531 G_CALLBACK (on_webapp_appeared),
532 self);
533+#endif
534 }
535
536 static void
537
538=== modified file 'tests/bamfdaemon/Makefile.am'
539--- tests/bamfdaemon/Makefile.am 2012-10-31 11:12:56 +0000
540+++ tests/bamfdaemon/Makefile.am 2012-11-05 11:57:23 +0000
541@@ -3,6 +3,19 @@
542
543 XVFB_RUN=$(srcdir)/run-xvfb.sh
544
545+bamf_test_extra_built_sources = \
546+ $(top_builddir)/src/bamf-marshal.c \
547+ $(top_builddir)/src/bamf-marshal.h \
548+ $(top_builddir)/src/bamf-gdbus-generated.c \
549+ $(top_builddir)/src/bamf-gdbus-generated.h \
550+ $(top_builddir)/src/bamf-gdbus-view-generated.c \
551+ $(top_builddir)/src/bamf-gdbus-view-generated.h \
552+ $(top_builddir)/src/bamf-gdbus-browser-generated.c \
553+ $(top_builddir)/src/bamf-gdbus-browser-generated.h \
554+ $(top_builddir)/src/bamf-gdbus-indicator-source-generated.c \
555+ $(top_builddir)/src/bamf-gdbus-indicator-source-generated.h \
556+ $(NULL)
557+
558 bamf_test_extra_sources = \
559 $(top_srcdir)/src/bamf-daemon.c \
560 $(top_srcdir)/src/bamf-legacy-window.c \
561@@ -14,17 +27,9 @@
562 $(top_srcdir)/src/bamf-application.c \
563 $(top_srcdir)/src/bamf-window.c \
564 $(top_srcdir)/src/bamf-tab.c \
565- $(top_srcdir)/src/bamf-unity-webapps-tab.c \
566- $(top_srcdir)/src/bamf-unity-webapps-observer.c \
567- $(top_srcdir)/src/bamf-unity-webapps-application.c \
568 $(top_srcdir)/src/bamf-indicator.c \
569 $(top_srcdir)/src/bamf-indicator-source.c \
570 $(top_srcdir)/src/bamf-xutils.c \
571- $(top_builddir)/src/bamf-marshal.c \
572- $(top_builddir)/src/bamf-gdbus-generated.c \
573- $(top_builddir)/src/bamf-gdbus-view-generated.c \
574- $(top_builddir)/src/bamf-gdbus-browser-generated.c \
575- $(top_builddir)/src/bamf-gdbus-indicator-source-generated.c \
576 $(NULL)
577
578 bamf_test_extra_headers = \
579@@ -43,11 +48,12 @@
580 $(top_srcdir)/src/bamf-indicator-source.h \
581 $(top_srcdir)/src/bamf-indicator.h \
582 $(top_srcdir)/src/bamf-xutils.h \
583- $(top_builddir)/src/bamf-marshal.h \
584- $(top_builddir)/src/bamf-gdbus-generated.h \
585- $(top_builddir)/src/bamf-gdbus-view-generated.h \
586- $(top_builddir)/src/bamf-gdbus-browser-generated.h \
587- $(top_builddir)/src/bamf-gdbus-indicator-source-generated.h \
588+ $(NULL)
589+
590+bamf_test_webapps_sources = \
591+ $(top_srcdir)/src/bamf-unity-webapps-tab.c \
592+ $(top_srcdir)/src/bamf-unity-webapps-observer.c \
593+ $(top_srcdir)/src/bamf-unity-webapps-application.c \
594 $(NULL)
595
596 test_bamf_SOURCES = \
597@@ -59,6 +65,21 @@
598 test-window.c \
599 test-matcher.c
600
601+nodist_test_bamf_SOURCES = \
602+ $(bamf_test_extra_built_sources)
603+
604+BUILT_SOURCES = \
605+ $(bamf_test_extra_built_sources)
606+
607+CLEANFILES = \
608+ $(bamf_test_extra_built_sources)
609+
610+if HAVE_WEBAPPS
611+test_bamf_SOURCES += \
612+ $(bamf_test_webapps_sources) \
613+ $(NULL)
614+endif
615+
616 test_bamf_CPPFLAGS = \
617 -I$(top_srcdir) \
618 -I$(top_srcdir)/src \
619@@ -85,7 +106,10 @@
620 -Xlinker -export-dynamic -Wl,-O1 -Wl,-Bsymbolic-functions \
621 $(NULL)
622
623-EXTRA_DIST = data
624+EXTRA_DIST = \
625+ data \
626+ $(bamf_test_webapps_sources) \
627+ $(NULL)
628
629 # Run tests as part of make check
630 if ENABLE_HEADLESS_TESTS

Subscribers

People subscribed via source and target branches

to all changes: