Hi, On Sun, May 22, 2011 at 10:17 PM, Arnaud Lacombe <lacombar@xxxxxxxxx> wrote: > Hi, > > On Thu, May 5, 2011 at 10:23 AM, Michal Marek <mmarek@xxxxxxx> wrote: >> On Wed, May 04, 2011 at 10:03:17PM -0400, Arnaud Lacombe wrote: >>> --- >>> scripts/genksyms/.gitignore | 6 ++-- >>> scripts/genksyms/Makefile | 45 +++++++++++++----------------------------- >>> scripts/genksyms/genksyms.c | 11 ++++----- >>> scripts/genksyms/genksyms.l | 7 ++--- >>> scripts/genksyms/genksyms.y | 2 + >>> 5 files changed, 27 insertions(+), 44 deletions(-) >>> >>> diff --git a/scripts/genksyms/.gitignore b/scripts/genksyms/.gitignore >>> index be5cadb..0983577 100644 >>> --- a/scripts/genksyms/.gitignore >>> +++ b/scripts/genksyms/.gitignore >>> @@ -1,4 +1,4 @@ >>> -keywords.c >>> -lex.c >>> -parse.[ch] >>> genksyms >>> +genksyms.tab.c >>> +lex.genksyms.c >>> +genksyms.hash.c >>> diff --git a/scripts/genksyms/Makefile b/scripts/genksyms/Makefile >>> index e420fe4..82bb25f 100644 >>> --- a/scripts/genksyms/Makefile >>> +++ b/scripts/genksyms/Makefile >>> @@ -2,52 +2,35 @@ >>> hostprogs-y := genksyms >>> always := $(hostprogs-y) >>> >>> -genksyms-objs := genksyms.o parse.o lex.o >>> +genksyms-objs := genksyms.o genksyms.tab.o >>> >>> # -I needed for generated C source (shipped source) >>> HOSTCFLAGS_parse.o := -Wno-uninitialized -I$(src) >>> >>> -# dependencies on generated files need to be listed explicitly >>> -$(obj)/lex.o: $(obj)/parse.h $(obj)/keywords.c >>> - >>> # -I needed for generated C source (shipped source) >>> HOSTCFLAGS_lex.o := -I$(src) >>> >>> -ifdef GENERATE_PARSER >>> - >>> -# gperf >>> +clean-files := genksyms.tab.c lex.genksyms.c genksyms.hash.c >> >> Given that you are overwriting most of this by "kbuild: merge parser >> generation rules", I suggest you only do the necessary minimum at this >> point, i.e. only reflect the file renames and #include the lexer into >> the parser. >> > That would break bisect-ability, which I would like to keep. > Just thinking about it, I will re-do all the pre-merge operations (renaming, adaptation, ...) on .l/.y/.gperf files, then do the merge, then regenerate all parsers. That will remove needs for intermediate parsers regeneration, and hopefully, keep bisect-ability as long as parsers are no regenerated. - Arnaud -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
