Simplify codebase.

* Drop clutter support.
* Unify eek-xkb into eek-xkl.
* Generate vapi from gir instead of gi.

bindings/vala/Eek-0.90.metadata

+Eek cheader_filename="eek/eek.h"

bindings/vala/eek-xkl-0.90/eek-xkl-0.90.metadata → bindings/vala/EekXkl-0.90.metadata

 EekXkl cheader_filename="eek/eek-xkl.h"
-eek_xkl_layout_set_config hidden="1"

bindings/vala/Makefile.am

@@ -18,60 +18,66 @@
 
 if ENABLE_VALA
 vapidir = $(datadir)/vala/vapi
-dist_vapi_DATA = \
-	eek-$(EEK_API_VERSION).vapi \
-	eek-clutter-$(EEK_API_VERSION).vapi \
-	eek-gtk-$(EEK_API_VERSION).vapi \
-	eek-xkb-$(EEK_API_VERSION).vapi \
-	eek-xkl-$(EEK_API_VERSION).vapi
-MAINTAINERCLEANFILES = $(dist_vapi_DATA)
+dist_vapi_DATA =				\
+	eek-$(EEK_API_VERSION).vapi		\
+	eek-$(EEK_API_VERSION).deps		\
+	eek-gtk-$(EEK_API_VERSION).vapi		\
+	eek-gtk-$(EEK_API_VERSION).deps		\
+	eek-xkl-$(EEK_API_VERSION).vapi		\
+	eek-xkl-$(EEK_API_VERSION).deps		\
+	$(NULL)
 
-eek-$(EEK_API_VERSION).vapi:
-	$(VAPIGEN_V)$(VAPIGEN) \
-		--library eek-$(EEK_API_VERSION) \
-		--pkg gio-2.0 \
-		eek-$(EEK_API_VERSION)/eek-$(EEK_API_VERSION).gi
+EXTRA_DIST =					\
+	Eek-$(EEK_API_VERSION).metadata		\
+	EekGtk-$(EEK_API_VERSION).metadata	\
+	EekXkl-$(EEK_API_VERSION).metadata	\
+	$(NULL)
 
-eek-clutter-$(EEK_API_VERSION).vapi: eek-$(EEK_API_VERSION).vapi
-	$(VAPIGEN_V)$(VAPIGEN) --vapidir=$(builddir) \
-		--library eek-clutter-$(EEK_API_VERSION) \
-		--pkg eek-$(EEK_API_VERSION) \
-		--pkg clutter-1.0 \
-		--pkg gio-2.0 \
-		--pkg atk \
-		eek-clutter-$(EEK_API_VERSION)/eek-clutter-$(EEK_API_VERSION).gi
+maintainer-clean-local:
+	rm -f *.vapi
 
-eek-gtk-$(EEK_API_VERSION).vapi: eek-$(EEK_API_VERSION).vapi
-	$(VAPIGEN_V)$(VAPIGEN) --vapidir=$(builddir) \
-		--library eek-gtk-$(EEK_API_VERSION) \
-		--pkg eek-$(EEK_API_VERSION) \
-		--pkg gtk+-2.0 \
-		eek-gtk-$(EEK_API_VERSION)/eek-gtk-$(EEK_API_VERSION).gi
+eek_vapi_deps =						\
+	$(srcdir)/Eek-$(EEK_API_VERSION).metadata	\
+	|						\
+	$(top_srcdir)/eek/Eek-$(EEK_API_VERSION).gir	\
+	$(NULL)
 
-eek-xkb-$(EEK_API_VERSION).vapi: eek-$(EEK_API_VERSION).vapi
-	$(VAPIGEN_V)$(VAPIGEN) --vapidir=$(builddir) \
-		--library eek-xkb-$(EEK_API_VERSION) \
-		--pkg eek-$(EEK_API_VERSION) \
-		--pkg gio-2.0 \
-		eek-xkb-$(EEK_API_VERSION)/eek-xkb-$(EEK_API_VERSION).gi
+eek-$(EEK_API_VERSION).vapi: $(eek_vapi_deps)
+	$(VAPIGEN_V)$(VAPIGEN)					\
+		--library eek-$(EEK_API_VERSION)		\
+		--pkg gio-2.0					\
+		--metadatadir=$(srcdir)				\
+		$(top_srcdir)/eek/Eek-$(EEK_API_VERSION).gir
 
