diff options
author | Jack Lloyd <[email protected]> | 2017-12-10 05:33:49 -0500 |
---|---|---|
committer | Jack Lloyd <[email protected]> | 2017-12-10 12:16:49 -0500 |
commit | da5db8c7220d1d0d71f7778628ae82d73ebdb013 (patch) | |
tree | 90c9574640d9932ee6611f224b2b3ea1a5ad461d /src/build-data | |
parent | 6284d7507130288fa8cc7ece096ecac56a81f8cd (diff) |
Add basic iteration constructs to template files
Eliminates the last bits of makefile-specific syntax from configure.py
Diffstat (limited to 'src/build-data')
-rw-r--r-- | src/build-data/makefile.in | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in index 9262bfd06..86a2f4f3f 100644 --- a/src/build-data/makefile.in +++ b/src/build-data/makefile.in @@ -59,11 +59,11 @@ install: libs cli docs $(PYTHON_EXE) $(SCRIPTS_DIR)/install.py --prefix=%{prefix} --build-dir="%{build_dir}" --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir} # Object Files -LIBOBJS = %{lib_objs} +LIBOBJS = %{join lib_objs} -CLIOBJS = %{cli_objs} +CLIOBJS = %{join cli_objs} -TESTOBJS = %{test_objs} +TESTOBJS = %{join test_objs} # Executable targets @@ -77,7 +77,7 @@ $(TEST): $(LIBRARIES) $(TESTOBJS) %{if build_fuzzers} -FUZZERS=%{fuzzer_bin} +FUZZERS = %{fuzzer_bin} fuzzers: libs $(FUZZERS) @@ -115,12 +115,26 @@ fuzzer_corpus_zip: fuzzer_corpus %{endif} # Build Commands -%{lib_build_cmds} -%{cli_build_cmds} +%{for lib_build_info} +%{obj}: %{src} + $(CXX) %{isa_flags} $(%{target_type}_FLAGS) %{include_paths} %{dash_c} %{src} %{dash_o}$@ +%{endfor} -%{test_build_cmds} +%{for cli_build_info} +%{obj}: %{src} + $(CXX) %{isa_flags} $(%{target_type}_FLAGS) %{include_paths} %{dash_c} %{src} %{dash_o}$@ +%{endfor} -%{if build_fuzzers} -%{fuzzer_build_cmds} -%{endif} +%{for test_build_info} +%{obj}: %{src} + $(CXX) %{isa_flags} $(%{target_type}_FLAGS) %{include_paths} %{dash_c} %{src} %{dash_o}$@ +%{endfor} + +%{for fuzzer_build_info} +%{obj}: %{src} + $(CXX) %{isa_flags} $(%{target_type}_FLAGS) %{include_paths} %{dash_c} %{src} %{dash_o}$@ + +%{exe}: %{obj} $(LIBRARIES) + $(EXE_LINK_CMD) %{obj} $(EXE_LINKS_TO) %{fuzzer_lib} %{output_to_exe}$@ +%{endfor} |