diff options
author | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-05-17 12:38:06 +0200 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-05-17 12:45:59 +0200 |
commit | ca4fd33969eb978c9bd18478892b1897510f829b (patch) | |
tree | 1e4e26eea5635a5c682c06ec1f4e28c76ac6bed8 | |
parent | 270395dd2f8d6c76ca4738f064bb9c0ce579fe57 (diff) | |
download | vala-ca4fd33969eb978c9bd18478892b1897510f829b.tar.gz |
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.
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile.am | 6 | ||||
-rw-r--r-- | vapi/.gitignore | 1 | ||||
-rw-r--r-- | vapi/Makefile.am | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index f0a229002..1a59179d7 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 813b3fc08..181271c41 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/.gitignore b/vapi/.gitignore deleted file mode 100644 index ab004281b..000000000 --- a/vapi/.gitignore +++ /dev/null @@ -1 +0,0 @@ -libvala-*.vapi diff --git a/vapi/Makefile.am b/vapi/Makefile.am index 49749543f..1f5c2b2bd 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 \ |