summaryrefslogtreecommitdiff
path: root/vapi
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2013-03-12 14:26:30 -0500
committerDan Williams <dcbw@redhat.com>2013-03-12 14:27:31 -0500
commitf5f76dfd7441f5286a434a78133da263cf8d54ec (patch)
tree07ad9c6f2c08a4dc0fb2580fbf8f5fb554013aff /vapi
parentc7df1ad224d42c540f0286499e98fe42b1742557 (diff)
downloadNetworkManager-f5f76dfd7441f5286a434a78133da263cf8d54ec.tar.gz
build: fix Vala bindings build and distcheck
Didn't handle srcdir != builddir and got installed without PREFIX.
Diffstat (limited to 'vapi')
-rw-r--r--vapi/Makefile.am12
1 files changed, 7 insertions, 5 deletions
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index f90a9f7dd4..e154554893 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -4,6 +4,8 @@ EXTRA_DIST = \
libnm-util.deps \
libnm-glib.deps
+VAPIGEN_VAPIS = libnm-util.vapi libnm-glib.vapi
+
if ENABLE_VAPIGEN
include Makefile.vapigen
@@ -16,13 +18,13 @@ libnm_util_vapi_FILES = $(top_builddir)/libnm-util/NetworkManager-1.0.gir
libnm_glib_vapi_METADATADIRS = $(srcdir)
libnm_glib_vapi_FILES = $(top_builddir)/libnm-glib/NMClient-1.0.gir
-libnm_glib_vapi_VAPIDIRS = $(srcdir)
+libnm_glib_vapi_VAPIDIRS = $(builddir)
libnm_glib_vapi_GIRDIRS = $(top_builddir)/libnm-util
+libnm_glib_vapi_DEPS = gio-2.0
-VAPIGEN_VAPIS = libnm-util.vapi libnm-glib.vapi
-
-vapidir = $(VAPIGEN_VAPIDIR)
+vapidir = $(datadir)/vala/vapi
vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
-
endif
+
+CLEANFILES = $(VAPIGEN_VAPIS)