aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend/ninjabackend.py
diff options
context:
space:
mode:
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r--mesonbuild/backend/ninjabackend.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 6c99fb1..92503db 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -992,15 +992,14 @@ int dummy;
# Library name
args += ['--library=' + target.name]
# Outputted header
- hname = os.path.join(self.get_target_dir(target), target.vala_header if isinstance(target.vala_header, str) else (target.name + '.h'))
+ hname = os.path.join(self.get_target_dir(target), target.vala_header)
args += ['-H', hname]
valac_outputs.append(hname)
# Outputted vapi file
- base_vapi = target.vala_vapi if isinstance(target.vala_vapi, str) else (target.name + '.vapi')
- vapiname = os.path.join(self.get_target_dir(target), base_vapi)
+ vapiname = os.path.join(self.get_target_dir(target), target.vala_vapi)
# Force valac to write the vapi file in the target build dir.
# Without this, it will write it inside c_out_dir
- args += ['--vapi=../' + base_vapi]
+ args += ['--vapi=../' + target.vala_vapi]
valac_outputs.append(vapiname)
if self.environment.coredata.get_builtin_option('werror'):
args += valac.get_werror_args()