diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2018-12-17 22:52:40 +0100 |
|---|---|---|
| committer | Iñigo Martínez <inigomartinez@gmail.com> | 2019-01-21 21:18:06 +0100 |
| commit | 5d2533279cdc4660fa0a6f85d86c3d90d665e9f6 (patch) | |
| tree | 30d1c39d585fa31a0a954149371bc43da5f0fbec /common | |
| parent | 3ba59ec6deaaa5e0efca2882bf9536319f3f60ca (diff) | |
| download | gvfs-5d2533279cdc4660fa0a6f85d86c3d90d665e9f6.tar.gz | |
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.
Diffstat (limited to 'common')
| -rw-r--r-- | common/meson.build | 16 |
1 files changed, 6 insertions, 10 deletions
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 = [ |