Message ID | 20190720162740.4292-1-yamada.masahiro@socionext.com |
---|---|
State | Accepted |
Commit | 49d5089d926c2bf0c76410bf32e5c48b296ec6f6 |
Headers | show |
Series | [1/3] kbuild: use $(basename ...) for cmd_asn1_compiler | expand |
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 644431140434..7f71dbd180cb 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -388,9 +388,9 @@ $(obj)/%.lds: $(src)/%.lds.S FORCE # ASN.1 grammar # --------------------------------------------------------------------------- -quiet_cmd_asn1_compiler = ASN.1 $@ +quiet_cmd_asn1_compiler = ASN.1 $(basename $@).[ch] cmd_asn1_compiler = $(objtree)/scripts/asn1_compiler $< \ - $(subst .h,.c,$@) $(subst .c,.h,$@) + $(basename $@).c $(basename $@).h $(obj)/%.asn1.c $(obj)/%.asn1.h: $(src)/%.asn1 $(objtree)/scripts/asn1_compiler $(call cmd,asn1_compiler)
$(basename ...) trims the last suffix. Using it is more intuitive in my opinion. This pattern rule makes %.asn1.c and %.asn1.h at the same time. Previously, the short log showed only either of them, depending on the target file in question. To clarify that two files are being generated by the single recipe, I changed the log as follows: Before: ASN.1 crypto/asymmetric_keys/x509.asn1.c After: ASN.1 crypto/asymmetric_keys/x509.asn1.[ch] Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- scripts/Makefile.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.1