From e2b93beb83009ba8f2d53be2ae2494fea99bc902 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 3 Nov 2016 14:00:04 +0100 Subject: [PATCH] build: fix vala build of libnm.vapi make[2]: Entering directory './NetworkManager/NetworkManager-1.5.1/_build/sub' VAPIGEN vapi/libnm.vapi Gio-2.0.gir:62318.7-62318.47: warning: Virtual method `G.Resolver.lookup_service_async' conflicts with method of the same name Gio-2.0.gir:64704.7-64704.31: warning: Signal `G.Settings.change_event' conflicts with method of the same name Gio-2.0.gir:84847.7-84851.24: error: `UnixSocketAddress' already contains a definition for `abstract' Gio-2.0.gir:84690.7-84692.21: note: previous definition of `abstract' was here Makefile:16410: recipe for target 'vapi/libnm.vapi' failed Fixes: 0fa2cf19e52167f17dbe43fb1a162ce885f00fc9 --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index 06248d90af..c1d2979e52 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3946,6 +3946,7 @@ vapi/libnm-glib.vapi: $(top_builddir)/libnm-glib/NMClient-1.0.gir vapi/li vapi_libnm_vapi_METADATADIRS = $(srcdir)/vapi vapi_libnm_vapi_FILES = $(top_builddir)/libnm/NM-1.0.gir +vapi_libnm_vapi_DEPS = gio-2.0 vapi_libnm_util_vapi_METADATADIRS = $(srcdir)/vapi vapi_libnm_util_vapi_FILES = $(top_builddir)/libnm-util/NetworkManager-1.0.gir