[gcr] Makefile.am: Build vapi files and use vapi metadata correctly

[Stefan Walter <stefw src gnome org>]

commit c5147dca52e26aa1436bd99866bfb4e33c6dfea5
Author: Stef Walter <stefw gnome org>
Date:   Mon Mar 3 13:58:06 2014 +0100

    Makefile.am: Build vapi files and use vapi metadata correctly
    
    Regressed from 9019498dfef15efec4d12eee8becc55781062a30

 Makefile.am     |    2 +-
 gck/Makefile.am |    2 +-
 gcr/Makefile.am |    2 +-
 ui/Makefile.am  |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 73b7f44..37bbdd5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -152,7 +152,7 @@ VAPIGEN_VAPIS =
 VAPI_DEPS = $(VAPIGEN_VAPIS:.vapi=.deps)
 
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = $(VAPI_DEPS)
+vapi_DATA = $(VAPIGEN_VAPIS) $(VAPI_DEPS)
 
 CLEANFILES += \
        $(VAPIGEN_VAPIS) \
diff --git a/gck/Makefile.am b/gck/Makefile.am
index 71248a5..54f1cf9 100644
--- a/gck/Makefile.am
+++ b/gck/Makefile.am
@@ -145,7 +145,7 @@ gck- GCK_MAJOR@.vapi: Gck- GCK_MAJOR@.gir gck/Gck- GCK_MAJOR@.metadata gck- GCK_
 VAPIGEN_VAPIS += gck- GCK_MAJOR@.vapi
 
 gck_ GCK_MAJOR@_vapi_DEPS = glib-2.0 gio-2.0
-gck_ GCK_MAJOR@_vapi_METADATADIRS = $(srcdir)
+gck_ GCK_MAJOR@_vapi_METADATADIRS = $(srcdir)/gck
 gck_ GCK_MAJOR@_vapi_FILES = Gck- GCK_MAJOR@.gir
 
 gck-$(GCK_MAJOR).deps: Makefile.am
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index aef40c1..6f18a27 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -221,7 +221,7 @@ gcr- GCR_MAJOR@.vapi: Gcr- GCR_MAJOR@.gir gcr/Gcr- GCR_MAJOR@.metadata gcr- GCR_
 VAPIGEN_VAPIS += gcr- GCR_MAJOR@.vapi
 
 gcr_ GCR_MAJOR@_vapi_DEPS = glib-2.0 gio-2.0 gck- GCK_MAJOR@
-gcr_ GCR_MAJOR@_vapi_METADATADIRS = $(srcdir)
+gcr_ GCR_MAJOR@_vapi_METADATADIRS = $(srcdir)/gcr
 gcr_ GCR_MAJOR@_vapi_VAPIDIRS = $(builddir)/../gck
 gcr_ GCR_MAJOR@_vapi_GIRDIRS = $(builddir)/../gck
 gcr_ GCR_MAJOR@_vapi_FILES = Gcr- GCR_MAJOR@.gir
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 2ae500a..5f6bc52 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -165,7 +165,7 @@ gcr-ui- GCR_MAJOR@.vapi: GcrUi- GCR_MAJOR@.gir ui/GcrUi- GCR_MAJOR@.metadata gcr
 VAPIGEN_VAPIS += gcr-ui- GCR_MAJOR@.vapi
 
 gcr_ui_ GCR_MAJOR@_vapi_DEPS = glib-2.0 gio-2.0 gck- GCK_MAJOR@ gcr- GCR_MAJOR@ gtk+-3.0
-gcr_ui_ GCR_MAJOR@_vapi_METADATADIRS = $(srcdir)
+gcr_ui_ GCR_MAJOR@_vapi_METADATADIRS = $(srcdir)/ui
 gcr_ui_ GCR_MAJOR@_vapi_VAPIDIRS = $(builddir) $(builddir)/../gck $(builddir)/../gcr
 gcr_ui_ GCR_MAJOR@_vapi_GIRDIRS = $(builddir) $(builddir)/../gck $(builddir)/../gcr
 gcr_ui_ GCR_MAJOR@_vapi_FILES = GcrUi- GCR_MAJOR@.gir