[gnome-boxes] build-sys: fix make distcheck

[Marc-Andre Lureau <malureau src gnome org>]

commit 59367038eaaa5b47a9da0db7b449ec1206fc6507
Author: Marc-Andrà Lureau <marcandre lureau gmail com>
Date:   Fri Aug 17 03:48:26 2012 +0300

    build-sys: fix make distcheck
    
    kthxbye

 data/Makefile.am  |    9 +++------
 libgd/Makefile.am |   11 ++++++-----
 src/Makefile.am   |   12 +++++++++---
 3 files changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 1ad1f4a..9304257 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -43,6 +43,7 @@ disk.img:
 
 EXTRA_DIST =					\
 	gnome-boxes.desktop.in			\
+	gnome-boxes-search-provider.ini.in      \
 	org.gnome.boxes.gschema.xml.in		\
 	$(desktop_in_files)			\
 	$(source_DATA)				\
@@ -52,18 +53,14 @@ EXTRA_DIST =					\
 	$(service_in_files)			\
 	$(NULL)
 
-CLEANFILES =					\
-	$(desktop_DATA)				\
-	$(NULL)
-
 DISTCLEANFILES =				\
-	org.gnome.boxes.gschema.xml		\
+	$(gsettings_SCHEMAS)			\
+	$(service_DATA)				\
 	$(desktop_DATA)				\
 	$(NULL)
 
 MAINTAINERCLEANFILES =				\
 	gnome-boxes-search-provider.ini		\
-	org.gnome.Boxes.SearchProvider.service  \
 	org.gnome.boxes.gschema.valid		\
 	$(NULL)
 
diff --git a/libgd/Makefile.am b/libgd/Makefile.am
index d1fa701..f7e7701 100644
--- a/libgd/Makefile.am
+++ b/libgd/Makefile.am
@@ -1,4 +1,5 @@
 NULL =
+EXTRA_DIST =
 
 gdprivate_cflags =				\
 	-I$(top_srcdir)				\
@@ -53,6 +54,7 @@ libgdprivate_1_0_la_SOURCES =			\
 include $(INTROSPECTION_MAKEFILE)
 
 INTROSPECTION_GIRS = Gd-1.0.gir
+EXTRA_DIST += $(srcdir)/Gd-1.0.gir
 
 Gd-1.0.gir: libgdprivate-1.0.la Makefile
 Gd_1_0_gir_NAMESPACE = Gd
@@ -75,19 +77,18 @@ Gd_1_0_gir_FILES =				\
 	$(gdprivate_source_c:%=$(srcdir)/%)	\
 	$(NULL)
 
-VAPIS = gd-1.0.vapi
-BUILT_SOURCES = $(VAPIS)
+VAPIS = $(srcdir)/gd-1.0.vapi
 
-gd-1.0.vapi: $(builddir)/Gd-1.0.gir
+$(srcdir)/gd-1.0.vapi: $(srcdir)/Gd-1.0.gir
 	$(AM_V_GEN)$(VAPIGEN)				\
-		--vapidir=$(top_srcdir)/vapi/upstream	\
 		--library gd-1.0			\
 		--pkg gio-2.0				\
 		--pkg gobject-2.0			\
 		--pkg gtk+-3.0				\
 		$<
 
-EXTRA_DIST = $(VAPIS)
+EXTRA_DIST += $(VAPIS)
+noinst_DATA = $(VAPIS)
 
 MAINTAINERCLEANFILES = $(INTROSPECTION_GIRS) $(VAPIS)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 23f8767..8538929 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,6 @@
 NULL =
 BUILT_SOURCES =
+EXTRA_DIST =
 MAINTAINERCLEANFILES = *.stamp
 
 AM_CPPFLAGS =						\
@@ -8,6 +9,7 @@ AM_CPPFLAGS =						\
 	-DDATADIR=\""$(datadir)"\"			\
 	$(DISABLE_DEPRECATED)				\
 	-DG_LOG_DOMAIN=\""Boxes"\"			\
+	-I$(top_srcdir)					\
 	$(NULL)
 
 AM_VALAFLAGS =						\
@@ -55,7 +57,7 @@ libcommon_a_SOURCES =				\
 
 libcommon_a_CFLAGS = $(BOXES_COMMON_CFLAGS)
 
-libcommon_vala.stamp common.vapi libcommon.h: $(libcommon_a_VALASOURCES)
+libcommon_vala.stamp: $(libcommon_a_VALASOURCES)
 	$(AM_V_VALAC)$(VALAC) $(VALAFLAGS) $(VALA_DEBUG_FLAGS)	\
 	--enable-experimental					\
 	--vapidir=$(srcdir)/					\
@@ -65,8 +67,11 @@ libcommon_vala.stamp common.vapi libcommon.h: $(libcommon_a_VALASOURCES)
 	-C -H libcommon.h --library common $^
 	@touch $(libcommon_a_DEPENDENCIES)
 
-BUILT_SOURCES += $(libcommon_a_DEPENDENCIES)
+common.vapi libcommon.h: libcommon_vala.stamp
+$(libcommon_a_SOURCES): libcommon_vala.stamp
+
 MAINTAINERCLEANFILES += $(libcommon_a_SOURCES) $(libcommon_a_DEPENDENCIES)
+EXTRA_DIST += $(libcommon_a_DEPENDENCIES) $(libcommon_a_VALASOURCES)
 
 bin_PROGRAMS = gnome-boxes
 
@@ -115,6 +120,7 @@ gnome_boxes_LDADD =					\
 	$(NULL)
 
 gnome_boxes_CFLAGS = $(BOXES_CFLAGS)
+gnome_boxes_DEPENDENCIES = $(libcommon_a_DEPENDENCIES)
 
 MAINTAINERCLEANFILES += $(gnome_boxes_SOURCES:.vala=.c)
 
@@ -129,6 +135,6 @@ gnome_boxes_search_provider_CFLAGS = $(BOXES_COMMON_CFLAGS)
 
 MAINTAINERCLEANFILES += $(gnome_boxes_search_provider_SOURCES:.vala=.c)
 
-EXTRA_DIST = config.vapi
+EXTRA_DIST += config.vapi
 
 -include $(top_srcdir)/git.mk