X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=scripts%2Fconfig%2FMakefile;h=3de98082b5793187fd30a8c5fb9df7b58e8368d8;hp=54c5fe25afe811e7df1cae401e7235f930b49e28;hb=37b5cb6f527684a71b902fce126e04bfda1ec61d;hpb=bbfcd026213dd2fc99897d8f47d7b2dde7ee138a

diff --git a/scripts/config/Makefile b/scripts/config/Makefile
index 54c5fe25af..3de98082b5 100644
--- a/scripts/config/Makefile
+++ b/scripts/config/Makefile
@@ -13,41 +13,39 @@
 # Platform specific fixes
 #
 # FreeBSD
-export CFLAGS+=-DKBUILD_NO_NLS
+
+check_lxdialog = $(shell $(SHELL) $(CURDIR)/lxdialog/check-lxdialog.sh -$(1))
+export CFLAGS += -DKBUILD_NO_NLS -I. $(call check_lxdialog,ccflags)
 
 conf-objs	:= conf.o zconf.tab.o
 mconf-objs	:= mconf.o zconf.tab.o
+lxdialog-objs := \
+	lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o \
+	lxdialog/textbox.o lxdialog/yesno.o lxdialog/menubox.o
 
-clean-files	:= lkc_defs.h qconf.moc .tmp_qtcheck \
-		   .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c
-
-all: conf mconf lxdialog/lxdialog
+clean-files	:= zconf.tab.c lex.zconf.c zconf.hash.c
 
-lxdialog/lxdialog:
-	$(MAKE) -C lxdialog
+all: conf mconf
 
 conf: $(conf-objs)
-mconf: $(mconf-objs) 
+mconf: $(mconf-objs) $(lxdialog-objs)
+	$(CC) -o $@ $^ $(call check_lxdialog,ldflags $(CC))
 
 clean:
-	rm -f *.o $(clean-files) conf mconf
-	$(MAKE) -C lxdialog clean
+	rm -f *.o lxdialog/*.o $(clean-files) conf mconf
 
-zconf.tab.o: lex.zconf.c zconf.hash.c confdata.c
+zconf.tab.o: zconf.lex.c zconf.hash.c confdata.c
 
 kconfig_load.o: lkc_defs.h
 
-lkc_defs.h: $(src)/lkc_proto.h
-	sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
-
 zconf.tab.c: zconf.y
-lex.zconf.c: zconf.l
+zconf.lex.c: zconf.l
 zconf.hash.c: zconf.gperf
 
 %.tab.c: %.y
 	cp $@_shipped $@ || bison -l -b $* -p $(notdir $*) $<
 
-lex.%.c: %.l
+%.lex.c: %.l
 	cp $@_shipped $@ || flex -L -P$(notdir $*) -o$@ $<
 
 %.hash.c: %.gperf