From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Thu, 1 Jun 2017 16:10:12 +0000 (+0200)
Subject: build: Generate libvala-0.XX.vapi in vala
X-Git-Tag: 0.37.1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a828342c4195e7f3cea23f56cb037dff69b5d506;p=thirdparty%2Fvala.git

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

diff --git a/Makefile.am b/Makefile.am
index 181271c41..813b3fc08 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 f3ea3e6e3..e6cf9f0a6 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 = \