5 files changed, 39 insertions, 56 deletions
diff --git a/clutter/clutter/Makefile.am b/clutter/clutter/Makefile.am
index 1ffb56cd0..70be77d9a 100644
--- a/clutter/clutter/Makefile.am
+++ b/clutter/clutter/Makefile.am
@@ -716,4 +716,29 @@ EXTRA_DIST += \
 	Makefile.am.marshal	\
 	Makefile.am.enums
 
+
+if ENABLE_VAPIGEN
+-include $(VAPIGEN_MAKEFILE)
+
+mutter-clutter-@LIBMUTTER_API_VERSION@.vapi: Clutter-@LIBMUTTER_API_VERSION@.gir mutter-clutter-@LIBMUTTER_API_VERSION@.deps
+mutter-clutter-x11-@LIBMUTTER_API_VERSION@.vapi: ClutterX11-@LIBMUTTER_API_VERSION@.gir mutter-clutter-x11-@LIBMUTTER_API_VERSION@.deps
+
+VAPIGEN_VAPIS = mutter-clutter-@LIBMUTTER_API_VERSION@.vapi mutter-clutter-x11-@LIBMUTTER_API_VERSION@.vapi
+
+mutter_clutter_@LIBMUTTER_API_VERSION@_vapi_DEPS = atk cairo pango json-glib-1.0
+mutter_clutter_@LIBMUTTER_API_VERSION@_vapi_METADATADIRS = $(srcdir)
+mutter_clutter_@LIBMUTTER_API_VERSION@_vapi_GIRDIRS = $(top_builddir)/../cogl/cogl $(top_builddir)/../cogl/cogl-pango
+mutter_clutter_@LIBMUTTER_API_VERSION@_vapi_FILES = Clutter-@LIBMUTTER_API_VERSION@.gir
+
+mutter_clutter_x11_@LIBMUTTER_API_VERSION@_vapi_DEPS = atk cairo pango json-glib-1.0
+mutter_clutter_x11_@LIBMUTTER_API_VERSION@_vapi_METADATADIRS = $(srcdir)
+mutter_clutter_x11_@LIBMUTTER_API_VERSION@_vapi_GIRDIRS = $(srcdir) $(top_builddir)/../cogl/cogl $(top_builddir)/../cogl/cogl-pango
+mutter_clutter_x11_@LIBMUTTER_API_VERSION@_vapi_FILES = ClutterX11-@LIBMUTTER_API_VERSION@.gir
+
+vapidir = $(datadir)/vala/vapi
+vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
+
+EXTRA_DIST += mutter-clutter-@LIBMUTTER_API_VERSION@.deps mutter-clutter-x11-@LIBMUTTER_API_VERSION@.deps
+endif
+
 CLEANFILES += $(gir_DATA) $(typelib_DATA)
diff --git a/clutter/clutter/mutter-clutter-0.deps b/clutter/clutter/mutter-clutter-0.deps
new file mode 100644
index 000000000..96a124423
--- /dev/null
+++ b/clutter/clutter/mutter-clutter-0.deps
@@ -0,0 +1,5 @@
+cairo
+gio-2.0
+atk
+pangocairo
+json-glib-1.0
diff --git a/clutter/clutter/mutter-clutter-x11-0.deps b/clutter/clutter/mutter-clutter-x11-0.deps
new file mode 100644
index 000000000..96a124423
--- /dev/null
+++ b/clutter/clutter/mutter-clutter-x11-0.deps
@@ -0,0 +1,5 @@
+cairo
+gio-2.0
+atk
+pangocairo
+json-glib-1.0
diff --git a/clutter/configure.ac b/clutter/configure.ac
index 3c3d0c558..be0a6b246 100644
--- a/clutter/configure.ac
+++ b/clutter/configure.ac
@@ -763,6 +763,10 @@ dnl === GObject-Introspection check ===========================================
 
 GOBJECT_INTROSPECTION_CHECK([gi_req_version])
 
+dnl === Vala vapigen check ===========================================
+
+VAPIGEN_CHECK()
+
 dnl === Conformance test suite ================================================
 
 GLIB_TESTS
diff --git a/clutter/tests/interactive/.gitignore b/clutter/tests/interactive/.gitignore
deleted file mode 100644
index 74d19ee62..000000000
--- a/clutter/tests/interactive/.gitignore
+++ /dev/null
@@ -1,56 +0,0 @@
-/stamp-test-interactive
-/stamp-test-unit-names
-/test-actors
-/test-animation
-/test-animator
-/test-bind-constraint
-/test-binding-pool
-/test-cairo-clock
-/test-cairo-flowers
-/test-clip
-/test-cogl-multitexture
-/test-cogl-offscreen
-/test-cogl-point-sprites
-/test-cogl-primitives
-/test-cogl-shader-arbfp
-/test-cogl-shader-glsl
-/test-cogl-tex-convert
-/test-cogl-tex-foreign
-/test-cogl-tex-getset
-/test-cogl-tex-polygon
-/test-cogl-tex-tile
-/test-cogl-vertex-buffer
-/test-content
-/test-devices
-/test-easing
-/test-events
-/test-fbo
-/test-grab
-/test-image
-/test-interactive
-/test-keyframe-transition
-/test-layout
-/test-multistage
-/test-paint-wrapper
-/test-path-constraint
-/test-pixmap
-/test-rotate-zoom
-/test-scale
-/test-script
-/test-scrolling
-/test-shader-effects
-/test-stage-read-pixels
-/test-stage-sizing
-/test-state
-/test-state-animator
-/test-state-script
-/test-swipe-action
-/test-table-layout
-/test-text
-/test-text-field
-/test-texture-async
-/test-texture-material
-/test-texture-quality
-/test-texture-slicing
-/test-touch-events
-/test-unit-names.h