Browse Source

A few cosmetic adjustments, and fixup the makefile a bit

Eric Andersen 21 years ago
parent
commit
7c220dab2f
4 changed files with 15 additions and 13 deletions
  1. 2 0
      extra/config/.cvsignore
  2. 11 11
      extra/config/Makefile
  3. 1 1
      extra/config/zconf.tab.c_shipped
  4. 1 1
      extra/config/zconf.y

+ 2 - 0
extra/config/.cvsignore

@@ -4,3 +4,5 @@ lkc_defs.h
 lex.zconf.c
 zconf.tab.h
 zconf.tab.c
+lex.backup
+zconf.output

+ 11 - 11
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) \

+ 1 - 1
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();

+ 1 - 1
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();