|
 |
c6718d9 |
--- ibus-1.5.1/bindings/vala/Makefile.am.orig 2013-01-15 16:58:25.571433690 +0900
|
|
|
c6718d9 |
+++ ibus-1.5.1/bindings/vala/Makefile.am 2013-01-15 16:58:46.983455158 +0900
|
|
|
c6718d9 |
@@ -20,17 +20,38 @@
|
|
|
c6718d9 |
# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
|
c6718d9 |
# Boston, MA 02111-1307 USA
|
|
|
c6718d9 |
|
|
|
c6718d9 |
--include $(VAPIGEN_MAKEFILE)
|
|
|
c6718d9 |
+vapidir = $(datadir)/vala/vapi
|
|
|
c6718d9 |
+dist_vapi_DATA = \
|
|
|
c6718d9 |
+ ibus-@IBUS_API_VERSION@.vapi \
|
|
|
c6718d9 |
+ ibus-@IBUS_API_VERSION@.deps \
|
|
|
c6718d9 |
+ $(NULL)
|
|
|
c6718d9 |
|
|
|
c6718d9 |
+# Don't rebuild vapi every time gir is updated.
|
|
|
c6718d9 |
+if ENABLE_LIBGNOMEKBD
|
|
|
c6718d9 |
vapi_deps = \
|
|
|
c6718d9 |
- IBus-1.0.metadata \
|
|
|
c6718d9 |
- IBus-1.0-custom.vala \
|
|
|
c6718d9 |
- $(top_builddir)/src/IBus-1.0.gir \
|
|
|
c6718d9 |
+ $(srcdir)/IBus-1.0.metadata \
|
|
|
c6718d9 |
+ $(srcdir)/IBus-1.0-custom.vala \
|
|
|
c6718d9 |
+ | \
|
|
|
c6718d9 |
+ $(builddir)/gkbd.vapi \
|
|
|
c6718d9 |
+ $(top_srcdir)/src/IBus-@IBUS_API_VERSION@.gir \
|
|
|
c6718d9 |
$(NULL)
|
|
|
c6718d9 |
+else
|
|
|
c6718d9 |
+vapi_deps = \
|
|
|
c6718d9 |
+ $(srcdir)/IBus-1.0.metadata \
|
|
|
c6718d9 |
+ $(srcdir)/IBus-1.0-custom.vala \
|
|
|
c6718d9 |
+ | \
|
|
|
c6718d9 |
+ $(top_srcdir)/src/IBus-@IBUS_API_VERSION@.gir \
|
|
|
c6718d9 |
+ $(NULL)
|
|
|
c6718d9 |
+endif
|
|
|
c6718d9 |
|
|
|
c6718d9 |
-if ENABLE_LIBGNOMEKBD
|
|
|
c6718d9 |
-vapi_deps += $(builddir)/gkbd.vapi
|
|
|
c6718d9 |
+ibus-@IBUS_API_VERSION@.vapi: $(vapi_deps)
|
|
|
c6718d9 |
+ $(AM_V_GEN) $(VAPIGEN) --library ibus-@IBUS_API_VERSION@ \
|
|
|
c6718d9 |
+ --pkg gio-2.0 \
|
|
|
c6718d9 |
+ --metadatadir=$(srcdir) \
|
|
|
c6718d9 |
+ $(top_srcdir)/src/IBus-@IBUS_API_VERSION@.gir \
|
|
|
c6718d9 |
+ $(srcdir)/IBus-1.0-custom.vala
|
|
|
c6718d9 |
|
|
|
c6718d9 |
+if ENABLE_LIBGNOMEKBD
|
|
|
c6718d9 |
$(builddir)/gkbd.vapi:
|
|
|
c6718d9 |
$(AM_V_GEN) $(VAPIGEN) --library gkbd \
|
|
|
c6718d9 |
--metadatadir $(srcdir) \
|
|
|
c6718d9 |
@@ -39,25 +60,10 @@ $(builddir)/gkbd.vapi:
|
|
|
c6718d9 |
$(NULL)
|
|
|
c6718d9 |
endif
|
|
|
c6718d9 |
|
|
|
c6718d9 |
-ibus-1.0.vapi: $(vapi_deps)
|
|
|
c6718d9 |
-
|
|
|
c6718d9 |
-VAPIGEN_VAPIS = ibus-1.0.vapi
|
|
|
c6718d9 |
-
|
|
|
c6718d9 |
-ibus_1_0_vapi_DEPS = gio-2.0
|
|
|
c6718d9 |
-ibus_1_0_vapi_METADATADIRS = $(srcdir)
|
|
|
c6718d9 |
-ibus_1_0_vapi_FILES = \
|
|
|
c6718d9 |
- $(top_builddir)/src/IBus-1.0.gir \
|
|
|
c6718d9 |
- $(srcdir)/IBus-1.0-custom.vala \
|
|
|
c6718d9 |
- $(NULL)
|
|
|
c6718d9 |
-
|
|
|
c6718d9 |
-vapidir = $(datadir)/vala/vapi
|
|
|
c6718d9 |
-vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
|
|
|
c6718d9 |
-
|
|
|
c6718d9 |
EXTRA_DIST = \
|
|
|
c6718d9 |
Gkbd-3.0.metadata \
|
|
|
c6718d9 |
IBus-1.0.metadata \
|
|
|
c6718d9 |
IBus-1.0-custom.vala \
|
|
|
c6718d9 |
- ibus-1.0.deps \
|
|
|
c6718d9 |
config.vapi \
|
|
|
c6718d9 |
xi.vapi \
|
|
|
c6718d9 |
Xkl-1.0.metadata \
|
|
|
c6718d9 |
@@ -65,4 +71,6 @@ EXTRA_DIST = \
|
|
|
c6718d9 |
|
|
|
c6718d9 |
CLEANFILES = gkbd.vapi
|
|
|
c6718d9 |
|
|
|
c6718d9 |
+MAINTAINERCLEANFILES = ibus-@IBUS_API_VERSION@.vapi
|
|
|
c6718d9 |
+
|
|
|
c6718d9 |
-include $(top_srcdir)/git.mk
|