Commit cbafbf7f authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kconfig: split the lexer out of zconf.y



Compile zconf.lex.c independently of the other files.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 558e78e3
Loading
Loading
Loading
Loading
+2 −6
Original line number Diff line number Diff line
@@ -143,11 +143,9 @@ help:

# ===========================================================================
# object files used by all kconfig flavours
common-objs	:= confdata.o expr.o symbol.o preprocess.o zconf.tab.o
common-objs	:= confdata.o expr.o symbol.o preprocess.o zconf.lex.o zconf.tab.o

targets		+= zconf.lex.c

# generated files seem to need this to find local include files
$(obj)/zconf.lex.o: $(obj)/zconf.tab.h
HOSTCFLAGS_zconf.lex.o	:= -I$(src)
HOSTCFLAGS_zconf.tab.o	:= -I$(src)

@@ -202,8 +200,6 @@ HOSTCFLAGS_gconf.o = $(shell . $(obj)/.gconf-cfg && echo $$cflags)

$(obj)/gconf.o: $(obj)/.gconf-cfg

$(obj)/zconf.tab.o: $(obj)/zconf.lex.c

# check if necessary packages are available, and configure build flags
define filechk_conf_cfg
	$(CONFIG_SHELL) $<
+3 −0
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ void *xrealloc(void *p, size_t size);
char *xstrdup(const char *s);
char *xstrndup(const char *s, size_t n);

/* zconf.l */
int yylex(void);

struct gstr {
	size_t len;
	char  *s;
+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@
#include <unistd.h>

#include "lkc.h"
#include "zconf.tab.h"

#define YY_DECL		static int yylex1(void)

+0 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@

int cdebug = PRINTD;

int yylex(void);
static void yyerror(const char *err);
static void zconfprint(const char *err, ...);
static void zconf_error(const char *err, ...);
@@ -729,6 +728,5 @@ void zconfdump(FILE *out)
	}
}

#include "zconf.lex.c"
#include "util.c"
#include "menu.c"