From 8975933179908dbff352d01018b5fbbf60d6c0d9 Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Sun, 2 Aug 2009 13:44:10 +0200
Subject: make new mconf compile and update .gitignore

---
 .gitignore      |  4 ++++
 config/Makefile | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 931ccdf1e..a42417b2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,10 @@
 config/conf
+config/lex.backup
 config/lex.zconf.c
 config/lkc_defs.h
 config/mconf
+config/zconf.hash.c
+config/zconf.output
 config/zconf.tab.c
 config/zconf.tab.h
 prereq.mk
@@ -15,6 +18,7 @@ root_*/
 bin_*/
 build_*/
 config/*.o
+config/lxdialog/*.o
 make.log
 dl/
 package/*/info.mk
diff --git a/config/Makefile b/config/Makefile
index 1f6debc8f..ae7a293dd 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -36,9 +36,9 @@ endif
 endif
 
 CONF_SRC  =conf.c
-MCONF_SRC =mconf.c checklist.c menubox.c textbox.c yesno.c inputbox.c util.c msgbox.c
-SHARED_SRC=zconf.tab.c glob.c
-SHARED_DEPS:=lkc.h lkc_proto.h lkc_defs.h expr.h zconf.tab.h glob.h
+MCONF_SRC =mconf.c $(wildcard lxdialog/*.c)
+SHARED_SRC=zconf.tab.c
+SHARED_DEPS:=lkc.h lkc_proto.h lkc_defs.h expr.h zconf.tab.h
 CONF_OBJS =$(patsubst %.c,%.o, $(CONF_SRC))
 MCONF_OBJS=$(patsubst %.c,%.o, $(MCONF_SRC))
 SHARED_OBJS=$(patsubst %.c,%.o, $(SHARED_SRC))
@@ -72,13 +72,16 @@ ifdef LKC_GENPARSER
 %.tab.c %.tab.h: %.y
 	bison -t -d -v -b $* -p $(notdir $*) $<
 
+%.hash.c: %.gperf
+	gperf < $< > $@
+
 lex.%.c: %.l
 	flex -P$(notdir $*) -o$@ $<
 
 lex.zconf.o: lex.zconf.c $(SHARED_DEPS)
 	$(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@
 
-zconf.tab.o: zconf.tab.c lex.zconf.c confdata.c expr.c symbol.c menu.c $(SHARED_DEPS)
+zconf.tab.o: zconf.tab.c zconf.hash.c lex.zconf.c confdata.c expr.c symbol.c menu.c $(SHARED_DEPS)
 	$(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@
 
 else
@@ -89,7 +92,10 @@ lex.zconf.o: lex.zconf.c $(SHARED_DEPS)
 lex.zconf.c: lex.zconf.c_shipped
 	$(CP) lex.zconf.c_shipped lex.zconf.c
 
-zconf.tab.o: zconf.tab.c lex.zconf.c confdata.c expr.c symbol.c menu.c $(SHARED_DEPS)
+zconf.hash.c: zconf.hash.c_shipped
+	$(CP) zconf.hash.c_shipped zconf.hash.c
+
+zconf.tab.o: zconf.tab.c zconf.hash.c lex.zconf.c confdata.c expr.c symbol.c menu.c $(SHARED_DEPS)
 	$(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@
 
 zconf.tab.c: zconf.tab.c_shipped
-- 
cgit v1.2.3