[gnome-boxes] build-sys: do a clean .gitignore generation

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

commit 66c00f7fec317299b5aa8fc135320fa443efad47
Author: Marc-Andrà Lureau <marcandre lureau gmail com>
Date:   Sat Aug 4 01:15:21 2012 +0200

    build-sys: do a clean .gitignore generation
    
    https://bugzilla.gnome.org/show_bug.cgi?id=681246

 Makefile.am               |    8 +++++++-
 data/Makefile.am          |    4 ++++
 libgd/Makefile.am         |    2 ++
 src/Makefile.am           |    6 ++----
 vapi/Makefile.am          |    2 ++
 vapi/upstream/Makefile.am |    4 ++++
 6 files changed, 21 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index bb278e7..9f6942f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,12 @@ MAINTAINERCLEANFILES =				\
 	build-aux/ltmain.sh			\
 	build-aux/missing			\
 	build-aux/mkinstalldirs			\
+	m4/intltool.m4				\
+	m4/libtool.m4				\
+	m4/ltoptions.m4				\
+	m4/ltsugar.m4				\
+	m4/ltversion.m4				\
+	m4/lt~obsolete.m4			\
 	po/Makefile.in.in			\
 	po/Makevars.template			\
 	po/Rules-quot				\
@@ -48,7 +54,7 @@ MAINTAINERCLEANFILES =				\
 	po/en quot header			\
 	po/insert-header.sin			\
 	po/quot.sed				\
-	po/remove-potcdate.sin
+	po/remove-potcdate.sin			\
 	$(NULL)
 
 # see git-version-gen
diff --git a/data/Makefile.am b/data/Makefile.am
index 8f09cab..7bf83c0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -51,4 +51,8 @@ DISTCLEANFILES =				\
 	$(desktop_DATA)				\
 	$(NULL)
 
+MAINTAINERCLEANFILES =				\
+	org.gnome.boxes.gschema.valid		\
+	$(NULL)
+
 -include $(top_srcdir)/git.mk
diff --git a/libgd/Makefile.am b/libgd/Makefile.am
index c1ca348..a7530cb 100644
--- a/libgd/Makefile.am
+++ b/libgd/Makefile.am
@@ -79,3 +79,5 @@ gd-1.0.vapi: $(builddir)/Gd-1.0.gir
 EXTRA_DIST = $(VAPIS)
 
 MAINTAINERCLEANFILES = $(INTROSPECTION_GIRS) $(VAPIS)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/Makefile.am b/src/Makefile.am
index e8b11a6..fd2ff5e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,5 @@
 NULL =
+MAINTAINERCLEANFILES = *.stamp
 
 AM_CPPFLAGS =						\
 	-include config.h				\
@@ -77,10 +78,7 @@ gnome_boxes_SOURCES =				\
 gnome_boxes_LDADD = $(BOXES_LIBS) $(top_builddir)/libgd/libgdprivate-1.0.la
 gnome_boxes_CFLAGS = $(BOXES_CFLAGS)
 
-MAINTAINERCLEANFILES =				\
-	$(gnome_boxes_SOURCES:.vala=.c)		\
-	*.stamp					\
-	$(NULL)
+MAINTAINERCLEANFILES += $(gnome_boxes_SOURCES:.vala=.c)
 
 EXTRA_DIST = config.vapi
 
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index bb9c2ba..522e6b1 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -1,2 +1,4 @@
 NULL =
 SUBDIRS = upstream
+
+-include $(top_srcdir)/git.mk
diff --git a/vapi/upstream/Makefile.am b/vapi/upstream/Makefile.am
index 047b6b4..932cce6 100644
--- a/vapi/upstream/Makefile.am
+++ b/vapi/upstream/Makefile.am
@@ -1,5 +1,7 @@
 NULL =
 
+# This is the directory where we put upstream vapi bindings when they
+# are outdated and we need a version with additional fixes.
 EXTRA_DIST =					\
 	cairo.vapi				\
 	clutter-1.0.deps			\
@@ -15,3 +17,5 @@ EXTRA_DIST =					\
 	gdk-pixbuf-2.0.deps			\
 	gdk-pixbuf-2.0.vapi			\
 	$(NULL)
+
+-include $(top_srcdir)/git.mk