[caribou] Move external vapi files under $(top_srcdir)/vapi

[Daiki Ueno <dueno src gnome org>]

commit ef0866d54460bb0320d7dcfef947a32568e3ea74
Author: Daiki Ueno <ueno unixuser org>
Date:   Mon Nov 19 07:02:20 2012 +0900

    Move external vapi files under $(top_srcdir)/vapi
    
    https://bugzilla.gnome.org/show_bug.cgi?id=688218

 Makefile.am                             |    2 +-
 configure.ac                            |    1 +
 libcaribou/Makefile.am                  |    4 +---
 vapi/Makefile.am                        |    5 +++++
 {libcaribou => vapi}/external-libs.vapi |    0
 {libcaribou => vapi}/libxklavier.vapi   |    0
 6 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3cd2140..07a7a55 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = caribou bin data po libcaribou modules tools
+SUBDIRS = caribou bin data po libcaribou modules tools vapi
 
 if HAVE_VALADOC
 SUBDIRS += docs
diff --git a/configure.ac b/configure.ac
index 7baa81f..be48c44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,4 +150,5 @@ modules/gtk3/Makefile
 modules/gtk2/Makefile
 tools/Makefile
 docs/Makefile
+vapi/Makefile
 ])
diff --git a/libcaribou/Makefile.am b/libcaribou/Makefile.am
index 64c0009..770035b 100644
--- a/libcaribou/Makefile.am
+++ b/libcaribou/Makefile.am
@@ -3,7 +3,7 @@ lib_LTLIBRARIES = libcaribou.la
 libcaribou_la_VALAFLAGS = \
        -H caribou.h --vapi caribou-1.0.vapi \
        -h caribou-internals.h \
-       --vapidir=. \
+       --vapidir=$(top_srcdir)/vapi \
        --pkg xtst --pkg gee-0.8 --pkg gdk-x11-3.0 --pkg libxml-2.0 \
        --pkg libxklavier --pkg external-libs \
        --internal-vapi caribou-internals-1.0.vapi \
@@ -49,8 +49,6 @@ libcaribou_la_SOURCES = \
 
 EXTRA_DIST = \
        caribou-1.0.deps \
-       external-libs.vapi \
-       libxklavier.vapi \
        libcaribou.symbols
 
 #
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
new file mode 100644
index 0000000..9fbfc85
--- /dev/null
+++ b/vapi/Makefile.am
@@ -0,0 +1,5 @@
+EXTRA_DIST = \
+       external-libs.vapi \
+       libxklavier.vapi
+
+-include $(top_srcdir)/git.mk
diff --git a/libcaribou/external-libs.vapi b/vapi/external-libs.vapi
similarity index 100%
rename from libcaribou/external-libs.vapi
rename to vapi/external-libs.vapi
diff --git a/libcaribou/libxklavier.vapi b/vapi/libxklavier.vapi
similarity index 100%
rename from libcaribou/libxklavier.vapi
rename to vapi/libxklavier.vapi