[vala/wip/merge-valadoc: 2/5] build: Generate libvala-0.XX.vapi in vala



commit 635b49f8bfaee2583d829546e305e40ab1aa8b9d
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Thu Jun 1 18:10:12 2017 +0200

    build: Generate libvala-0.XX.vapi in vala

 Makefile.am      |    6 ------
 vala/Makefile.am |    6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 181271c..813b3fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,12 +26,6 @@ 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/vala/Makefile.am b/vala/Makefile.am
index f3ea3e6..e6cf9f0 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -204,6 +204,12 @@ libvala@PACKAGE_SUFFIX@_la_LIBADD = \
        $(top_builddir)/gee/libgee.la \
        $(NULL)
 
+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 $^ > $@
+
 EXTRA_DIST = $(libvala_la_VALASOURCES) vala.vapi vala.vala.stamp vala.h
 
 MAINTAINERCLEANFILES = \


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