diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-03-23 22:04:37 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-04-07 19:04:02 +0900 |
| commit | 4fa8bc949de11c99ee2433c602d43f87c452f4f2 (patch) | |
| tree | 63c75a716af9a76798f17cc4c7f4341f0decf39f /scripts | |
| parent | 3ca3273eaa509a6a17e33fc7d31714bfd9f65a38 (diff) | |
kbuild: rename *-asn1.[ch] to *.asn1.[ch]
Our convention is to distinguish file types by suffixes with a period
as a separator.
*-asn1.[ch] is a different pattern from other generated sources such
as *.lex.c, *.tab.[ch], *.dtb.S, etc. More confusing, files with
'-asn1.[ch]' are generated files, but '_asn1.[ch]' are checked-in
files:
net/netfilter/nf_conntrack_h323_asn1.c
include/linux/netfilter/nf_conntrack_h323_asn1.h
include/linux/sunrpc/gss_asn1.h
Rename generated files to *.asn1.[ch] for consistency.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.build | 4 | ||||
| -rw-r--r-- | scripts/asn1_compiler.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 15b3bbb3248b..8c3ca611b978 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -430,9 +430,9 @@ quiet_cmd_asn1_compiler = ASN.1 $@ cmd_asn1_compiler = $(objtree)/scripts/asn1_compiler $< \ $(subst .h,.c,$@) $(subst .c,.h,$@) -.PRECIOUS: $(objtree)/$(obj)/%-asn1.c $(objtree)/$(obj)/%-asn1.h +.PRECIOUS: $(objtree)/$(obj)/%.asn1.c $(objtree)/$(obj)/%.asn1.h -$(obj)/%-asn1.c $(obj)/%-asn1.h: $(src)/%.asn1 $(objtree)/scripts/asn1_compiler +$(obj)/%.asn1.c $(obj)/%.asn1.h: $(src)/%.asn1 $(objtree)/scripts/asn1_compiler $(call cmd,asn1_compiler) # Build the compiled-in targets diff --git a/scripts/asn1_compiler.c b/scripts/asn1_compiler.c index c1b7ef3e24c1..c146020fc783 100644 --- a/scripts/asn1_compiler.c +++ b/scripts/asn1_compiler.c @@ -1319,7 +1319,7 @@ static void render(FILE *out, FILE *hdr) fprintf(out, " * ASN.1 parser for %s\n", grammar_name); fprintf(out, " */\n"); fprintf(out, "#include <linux/asn1_ber_bytecode.h>\n"); - fprintf(out, "#include \"%s-asn1.h\"\n", grammar_name); + fprintf(out, "#include \"%s.asn1.h\"\n", grammar_name); fprintf(out, "\n"); if (ferror(out)) { perror(outputname); |