luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 06:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

meson: Improve gdbus-codegen custom target dependencies

Browse Source 
Ensure that the custom targets that use gdbus-codegen get rebuilt when
any of the gdbus-codegen files are changed.

https://bugzilla.gnome.org/show_bug.cgi?id=752239
This commit is contained in:
Nirbheek Chauhan 2017-10-11 16:06:58 +05:30
parent 17e29bebd9
commit b444ae0de2
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gio/gdbus-2.0/codegen/meson.build
View File

@ -23,18 +23,18 @@ gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
codegen_dir = join_paths(get_option('datadir'), 'glib-2.0/codegen') codegen_dir = join_paths(get_option('datadir'), 'glib-2.0/codegen')
configure_file(input : 'config.py.in', gdbus_codegen_built_files = []
gdbus_codegen_built_files += configure_file(input : 'config.py.in',
output : 'config.py', output : 'config.py',
install : true, install : true,
install_dir : codegen_dir, install_dir : codegen_dir,
configuration : gdbus_codegen_conf configuration : gdbus_codegen_conf)
)
blank_conf = configuration_data() blank_conf = configuration_data()
foreach f : gdbus_codegen_files foreach f : gdbus_codegen_files
# Copy these into the builddir so that gdbus-codegen can be used uninstalled # Copy these into the builddir so that gdbus-codegen can be used uninstalled
# and then install it too so that it can be used after installation # and then install it too so that it can be used after installation
configure_file(input : f, output : f, gdbus_codegen_built_files += configure_file(input : f, output : f,
install : true, install : true,
install_dir : codegen_dir, install_dir : codegen_dir,
configuration : blank_conf) configuration : blank_conf)

2
gio/meson.build
View File

@ -174,6 +174,7 @@ xdp_dbus_generated = custom_target('xdp-dbus',
'org.freedesktop.portal.NetworkMonitor.xml', 'org.freedesktop.portal.NetworkMonitor.xml',
'org.freedesktop.portal.ProxyResolver.xml'], 'org.freedesktop.portal.ProxyResolver.xml'],
output : ['xdp-dbus.h', 'xdp-dbus.c'], output : ['xdp-dbus.h', 'xdp-dbus.c'],
depend_files : gdbus_codegen_built_files,
command : [python, gdbus_codegen, command : [python, gdbus_codegen,
'--interface-prefix', 'org.freedesktop.portal.', '--interface-prefix', 'org.freedesktop.portal.',
'--output-directory', '@OUTDIR@', '--output-directory', '@OUTDIR@',
@ -193,6 +194,7 @@ xdp_dbus_generated = custom_target('xdp-dbus',
gdbus_daemon_generated = custom_target('gdbus-daemon-generated', gdbus_daemon_generated = custom_target('gdbus-daemon-generated',
input : ['dbus-daemon.xml'], input : ['dbus-daemon.xml'],
output : ['gdbus-daemon-generated.h', 'gdbus-daemon-generated.c'], output : ['gdbus-daemon-generated.h', 'gdbus-daemon-generated.c'],
depend_files : gdbus_codegen_built_files,
command : [python, gdbus_codegen, command : [python, gdbus_codegen,
'--interface-prefix', 'org.', '--interface-prefix', 'org.',
'--output-directory', '@OUTDIR@', '--output-directory', '@OUTDIR@',

1
gio/tests/meson.build
View File

@ -146,6 +146,7 @@ if host_machine.system() != 'windows'
input : ['test-codegen.xml'], input : ['test-codegen.xml'],
output : ['gdbus-test-codegen-generated.h', output : ['gdbus-test-codegen-generated.h',
'gdbus-test-codegen-generated.c'], 'gdbus-test-codegen-generated.c'],
depend_files : gdbus_codegen_built_files,
command : [python, gdbus_codegen, command : [python, gdbus_codegen,
'--interface-prefix', 'org.project.', '--interface-prefix', 'org.project.',
'--output-directory', '@OUTDIR@', '--output-directory', '@OUTDIR@',