From 32bde011b2522d302d72506884866bd809ef5bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= Date: Mon, 17 Dec 2018 22:52:40 +0100 Subject: build: Remove gdbus codegen workaround When gvfs was ported to meson `gdbus-codegen` was not able to generate the source and header files independently, and this caused issues on highly parallelized build. To avoid this issue a workaround was placed by using an external script. However, recently glib and meson acquired support for generating source and header files independently, so the workaround has been removed. --- common/meson.build | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'common') diff --git a/common/meson.build b/common/meson.build index a718783f..beef8c26 100644 --- a/common/meson.build +++ b/common/meson.build @@ -14,16 +14,12 @@ sources = files( 'gvfsutils.c', ) -# FIXME: Ugly workaround that simulates the generation of -# two different targets. -namespace = 'GVfsDBus' -name = namespace.to_lower() - -dbus_sources = custom_target( - name, - input: gvfs_namespace + '.xml', - output: [name + '.c', name + '.h'], - command: [codegen, gvfs_namespace + '.', name, namespace, meson.current_build_dir(), '@INPUT@', '@OUTPUT@'], +dbus_sources = gnome.gdbus_codegen( + 'gvfsdbus', + gvfs_namespace + '.xml', + interface_prefix: gvfs_namespace + '.', + namespace: 'GVfsDBus', + autocleanup: 'objects', ) deps = [ -- cgit v1.2.1