-eek-xkl-$(EEK_API_VERSION).vapi: eek-xkb-$(EEK_API_VERSION).vapi
-	$(VAPIGEN_V)$(VAPIGEN) --vapidir=$(builddir) \
-		--library eek-xkl-$(EEK_API_VERSION) \
-		--pkg eek-$(EEK_API_VERSION) \
-		--pkg eek-xkb-$(EEK_API_VERSION) --pkg gio-2.0 \
-		eek-xkl-$(EEK_API_VERSION)/eek-xkl-$(EEK_API_VERSION).gi
+eek_gtk_vapi_deps =					\
+	$(srcdir)/EekGtk-$(EEK_API_VERSION).metadata	\
+	|						\
+	$(top_srcdir)/eek/EekGtk-$(EEK_API_VERSION).gir	\
+	$(NULL)
 
-eekboard-$(EEK_API_VERSION).vapi:
-	$(VAPIGEN_V)$(VAPIGEN) \
-		--library eekboard-$(EEK_API_VERSION) \
-		--pkg eek-$(EEK_API_VERSION) \
-		--pkg gio-2.0 \
-		eek-$(EEK_API_VERSION)/eek-$(EEK_API_VERSION).gi
+eek-gtk-$(EEK_API_VERSION).vapi: $(eek_gtk_vapi_deps)
+	$(VAPIGEN_V)$(VAPIGEN) --vapidir=$(builddir)		\
+		--library eek-gtk-$(EEK_API_VERSION)		\
+		--pkg eek-$(EEK_API_VERSION)			\
+		--pkg gtk+-3.0					\
+		--metadatadir=$(srcdir)				\
+		$(top_srcdir)/eek/EekGtk-$(EEK_API_VERSION).gir
+
+eek_xkl_vapi_deps =					\
+	$(srcdir)/EekXkl-$(EEK_API_VERSION).metadata	\
+	|						\
+	$(top_srcdir)/eek/EekXkl-$(EEK_API_VERSION).gir	\
+	$(NULL)
+
+eek-xkl-$(EEK_API_VERSION).vapi: $(eek_xkl_vapi_deps)
+	$(VAPIGEN_V)$(VAPIGEN) --vapidir=$(builddir)		\
+		--library eek-xkl-$(EEK_API_VERSION)		\
+		--pkg eek-$(EEK_API_VERSION)			\
+		--metadatadir=$(srcdir)				\
+		$(top_srcdir)/eek/EekXkl-$(EEK_API_VERSION).gir
 
 # set up the verbosity rules to avoid some build noise
 VAPIGEN_V = $(VAPIGEN_V_$(V))
 VAPIGEN_V_ = $(VAPIGEN_V_$(AM_DEFAULT_VERBOSITY))
 VAPIGEN_V_0 = @echo "  VAPIG " $@;
 endif
-

bindings/vala/eek-0.90.deps

+gio-2.0

bindings/vala/eek-0.90/eek-0.90.defines

--DEEK_COMPILATION=1
-

bindings/vala/eek-0.90/eek-0.90.files

-include/eek-0.90/eek/eek-container.h
-include/eek-0.90/eek/eek-element.h
-include/eek-0.90/eek/eek-enumtypes.h
-include/eek-0.90/eek/eek-keyboard.h
-include/eek-0.90/eek/eek-key.h
-include/eek-0.90/eek/eek-keysym.h
-include/eek-0.90/eek/eek-layout.h
-include/eek-0.90/eek/eek-section.h
-include/eek-0.90/eek/eek-serializable.h
-include/eek-0.90/eek/eek-symbol.h
-include/eek-0.90/eek/eek-symbol-matrix.h
-include/eek-0.90/eek/eek-text.h
-include/eek-0.90/eek/eek-theme.h
-include/eek-0.90/eek/eek-types.h
-include/eek-0.90/eek/eek-xml.h
-include/eek-0.90/eek/eek-xml-layout.h
-lib/libeek.so

bindings/vala/eek-0.90/eek-0.90.metadata

