diff --git a/configure.py b/configure.py index 3b43c86c32f..05be62e3f2f 100755 --- a/configure.py +++ b/configure.py @@ -265,11 +265,14 @@ def find_headers_in(basedir, srcdir): self.fuzzer_output_dir = None self.fuzzobj_dir = None + self.miscobj_dir = os.path.join(self.build_dir, 'obj', 'misc') + def build_dirs(self): out = [ self.libobj_dir, self.cliobj_dir, self.testobj_dir, + self.miscobj_dir, self.public_include_dir, self.internal_include_dir, self.external_include_dir, @@ -2192,6 +2195,7 @@ def test_exe_extra_ldflags(): 'cliobj_dir': build_paths.cliobj_dir, 'testobj_dir': build_paths.testobj_dir, 'fuzzobj_dir': build_paths.fuzzobj_dir, + 'miscobj_dir': build_paths.miscobj_dir, 'fuzzer_output_dir': build_paths.fuzzer_output_dir if build_paths.fuzzer_output_dir else '', 'doc_output_dir': build_paths.doc_output_dir, diff --git a/src/build-data/ninja.in b/src/build-data/ninja.in index e2ee02ed2c2..0ecdee71f80 100644 --- a/src/build-data/ninja.in +++ b/src/build-data/ninja.in @@ -120,18 +120,18 @@ build examples: phony | %{example_bin} %{if build_bogo_shim} -build botan_bogo_shim: link_cli bogo_shim_object | %{library_targets} +build %{out_dir}/botan_bogo_shim: link_cli %{miscobj_dir}/bogo_shim.o | %{library_targets} # BoGo shim -build %{out_dir}/bogo_shim_object: compile_exe %{bogo_shim_src} +build %{miscobj_dir}/bogo_shim.o: compile_exe %{bogo_shim_src} %{endif} %{if build_ct_selftest} -build botan_ct_selftest: link_cli ct_selftest_object | %{library_targets} +build %{out_dir}/botan_ct_selftest: link_cli %{miscobj_dir}/ct_selftest.o | %{library_targets} -build %{out_dir}/ct_selftest_object: compile_exe %{ct_selftest_src} +build %{miscobj_dir}/ct_selftest.o: compile_exe %{ct_selftest_src} %{endif} @@ -166,9 +166,9 @@ build cli: phony %{cli_exe} build tests: phony %{test_exe} -build bogo_shim: phony botan_bogo_shim +build bogo_shim: phony %{out_dir}/botan_bogo_shim -build ct_selftest: phony botan_ct_selftest +build ct_selftest: phony %{out_dir}/botan_ct_selftest build libs: phony %{library_targets} $ %{if symlink_shared_lib}