diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-10-25 10:06:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-25 10:06:49 -0700 |
| commit | 2d058bdcff4c7da855826fc05bb8cdde7cff50c7 (patch) | |
| tree | 04b9d499fc1ee6ec0cde85a57cdd32478262b532 /mesonbuild/backend/ninjabackend.py | |
| parent | 3c48bd2d88e94db2c9f6e714b7b320889a5dcb38 (diff) | |
| parent | 66518d4dadef7bdb09bf1dc80682e1f9d33f1a1b (diff) | |
| download | meson-2d058bdcff4c7da855826fc05bb8cdde7cff50c7.zip meson-2d058bdcff4c7da855826fc05bb8cdde7cff50c7.tar.gz meson-2d058bdcff4c7da855826fc05bb8cdde7cff50c7.tar.bz2 | |
Merge pull request #912 from valum-framework/wip/vala-custom-header-and-vapi
vala: Custom header and vapi name (fix #892)
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index f826f89..1c856a1 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1027,15 +1027,14 @@ int dummy; # Library name args += ['--library=' + target.name] # Outputted header - hname = os.path.join(self.get_target_dir(target), 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.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', os.path.join('..', target.vala_vapi)] valac_outputs.append(vapiname) if self.environment.coredata.get_builtin_option('werror'): args += valac.get_werror_args() |