diff options
| author | Daiki Ueno <ueno@unixuser.org> | 2012-11-19 07:02:20 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@unixuser.org> | 2013-02-17 10:28:20 +0900 |
| commit | ef0866d54460bb0320d7dcfef947a32568e3ea74 (patch) | |
| tree | 1b93c74da7a2682ea014643932acb58029c7147c | |
| parent | fdf8f0e68e6e1c69496c8fd1146d5e363d1776e0 (diff) | |
| download | caribou-ef0866d54460bb0320d7dcfef947a32568e3ea74.tar.gz | |
Move external vapi files under $(top_srcdir)/vapi
https://bugzilla.gnome.org/show_bug.cgi?id=688218
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | libcaribou/Makefile.am | 4 | ||||
| -rw-r--r-- | vapi/Makefile.am | 5 | ||||
| -rw-r--r-- | vapi/external-libs.vapi (renamed from libcaribou/external-libs.vapi) | 0 | ||||
| -rw-r--r-- | vapi/libxklavier.vapi (renamed from libcaribou/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 index 1489216..1489216 100644 --- a/libcaribou/external-libs.vapi +++ b/vapi/external-libs.vapi diff --git a/libcaribou/libxklavier.vapi b/vapi/libxklavier.vapi index 6420d01..6420d01 100644 --- a/libcaribou/libxklavier.vapi +++ b/vapi/libxklavier.vapi |