-Eek cheader_filename="eek/eek.h"
-
-EekBounds is_value_type="1"
-eek_bounds_copy hidden="1"
-eek_bounds_free hidden="1"
-
-EekPoint is_value_type="1"
-eek_point_copy hidden="1"
-eek_point_free hidden="1"
-
-EekOutline is_value_type="1"
-eek_outline_copy hidden="1"
-eek_outline_free hidden="1"
-
-EekColor is_value_type="1"
-eek_color_copy hidden="1"
-eek_color_free hidden="1"
-eek_color_new hidden="1"
-
-eek_element_get_bounds.bounds is_out="1"
-eek_element_get_absolute_position.x is_out="1"
-eek_element_get_absolute_position.y is_out="1"
-eek_element_get_symbol_index.group is_out="1"
-eek_element_get_symbol_index.level is_out="1"

bindings/vala/eek-0.90/eek-0.90.namespace

-Eek

bindings/vala/eek-clutter-0.90/eek-clutter-0.90.defines

--DEEK_COMPILATION=1
-

bindings/vala/eek-clutter-0.90/eek-clutter-0.90.files

-include/eek-0.90/eek/eek-clutter-keyboard.h
-lib/libeek-clutter.so

bindings/vala/eek-clutter-0.90/eek-clutter-0.90.gi

-<?xml version="1.0"?>
-<api version="1.0">
-	<namespace name="EekClutter">
-		<object name="EekClutterKeyboard" parent="ClutterGroup" type-name="EekClutterKeyboard" get-type="eek_clutter_keyboard_get_type">
-			<implements>
-				<interface name="ClutterScriptable"/>
-				<interface name="ClutterAnimatable"/>
-				<interface name="AtkImplementor"/>
-				<interface name="ClutterContainer"/>
-			</implements>
-			<constructor name="new" symbol="eek_clutter_keyboard_new">
-				<return-type type="ClutterActor*"/>
-				<parameters>
-					<parameter name="keyboard" type="EekKeyboard*"/>
-				</parameters>
-			</constructor>
-			<method name="set_theme" symbol="eek_clutter_keyboard_set_theme">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="keyboard" type="EekClutterKeyboard*"/>
-					<parameter name="theme" type="EekTheme*"/>
-				</parameters>
-			</method>
-			<property name="keyboard" type="EekKeyboard*" readable="0" writable="1" construct="0" construct-only="1"/>
-		</object>
-		<constant name="EEK_CLUTTER_KEYBOARD_H" type="int" value="1"/>
-	</namespace>
-</api>

bindings/vala/eek-clutter-0.90/eek-clutter-0.90.metadata

-EekClutter cheader_filename="eek/eek-clutter.h"

bindings/vala/eek-clutter-0.90/eek-clutter-0.90.namespace

-EekClutter

bindings/vala/eek-gtk-0.90.deps

+eek-0.90

bindings/vala/eek-gtk-0.90/eek-gtk-0.90.defines

--DEEK_COMPILATION=1
-

bindings/vala/eek-gtk-0.90/eek-gtk-0.90.files

-include/eek-0.90/eek/eek-gtk-keyboard.h
-lib/libeek-gtk.so

bindings/vala/eek-gtk-0.90/eek-gtk-0.90.gi

-<?xml version="1.0"?>
-<api version="1.0">
-	<namespace name="EekGtk">
-		<object name="EekGtkKeyboard" parent="GtkDrawingArea" type-name="EekGtkKeyboard" get-type="eek_gtk_keyboard_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<constructor name="new" symbol="eek_gtk_keyboard_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="keyboard" type="EekKeyboard*"/>
-				</parameters>
-			</constructor>
-			<method name="set_theme" symbol="eek_gtk_keyboard_set_theme">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="keyboard" type="EekGtkKeyboard*"/>
-					<parameter name="theme" type="EekTheme*"/>
-				</parameters>
-			</method>
-			<property name="keyboard" type="EekKeyboard*" readable="0" writable="1" construct="0" construct-only="1"/>
-		</object>
-		<constant name="EEK_GTK_KEYBOARD_H" type="int" value="1"/>
-	</namespace>
-</api>

bindings/vala/eek-gtk-0.90/eek-gtk-0.90.namespace

-EekGtk