summaryrefslogtreecommitdiff
path: root/metadata
diff options
context:
space:
mode:
authorIñigo Martínez <inigomartinez@gmail.com>2018-12-17 22:52:40 +0100
committerIñigo Martínez <inigomartinez@gmail.com>2019-01-04 16:33:53 +0100
commit32bde011b2522d302d72506884866bd809ef5bda (patch)
tree92559d613009f763cc67df5a8a019d2bdde963ef /metadata
parentdc34f1be6a3c1fa6d5615ad5d647003e7ce3196f (diff)
downloadgvfs-32bde011b2522d302d72506884866bd809ef5bda.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 'metadata')
-rw-r--r--metadata/meson.build16
1 files changed, 6 insertions, 10 deletions
diff --git a/metadata/meson.build b/metadata/meson.build
index bbfd09fd..e51f1564 100644
--- a/metadata/meson.build
+++ b/metadata/meson.build
@@ -29,16 +29,12 @@ metadata_service = configure_file(
install_dir: dbus_session_bus_services_dir,
)
-# FIXME: Ugly workaround that simulates the generation of
-# two different targets.
-namespace = 'GVfs'
-name = 'metadata-dbus'
-
-dbus_sources = custom_target(
- name,
- input: 'dbus-interface.xml',
- output: [name + '.c', name + '.h'],
- command: [codegen, gvfs_namespace + '.', name, namespace, meson.current_build_dir(), '@INPUT@', '@OUTPUT@'],
+dbus_sources = gnome.gdbus_codegen(
+ 'metadata-dbus',
+ 'dbus-interface.xml',
+ interface_prefix: gvfs_namespace + '.',
+ namespace: 'GVfs',
+ autocleanup: 'objects',
)
sources = files(