diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2011-12-22 12:53:44 +0100 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2011-12-22 15:14:06 +0100 |
| commit | c5f42f8fb31c371548107ddf4114115d0e269946 (patch) | |
| tree | bb4bbbc286d9da45ce6d5095dc210e1a9d50fc35 /vapi | |
| parent | 004322519fccb24024977068fa7d24d58b4d1590 (diff) | |
Disable vala bindings unless --enable-vala is used
Currently, building vala bindings from a tarball is broken because
spice-client-glib-2.0.deps is missing from the tarball. This commit
adds it to EXTRA_DIST and also makes sure the vala bindings don't
get built/installed unless --enable-vala has been passed to configure.
This means vala must be installed to build the vala bindings from a
tarball. Fixes fdo bug #44000.
Diffstat (limited to 'vapi')
| -rw-r--r-- | vapi/Makefile.am | 26 | ||||
| -rw-r--r-- | vapi/spice-client-gtk-2.0.deps | 2 | ||||
| -rw-r--r-- | vapi/spice-client-gtk-3.0.deps | 2 |
3 files changed, 14 insertions, 16 deletions
diff --git a/vapi/Makefile.am b/vapi/Makefile.am index 4b99645..ccb5b65 100644 --- a/vapi/Makefile.am +++ b/vapi/Makefile.am @@ -1,19 +1,20 @@ NULL = CLEANFILES = -if HAVE_INTROSPECTION -if WITH_VALA -BUILT_VAPI = \ +vapidir = $(datadir)/vala/vapi +vapi_DATA = \ spice-client-glib-2.0.vapi \ - spice-client-gtk-$(SPICE_GTK_API_VERSION).deps \ spice-client-gtk-$(SPICE_GTK_API_VERSION).vapi \ $(NULL) -CLEANFILES += $(BUILT_VAPI) - -vapidir = $(datadir)/vala/vapi -vapi_DATA = \ +dist_vapi_DATA = \ + spice-client-gtk-$(SPICE_GTK_API_VERSION).deps \ spice-client-glib-2.0.deps \ - $(BUILT_VAPI) + $(NULL) + +BUILT_SOURCES = $(vapi_DATA) +EXTRA_DIST = \ + spice-client-gtk-2.0.deps \ + spice-client-gtk-3.0.deps \ $(NULL) spice-client-glib-2.0.vapi: $(top_builddir)/gtk/SpiceClientGLib-2.0.gir @@ -30,11 +31,4 @@ spice-client-gtk-$(SPICE_GTK_API_VERSION).vapi: $(top_builddir)/gtk/SpiceClientG --library spice-client-gtk-$(SPICE_GTK_API_VERSION) \ $< -spice-client-gtk-$(SPICE_GTK_API_VERSION).deps: spice-client-gtk-$(SPICE_GTK_API_VERSION).vapi - @echo "spice-client-glib-2.0" > $@ - @echo "gtk+-$(GTK_API_VERSION)" >> $@ - -endif -endif - -include $(top_srcdir)/git.mk diff --git a/vapi/spice-client-gtk-2.0.deps b/vapi/spice-client-gtk-2.0.deps new file mode 100644 index 0000000..8991f34 --- /dev/null +++ b/vapi/spice-client-gtk-2.0.deps @@ -0,0 +1,2 @@ +spice-client-glib-2.0 +gtk+-2.0 diff --git a/vapi/spice-client-gtk-3.0.deps b/vapi/spice-client-gtk-3.0.deps new file mode 100644 index 0000000..d04a10b --- /dev/null +++ b/vapi/spice-client-gtk-3.0.deps @@ -0,0 +1,2 @@ +spice-client-glib-2.0 +gtk+-3.0 |