aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend/ninjabackend.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-03-17 21:24:13 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2016-03-17 21:24:13 +0200
commitb5c7cca0dce1ad13dcf30ddaaf5fe52ceb5bec3d (patch)
tree3069b20b0ecead11e2d043b7bf8bc456e04f0dea /mesonbuild/backend/ninjabackend.py
parentde03ae5af0d8fd56e37d068e0bb405f74e62f30f (diff)
downloadmeson-b5c7cca0dce1ad13dcf30ddaaf5fe52ceb5bec3d.zip
meson-b5c7cca0dce1ad13dcf30ddaaf5fe52ceb5bec3d.tar.gz
meson-b5c7cca0dce1ad13dcf30ddaaf5fe52ceb5bec3d.tar.bz2
Works when mixing Java and C.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r--mesonbuild/backend/ninjabackend.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index f1a02c9..f8ec44f 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -294,20 +294,20 @@ int dummy;
header_deps=header_deps))
src_list = []
for src in gen_src_deps:
- src_list.append(src)
- if is_unity:
- unity_src.append(os.path.join(self.environment.get_build_dir(), src))
+ src_list.append(src)
+ if is_unity:
+ unity_src.append(os.path.join(self.environment.get_build_dir(), src))
+ header_deps.append(src)
+ else:
+ # Generated targets are ordered deps because the must exist
+ # before the sources compiling them are used. After the first
+ # compile we get precise dependency info from dep files.
+ # This should work in all cases. If it does not, then just
+ # move them from orderdeps to proper deps.
+ if self.environment.is_header(src):
header_deps.append(src)
else:
- # Generated targets are ordered deps because the must exist
- # before the sources compiling them are used. After the first
- # compile we get precise dependency info from dep files.
- # This should work in all cases. If it does not, then just
- # move them from orderdeps to proper deps.
- if self.environment.is_header(src):
- header_deps.append(src)
- else:
- obj_list.append(self.generate_single_compile(target, outfile, src, True, [], header_deps))
+ obj_list.append(self.generate_single_compile(target, outfile, src, True, [], header_deps))
for src in target.get_sources():
if src.endswith('.vala'):
continue