Merge branch 'codegen-deps-fixes' into 'main'

meson: Add missing dependencies for utility files for gdbus-codegen

See merge request GNOME/glib!3689
This commit is contained in:
Emmanuele Bassi 2023-11-07 15:21:27 +00:00
commit 85d93fb581
2 changed files with 11 additions and 1 deletions

View File

@ -20,7 +20,10 @@ gdbus_example_objectmanager_generated = custom_target('objectmanager-gen',
'--generate-docbook', 'objectmanager-gen', '--generate-docbook', 'objectmanager-gen',
'--symbol-decorator', 'GDBUS_OBJECT_MANAGER_EXAMPLE_AVAILABLE_IN_ALL', '--symbol-decorator', 'GDBUS_OBJECT_MANAGER_EXAMPLE_AVAILABLE_IN_ALL',
'--symbol-decorator-header', 'gdbus-example-objectmanager-visibility.h', '--symbol-decorator-header', 'gdbus-example-objectmanager-visibility.h',
'@INPUT@']) '@INPUT@'],
depend_files : gdbus_codegen_built_files,
depends : gdbus_codegen_built_targets,
)
gdbus_example_objectmanager_rst_gen = custom_target('objectmanager-rst-gen', gdbus_example_objectmanager_rst_gen = custom_target('objectmanager-rst-gen',
input: gdbus_example_objectmanager_xml, input: gdbus_example_objectmanager_xml,
@ -36,6 +39,8 @@ gdbus_example_objectmanager_rst_gen = custom_target('objectmanager-rst-gen',
'--output-directory', '@OUTDIR@', '--output-directory', '@OUTDIR@',
'@INPUT@', '@INPUT@',
], ],
depend_files: gdbus_codegen_built_files,
depends: gdbus_codegen_built_targets,
) )
extra_c_args = [] extra_c_args = []

View File

@ -377,6 +377,7 @@ if host_machine.system() != 'windows'
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, depend_files : gdbus_codegen_built_files,
depends : gdbus_codegen_built_targets,
command : [python, gdbus_codegen, command : [python, gdbus_codegen,
'--interface-prefix', 'org.project.', '--interface-prefix', 'org.project.',
'--output-directory', '@OUTDIR@', '--output-directory', '@OUTDIR@',
@ -393,6 +394,7 @@ if host_machine.system() != 'windows'
output : ['gdbus-test-codegen-generated-min-required-2-64.h', output : ['gdbus-test-codegen-generated-min-required-2-64.h',
'gdbus-test-codegen-generated-min-required-2-64.c'], 'gdbus-test-codegen-generated-min-required-2-64.c'],
depend_files : gdbus_codegen_built_files, depend_files : gdbus_codegen_built_files,
depends : gdbus_codegen_built_targets,
command : [python, gdbus_codegen, command : [python, gdbus_codegen,
'--glib-min-required', '2.64', '--glib-min-required', '2.64',
'--interface-prefix', 'org.project.', '--interface-prefix', 'org.project.',
@ -409,6 +411,7 @@ if host_machine.system() != 'windows'
input : ['test-codegen.xml'], input : ['test-codegen.xml'],
output : ['gdbus-test-codegen-generated-interface-info.h'], output : ['gdbus-test-codegen-generated-interface-info.h'],
depend_files : gdbus_codegen_built_files, depend_files : gdbus_codegen_built_files,
depends : gdbus_codegen_built_targets,
command : [python, gdbus_codegen, command : [python, gdbus_codegen,
'--interface-info-header', '--interface-info-header',
annotate_args, annotate_args,
@ -418,6 +421,7 @@ if host_machine.system() != 'windows'
input : ['test-codegen.xml'], input : ['test-codegen.xml'],
output : ['gdbus-test-codegen-generated-interface-info.c'], output : ['gdbus-test-codegen-generated-interface-info.c'],
depend_files : gdbus_codegen_built_files, depend_files : gdbus_codegen_built_files,
depends : gdbus_codegen_built_targets,
command : [python, gdbus_codegen, command : [python, gdbus_codegen,
'--interface-info-body', '--interface-info-body',
annotate_args, annotate_args,
@ -532,6 +536,7 @@ if host_machine.system() != 'windows'
output : ['fake-document-portal-generated.h', output : ['fake-document-portal-generated.h',
'fake-document-portal-generated.c'], 'fake-document-portal-generated.c'],
depend_files : gdbus_codegen_built_files, depend_files : gdbus_codegen_built_files,
depends : gdbus_codegen_built_targets,
command : [python, gdbus_codegen, command : [python, gdbus_codegen,
'--interface-prefix', 'org.freedesktop.portal.', '--interface-prefix', 'org.freedesktop.portal.',
'--output-directory', '@OUTDIR@', '--output-directory', '@OUTDIR@',