From aff78f72d85f9b21bc151aceed5d45cb12ae1e6f Mon Sep 17 00:00:00 2001 From: Maciek Borzecki Date: Sun, 1 Nov 2015 19:52:33 +0100 Subject: [PATCH] Makefile: remove VAPI autogeneration VAPI is autogenerated based on GObject introspection. The problem is that for gir to work a library must be run on the host, what obviously brakes if cross compilation is used. As a workaround use the hand generated VAPI and completely dump autogeneration. --- Makefile.am | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index 80a3396..527225d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,17 +64,6 @@ test_mconn_crypt_vala_CFLAGS = $(MCONNECT_CFLAGS) -Isrc -I. VALAFLAGS = -g $(MCONNECT_VALAFLAGS) --vapidir=. --pkg=mconn-crypt -mconn-crypt.gir: libmconn-crypt.la - rm -f $@ - $(G_IR_SCANNER) src/mconn-crypt.[ch] $(MCONNECT_CFLAGS) \ - --include=GObject-2.0 \ - --namespace=MConn --library $< \ - --output=$@ - -mconn-crypt.vapi: mconn-crypt.gir - rm -f $@ - $(VALA_API_GEN) --library mconn-crypt $< - # configure will expand bindir to ${exec_prefix}/bin, we want the # whole thing, that's why mconnect.desktop is generated here and not # in configure @@ -90,7 +79,7 @@ git-source-dist: gzip -c > mconnect-$${gitsha}.tar.gz GEN_FROM_VALA = $(filter %.vala,$(mconnect_SOURCES)) -BUILT_SOURCES = mconn-crypt.vapi mconn-crypt.gir mconnect.desktop \ +BUILT_SOURCES = mconnect.desktop \ $(GEN_FROM_VALA:.vala=.c) CLEANFILES = $(BUILT_SOURCES)