[seahorse] Makefile.am: Build common.vapi before other vala stuff

[Stefan Walter <stefw src gnome org>]

commit e88c09f00e23d100c8db922e316a58cef89ef5f2
Author: Stef Walter <stefw gnome org>
Date:   Tue Mar 4 14:58:23 2014 +0100

    Makefile.am: Build common.vapi before other vala stuff

 common/Makefile.am |    4 ++++
 gkr/Makefile.am    |    5 ++---
 pkcs11/Makefile.am |    5 ++---
 3 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/common/Makefile.am b/common/Makefile.am
index 488c1af..416e5e8 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -21,6 +21,10 @@ common_VALA = \
 
 common_C = $(common_VALA:.vala=.c)
 
+common_VAPI = \
+       common/common.vapi \
+       common/config.vapi
+
 common_HEADER = common/seahorse-common.h
 
 libcommon_a_SOURCES = \
diff --git a/gkr/Makefile.am b/gkr/Makefile.am
index 71afe6f..2fb355c 100644
--- a/gkr/Makefile.am
+++ b/gkr/Makefile.am
@@ -25,10 +25,9 @@ libseahorse_gkr_a_CFLAGS = \
        -DSECRET_API_SUBJECT_TO_CHANGE
 
 if WITH_VALAC
-$(gkr_HEADER): $(gkr_VALA)
+$(gkr_HEADER): $(gkr_VALA) $(common_VAPI)
        $(V_VALAC) $(VALAC) $(VALA_FLAGS) -C --use-header --header=$(gkr_HEADER) \
-               --vapidir=$(builddir)/common --vapidir=$(srcdir)/common \
-               --pkg common --pkg config --pkg gtk+-3.0 --pkg gcr-3 --pkg gcr-ui-3 --pkg libsecret-1 \
+               --pkg gtk+-3.0 --pkg gcr-3 --pkg gcr-ui-3 --pkg libsecret-1 \
                --directory=gkr $^  && touch -c $(gkr_HEADER) $(gkr_C)
 endif
 
diff --git a/pkcs11/Makefile.am b/pkcs11/Makefile.am
index a4a8c60..be66f23 100644
--- a/pkcs11/Makefile.am
+++ b/pkcs11/Makefile.am
@@ -27,10 +27,9 @@ libseahorse_pkcs11_a_CFLAGS = \
        -include config.h -w
 
 if WITH_VALAC
-$(pkcs11_HEADER): $(pkcs11_VALA)
+$(pkcs11_HEADER): $(pkcs11_VALA) $(common_VAPI)
        $(V_VALAC) $(VALAC) $(VALA_FLAGS) -C --use-header --header=$(pkcs11_HEADER) \
-               --vapidir=$(builddir)/common --vapidir=$(srcdir)/common \
-               --pkg common --pkg config --pkg gtk+-3.0  --pkg gcr-3 --pkg gcr-ui-3 --pkg pkcs11 \
+               --pkg gtk+-3.0  --pkg gcr-3 --pkg gcr-ui-3 --pkg pkcs11 \
                --directory=pkcs11 $^ && touch -c $(pkcs11_HEADER) $(pkcs11_C)
 endif