diff options
Diffstat (limited to 'libbuild2/in/target.cxx')
| -rw-r--r-- | libbuild2/in/target.cxx | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/libbuild2/in/target.cxx b/libbuild2/in/target.cxx index 0affc04..d664e3a 100644 --- a/libbuild2/in/target.cxx +++ b/libbuild2/in/target.cxx @@ -10,7 +10,7 @@ namespace build2 namespace in { static const target* - in_search (const target& xt, const prerequisite_key& cpk) + in_search (context& ctx, const target* xt, const prerequisite_key& cpk) { // If we have no extension then derive it from our target. Then delegate // to file_search(). @@ -18,18 +18,26 @@ namespace build2 prerequisite_key pk (cpk); optional<string>& e (pk.tk.ext); - if (!e) + if (!e && xt != nullptr) { - if (const file* t = xt.is_a<file> ()) + // Why is the extension, say, .h.in and not .in (with .h being in the + // name)? While this is mostly academic (in this case things will work + // the same either way), conceptually, it is a header template rather + // than some file template. In other words, we are adding the second + // level classification. + // + // See also the low verbosity tidying up code in the rule. + // + if (const file* t = xt->is_a<file> ()) { const string& te (t->derive_extension ()); e = te + (te.empty () ? "" : ".") + "in"; } else - fail << "prerequisite " << pk << " for a non-file target " << xt; + fail << "prerequisite " << pk << " for a non-file target " << *xt; } - return file_search (xt, pk); + return file_search (ctx, xt, pk); } static bool @@ -43,19 +51,17 @@ namespace build2 fail (l) << "pattern in in{} prerequisite" << endf; } - extern const char in_ext_def[] = ""; // No extension by default. - const target_type in::static_type { "in", &file::static_type, &target_factory<in>, - &target_extension_fix<in_ext_def>, + &target_extension_none, nullptr, /* default_extension */ // Taken care of by search. &in_pattern, - &target_print_1_ext_verb, // Same as file. + &target_print_1_ext_verb, // Same as file (but see rule). &in_search, - false + target_type::flag::none }; } } |