summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-11-02 04:09:13 +0000
committerEric Andersen <andersen@codepoet.org>2002-11-02 04:09:13 +0000
commit7c220dab2f1fbaa34c637a04663db8f7b65f7b3a (patch)
tree4c19c5909cf0295ad20d863691d12e99bdaa2f56
parenta356ea2521cefa80c8622fd8a60d33300cb549e6 (diff)
A few cosmetic adjustments, and fixup the makefile a bit
-rw-r--r--extra/config/.cvsignore2
-rw-r--r--extra/config/Makefile22
-rw-r--r--extra/config/zconf.tab.c_shipped2
-rw-r--r--extra/config/zconf.y2
4 files changed, 15 insertions, 13 deletions
diff --git a/extra/config/.cvsignore b/extra/config/.cvsignore
index 4bd9a80f9..e8bf7a75b 100644
--- a/extra/config/.cvsignore
+++ b/extra/config/.cvsignore
@@ -4,3 +4,5 @@ lkc_defs.h
lex.zconf.c
zconf.tab.h
zconf.tab.c
+lex.backup
+zconf.output
diff --git a/extra/config/Makefile b/extra/config/Makefile
index 5b283a297..c782ce4eb 100644
--- a/extra/config/Makefile
+++ b/extra/config/Makefile
@@ -50,22 +50,22 @@ lex.zconf.o: lex.zconf.c $(lkc_deps)
$(NATIVE_CC) $(NATIVE_CFLAGS) -I. -c $< -o $@
lkc_defs.h: lkc_proto.h
- sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
+ @sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
###
# The following requires flex/bison
# By default we use the _shipped versions, uncomment the
# following line if you are modifying the flex/bison src.
-# LKC_GENPARSER := 1
+#LKC_GENPARSER := 1
-#ifdef LKC_GENPARSER
-#
-#%.tab.c %.tab.h: %.y
-# bison -t -d -v -b $* -p $(notdir $*) $<
-#
-#lex.%.c: %.l
-# flex -P$(notdir $*) -o$@ $<
-#else
+ifdef LKC_GENPARSER
+
+%.tab.c %.tab.h: %.y
+ bison -t -d -v -b $* -p $(notdir $*) $<
+
+lex.%.c: %.l
+ flex -P$(notdir $*) -o$@ $<
+else
lex.zconf.c: lex.zconf.c_shipped
cp lex.zconf.c_shipped lex.zconf.c
@@ -75,7 +75,7 @@ zconf.tab.c: zconf.tab.c_shipped
zconf.tab.h: zconf.tab.h_shipped
cp zconf.tab.h_shipped zconf.tab.h
-#endif
+endif
clean:
rm -f *.o *~ core $(TARGETS) $(MCONF_OBJS) $(CONF_OBJS) \
diff --git a/extra/config/zconf.tab.c_shipped b/extra/config/zconf.tab.c_shipped
index da46314d8..d8ba013b6 100644
--- a/extra/config/zconf.tab.c_shipped
+++ b/extra/config/zconf.tab.c_shipped
@@ -1639,7 +1639,7 @@ void conf_parse(const char *name)
sym_init();
menu_init();
- rootmenu.prompt = menu_add_prop(P_MENU, "Linux Kernel Configuration", NULL, NULL);
+ rootmenu.prompt = menu_add_prop(P_MENU, "uClibc Configuration", NULL, NULL);
//zconfdebug = 1;
zconfparse();
diff --git a/extra/config/zconf.y b/extra/config/zconf.y
index 79cb983a6..a05875997 100644
--- a/extra/config/zconf.y
+++ b/extra/config/zconf.y
@@ -424,7 +424,7 @@ void conf_parse(const char *name)
sym_init();
menu_init();
- rootmenu.prompt = menu_add_prop(P_MENU, "Linux Kernel Configuration", NULL, NULL);
+ rootmenu.prompt = menu_add_prop(P_MENU, "uClibc Configuration", NULL, NULL);
//zconfdebug = 1;
zconfparse();