History

[PATCH] kconfig: update kconfig Makefile

Remove the long obsolete zconf.tab.h and fix kconfig make rules to generate the correct output files. Setting LKC_GENPARSER will now also update the shipped files.

Roman Zippel committed 21 years ago

Commit 491d7111 parent 4cf3cbe2 files · +7 −136Browse files

Unified · Split

2 files
  1. scripts/kconfig/Makefile +7 −11
  2. scripts/kconfig/zconf.tab.h_shipped +0 −125
scripts/kconfig/Makefile+7−11
@@ -114,7 +114,7 @@ gconf-objs := gconf.o kconfig_load.o zconf.tab.o · 113 unmodified lines
114114 endif
115115
116116 clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \
117− .tmp_gtkcheck zconf.tab.c zconf.tab.h lex.zconf.c
117+ .tmp_gtkcheck zconf.tab.c lex.zconf.c
118118
119119 # Needed for systems without gettext
120120 KBUILD_HAVE_NLS := $(shell \
@@ -136,12 +136,6 @@ HOSTLOADLIBES_gconf = `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --libs` · 15 unmodified lines
136136 HOSTCFLAGS_gconf.o = `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --cflags` \
137137 -D LKC_DIRECT_LINK
138138
139−$(obj)/conf.o $(obj)/mconf.o $(obj)/qconf.o $(obj)/gconf.o $(obj)/kxgettext: $(obj)/zconf.tab.h
140−
141−$(obj)/zconf.tab.h: $(src)/zconf.tab.h_shipped
142−$(obj)/zconf.tab.c: $(src)/zconf.tab.c_shipped
143−$(obj)/lex.zconf.c: $(src)/lex.zconf.c_shipped
144−
145139 $(obj)/qconf.o: $(obj)/.tmp_qtcheck
146140
147141 ifeq ($(qconf-target),1)
@@ -230,13 +224,15 @@ $(obj)/lkc_defs.h: $(src)/lkc_proto.h · 82 unmodified lines
230224
231225 ifdef LKC_GENPARSER
232226
233−$(obj)/zconf.tab.c: $(obj)/zconf.y
234−$(obj)/zconf.tab.h: $(obj)/zconf.tab.c
227+$(obj)/zconf.tab.c: $(src)/zconf.y
228+$(obj)/lex.zconf.c: $(src)/zconf.l
235229
236230 %.tab.c: %.y
237− bison -t -d -v -b $* -p $(notdir $*) $<
231+ bison -l -b $* -p $(notdir $*) $<
232+ cp $@ $@_shipped
238233
239234 lex.%.c: %.l
240− flex -P$(notdir $*) -o$@ $<
235+ flex -L -P$(notdir $*) -o$@ $<
236+ cp $@ $@_shipped
241237
242238 endif
scripts/kconfig/zconf.tab.h_shipped+0−125
@@ -1,125 +0,0 @@
1−/* A Bison parser, made from zconf.y, by GNU bison 1.75. */
2−
3−/* Skeleton parser for Yacc-like parsing with Bison,
4− Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
5−
6− This program is free software; you can redistribute it and/or modify
7− it under the terms of the GNU General Public License as published by
8− the Free Software Foundation; either version 2, or (at your option)
9− any later version.
10−
11− This program is distributed in the hope that it will be useful,
12− but WITHOUT ANY WARRANTY; without even the implied warranty of
13− MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14− GNU General Public License for more details.
15−
16− You should have received a copy of the GNU General Public License
17− along with this program; if not, write to the Free Software
18− Foundation, Inc., 59 Temple Place - Suite 330,
19− Boston, MA 02111-1307, USA. */
20−
21−/* As a special exception, when this file is copied by Bison into a
22− Bison output file, you may use that output file without restriction.
23− This special exception was added by the Free Software Foundation
24− in version 1.24 of Bison. */
25−
26−#ifndef BISON_ZCONF_TAB_H
27−# define BISON_ZCONF_TAB_H
28−
29−/* Tokens. */
30−#ifndef YYTOKENTYPE
31−# define YYTOKENTYPE
32− /* Put the tokens into the symbol table, so that GDB and other debuggers
33− know about them. */
34− enum yytokentype {
35− T_MAINMENU = 258,
36− T_MENU = 259,
37− T_ENDMENU = 260,
38− T_SOURCE = 261,
39− T_CHOICE = 262,
40− T_ENDCHOICE = 263,
41− T_COMMENT = 264,
42− T_CONFIG = 265,
43− T_HELP = 266,
44− T_HELPTEXT = 267,
45− T_IF = 268,
46− T_ENDIF = 269,
47− T_DEPENDS = 270,
48− T_REQUIRES = 271,
49− T_OPTIONAL = 272,
50− T_PROMPT = 273,
51− T_DEFAULT = 274,
52− T_TRISTATE = 275,
53− T_BOOLEAN = 276,
54− T_INT = 277,
55− T_HEX = 278,
56− T_WORD = 279,
57− T_STRING = 280,
58− T_UNEQUAL = 281,
59− T_EOF = 282,
60− T_EOL = 283,
61− T_CLOSE_PAREN = 284,
62− T_OPEN_PAREN = 285,
63− T_ON = 286,
64− T_OR = 287,
65− T_AND = 288,
66− T_EQUAL = 289,
67− T_NOT = 290
68− };
69−#endif
70−#define T_MAINMENU 258
71−#define T_MENU 259
72−#define T_ENDMENU 260
73−#define T_SOURCE 261
74−#define T_CHOICE 262
75−#define T_ENDCHOICE 263
76−#define T_COMMENT 264
77−#define T_CONFIG 265
78−#define T_HELP 266
79−#define T_HELPTEXT 267
80−#define T_IF 268
81−#define T_ENDIF 269
82−#define T_DEPENDS 270
83−#define T_REQUIRES 271
84−#define T_OPTIONAL 272
85−#define T_PROMPT 273
86−#define T_DEFAULT 274
87−#define T_TRISTATE 275
88−#define T_BOOLEAN 276
89−#define T_INT 277
90−#define T_HEX 278
91−#define T_WORD 279
92−#define T_STRING 280
93−#define T_UNEQUAL 281
94−#define T_EOF 282
95−#define T_EOL 283
96−#define T_CLOSE_PAREN 284
97−#define T_OPEN_PAREN 285
98−#define T_ON 286
99−#define T_OR 287
100−#define T_AND 288
101−#define T_EQUAL 289
102−#define T_NOT 290
103−
104−
105−
106−
107−#ifndef YYSTYPE
108−#line 33 "zconf.y"
109−typedef union {
110− int token;
111− char *string;
112− struct symbol *symbol;
113− struct expr *expr;
114− struct menu *menu;
115−} yystype;
116−/* Line 1281 of /usr/share/bison/yacc.c. */
117−#line 118 "zconf.tab.h"
118−# define YYSTYPE yystype
119−#endif
120−
121−extern YYSTYPE zconflval;
122−
123−
124−#endif /* not BISON_ZCONF_TAB_H */
125−