aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorentin Noël <corentin.noel@collabora.com>2018-06-18 13:06:37 +0100
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2018-06-19 03:22:18 +0000
commit4aa848d5d6b5d85aa02abcdd445770db801e0b0c (patch)
tree21facc3a75c0d5e4b25a17ca74e95b4acef2f7c4
parent59f87e5cd1cef9404a4e3a78b7c397f0ec0e4b29 (diff)
downloadmeson-4aa848d5d6b5d85aa02abcdd445770db801e0b0c.zip
meson-4aa848d5d6b5d85aa02abcdd445770db801e0b0c.tar.gz
meson-4aa848d5d6b5d85aa02abcdd445770db801e0b0c.tar.bz2
Properly name the targets
-rw-r--r--mesonbuild/modules/gnome.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 05108d0..ef849cd 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -957,8 +957,8 @@ This will become a hard error in the future.''')
'build_by_default': build_by_default
}
- base_custom_target = build.CustomTarget(output, state.subdir, state.subproject, custom_kwargs)
- targets.append(base_custom_target)
+ cfile_custom_target = build.CustomTarget(output, state.subdir, state.subproject, custom_kwargs)
+ targets.append(cfile_custom_target)
output = namebase + '.h'
if mesonlib.version_compare(self._get_native_glib_version(state), '>= 2.56.2'):
@@ -976,10 +976,11 @@ This will become a hard error in the future.''')
'build_by_default': build_by_default,
'install': install_header,
'install_dir': install_dir,
- 'depends': base_custom_target
+ 'depends': cfile_custom_target
}
- targets.append(build.CustomTarget(output, state.subdir, state.subproject, custom_kwargs))
+ hfile_custom_target = build.CustomTarget(output, state.subdir, state.subproject, custom_kwargs)
+ targets.append(hfile_custom_target)
if 'docbook' in kwargs:
docbook = kwargs['docbook']
@@ -1005,10 +1006,11 @@ This will become a hard error in the future.''')
'output': outputs,
'command': cmd,
'build_by_default': build_by_default,
- 'depends': base_custom_target
+ 'depends': cfile_custom_target
}
- targets.append(build.CustomTarget(output, state.subdir, state.subproject, custom_kwargs))
+ docbook_custom_target = build.CustomTarget(output, state.subdir, state.subproject, custom_kwargs)
+ targets.append(docbook_custom_target)
return ModuleReturnValue(targets, targets)