[vala/staging] Install libvala-0.xx.vapi to "global" vapi directory



commit ca4fd33969eb978c9bd18478892b1897510f829b
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Wed May 17 12:38:06 2017 +0200

    Install libvala-0.xx.vapi to "global" vapi directory
    
    This is how libraries with vala bindings are expected to behave and so
    should vala itself.

 .gitignore       |    1 +
 Makefile.am      |    6 ++++++
 vapi/.gitignore  |    1 -
 vapi/Makefile.am |    4 ----
 4 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f0a2290..1a59179 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ Makefile
 *.gir
 .deps
 .libs
+libvala-*.vapi
 
 config.*
 aclocal.m4
diff --git a/Makefile.am b/Makefile.am
index 813b3fc..181271c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,12 @@ pkgconfig_DATA = libvala@PACKAGE_SUFFIX@.pc
 libvala@PACKAGE_SUFFIX@.pc: libvala.pc
        cp $< $@
 
+vapidir = $(datadir)/vala/vapi
+dist_vapi_DATA = libvala@PACKAGE_SUFFIX@.vapi
+
+libvala@PACKAGE_SUFFIX@.vapi: $(top_srcdir)/gee/gee.vapi $(top_srcdir)/vala/vala.vapi
+       cat $^ > $@
+
 .PHONY: bootstrap
 bootstrap: all
        find $(top_srcdir) -name "*.vala.stamp" | xargs rm -f
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 4974954..1f5c2b2 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -2,9 +2,6 @@ NULL =
 
 vapidir = $(pkgdatadir)/vapi
 
-libvala@PACKAGE_SUFFIX@.vapi: $(top_srcdir)/gee/gee.vapi $(top_srcdir)/vala/vala.vapi
-       cat $^ > $@
-
 dist_vapi_DATA = \
        alsa.vapi \
        alsa.deps \
@@ -310,7 +307,6 @@ dist_vapi_DATA = \
        unique-1.0.deps \
        unique-1.0.vapi \
        v4l2.vapi \
-       libvala@PACKAGE_SUFFIX@.vapi \
        vte.deps \
        vte.vapi \
        vte-2.90.deps \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]