Add test_lucy.o to Makefile clean target
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/8d58931a Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/8d58931a Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/8d58931a Branch: refs/heads/master Commit: 8d58931a592f26ad46a62f1683f112e4a860848f Parents: 2030561 Author: Nick Wellnhofer <[email protected]> Authored: Fri Mar 4 13:25:14 2016 +0100 Committer: Nick Wellnhofer <[email protected]> Committed: Fri Mar 4 13:41:23 2016 +0100 ---------------------------------------------------------------------- common/charmonizer.c | 10 +++++++--- common/charmonizer.main | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/8d58931a/common/charmonizer.c ---------------------------------------------------------------------- diff --git a/common/charmonizer.c b/common/charmonizer.c index d2ba280..e3e0da4 100644 --- a/common/charmonizer.c +++ b/common/charmonizer.c @@ -8449,10 +8449,13 @@ lucy_MakeFile_write_c_test_rules(lucy_MakeFile *self) { chaz_CFlags *cflags; chaz_CFlags *link_flags; chaz_MakeRule *rule; + chaz_MakeRule *clean_rule; char *test_lucy_exe; char *test_lucy_obj; + clean_rule = chaz_MakeFile_clean_rule(self->makefile); + test_lucy_exe = chaz_Util_join("", "t", dir_sep, "test_lucy", exe_ext, NULL); test_lucy_obj = chaz_Util_join("", "t", dir_sep, "test_lucy", obj_ext, @@ -8487,6 +8490,8 @@ lucy_MakeFile_write_c_test_rules(lucy_MakeFile *self) { chaz_MakeRule_add_command_with_libpath(rule, test_lucy_exe, ".", NULL); } + chaz_MakeRule_add_rm_command(clean_rule, test_lucy_obj); + if (chaz_CLI_defined(self->cli, "enable-coverage")) { rule = chaz_MakeFile_add_rule(self->makefile, "coverage", test_lucy_exe); chaz_MakeRule_add_command(rule, @@ -8514,9 +8519,8 @@ lucy_MakeFile_write_c_test_rules(lucy_MakeFile *self) { " --output-directory coverage" " lucy.info"); - rule = chaz_MakeFile_clean_rule(self->makefile); - chaz_MakeRule_add_rm_command(rule, "lucy.info"); - chaz_MakeRule_add_recursive_rm_command(rule, "coverage"); + chaz_MakeRule_add_rm_command(clean_rule, "lucy.info"); + chaz_MakeRule_add_recursive_rm_command(clean_rule, "coverage"); } free(test_lucy_exe); http://git-wip-us.apache.org/repos/asf/lucy/blob/8d58931a/common/charmonizer.main ---------------------------------------------------------------------- diff --git a/common/charmonizer.main b/common/charmonizer.main index 800442e..ac949fd 100644 --- a/common/charmonizer.main +++ b/common/charmonizer.main @@ -554,10 +554,13 @@ lucy_MakeFile_write_c_test_rules(lucy_MakeFile *self) { chaz_CFlags *cflags; chaz_CFlags *link_flags; chaz_MakeRule *rule; + chaz_MakeRule *clean_rule; char *test_lucy_exe; char *test_lucy_obj; + clean_rule = chaz_MakeFile_clean_rule(self->makefile); + test_lucy_exe = chaz_Util_join("", "t", dir_sep, "test_lucy", exe_ext, NULL); test_lucy_obj = chaz_Util_join("", "t", dir_sep, "test_lucy", obj_ext, @@ -592,6 +595,8 @@ lucy_MakeFile_write_c_test_rules(lucy_MakeFile *self) { chaz_MakeRule_add_command_with_libpath(rule, test_lucy_exe, ".", NULL); } + chaz_MakeRule_add_rm_command(clean_rule, test_lucy_obj); + if (chaz_CLI_defined(self->cli, "enable-coverage")) { rule = chaz_MakeFile_add_rule(self->makefile, "coverage", test_lucy_exe); chaz_MakeRule_add_command(rule, @@ -619,9 +624,8 @@ lucy_MakeFile_write_c_test_rules(lucy_MakeFile *self) { " --output-directory coverage" " lucy.info"); - rule = chaz_MakeFile_clean_rule(self->makefile); - chaz_MakeRule_add_rm_command(rule, "lucy.info"); - chaz_MakeRule_add_recursive_rm_command(rule, "coverage"); + chaz_MakeRule_add_rm_command(clean_rule, "lucy.info"); + chaz_MakeRule_add_recursive_rm_command(clean_rule, "coverage"); } free(test_lucy_exe);
