Improved build system for flatpak environments

powerwaremediacore · May 26, 2016 · eab0cd7 · eab0cd7
1 parent 3e48b35
commit eab0cd7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/librescl/Makefile.am b/librescl/Makefile.am
@@ -160,6 +160,7 @@ if DEBUG
 endif
 
 AM_VALAFLAGS += \
+	--vapidir=$(VAPIDIR) \
 	$(top_srcdir)/vapi/config.vapi \
 	--pkg gxml-0.10 \
 	-C -H lscl.h \
@@ -202,7 +203,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = lscl-0.6.pc
 
 lscl-0.6.vapi: liblscl-0.6.la
-vapidir = $(datadir)/vala/vapi
+vapidir = $(VAPIDIR)
 dist_vapi_DATA = \
 	lscl-0.6.vapi \
 	lscl-0.6.deps

diff --git a/plugins/default/Makefile.am b/plugins/default/Makefile.am
@@ -37,6 +37,7 @@ if DEBUG
 endif
 
 AM_VALAFLAGS += \
+	--vapidir=$(VAPIDIR) \
 	$(top_srcdir)/vapi/config.vapi \
 	$(top_builddir)/librescl/lscl-0.6.vapi \
 	--pkg gxml-0.10 \

diff --git a/test/Makefile.am b/test/Makefile.am
@@ -28,8 +28,10 @@ sources = \
 	private-test.vala
 
 AM_VALAFLAGS = \
+	--vapidir=$(VAPIDIR) \
 	--vapidir=$(top_builddir)/librescl \
-	$(top_srcdir)/vapi/config.vapi \
+	--vapidir=$(top_srcdir)/vapi
+	--pkg config \
 	--pkg glib-2.0 \
 	--pkg gio-2.0 \
 	--pkg gee-0.8 \