diff options
author | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-27 16:10:27 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@neptun.ravnborg.org> | 2006-09-30 05:19:19 -0400 |
commit | 2982de6993e6d9944f2215d7cb9b558b465a0c99 (patch) | |
tree | 3b4765905e7c53e2a03ed599692d2636623e22a5 /scripts/kconfig/Makefile | |
parent | 350b5b76384e77bcc58217f00455fdbec5cac594 (diff) |
kconfig/menuconfig: lxdialog is now built-in
lxdialog was previously called as an external program causing screen
to flicker when used. With this patch lxdialog is now built-in.
It is loosly based om previous work by: Petr Baudis <pasky@ucw.cz>
Following is a list of changes:
o Moved build of dialog routings to kconfig Makefile
o menubox + checklist uses a new item list to hold all menu items
o in util.c implmented helper function to deal with item list
o menubox now uses parameters to save scroll state (avoids temp file)
o textbox now get text to be displayed as parameter and not a file
o make sure to properly delete subwin's before main windows
o killed unused files: lxdialog.c msgbox.c
o modified return value for ESC to match direct calling
o in a few places the code has been adjusted to 80 char wide
o in textbox a small refactoring was made to make code remotely readable
o in mconf removed all unused stuff (functions/variables)
Following is a list of know short comings:
a) pressing ESC twice will be interpreted as two ESC presses
b) resize does not work. menuconfig needs to be restarted to be adjusted
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'scripts/kconfig/Makefile')
-rw-r--r-- | scripts/kconfig/Makefile | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index a90d3cc76bfa..b2928f039c17 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
@@ -11,7 +11,6 @@ gconfig: $(obj)/gconf | |||
11 | $< arch/$(ARCH)/Kconfig | 11 | $< arch/$(ARCH)/Kconfig |
12 | 12 | ||
13 | menuconfig: $(obj)/mconf | 13 | menuconfig: $(obj)/mconf |
14 | $(Q)$(MAKE) $(build)=scripts/kconfig/lxdialog | ||
15 | $< arch/$(ARCH)/Kconfig | 14 | $< arch/$(ARCH)/Kconfig |
16 | 15 | ||
17 | config: $(obj)/conf | 16 | config: $(obj)/conf |
@@ -81,6 +80,23 @@ help: | |||
81 | @echo ' allyesconfig - New config where all options are accepted with yes' | 80 | @echo ' allyesconfig - New config where all options are accepted with yes' |
82 | @echo ' allnoconfig - New config where all options are answered with no' | 81 | @echo ' allnoconfig - New config where all options are answered with no' |
83 | 82 | ||
83 | # lxdialog stuff | ||
84 | check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh | ||
85 | |||
86 | # Use reursively expanded variables so we do not call gcc unless | ||
87 | # we really need to do so. (Do not call gcc as part of make mrproper) | ||
88 | HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) | ||
89 | HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) | ||
90 | |||
91 | HOST_EXTRACFLAGS += -DLOCALE | ||
92 | |||
93 | PHONY += $(obj)/dochecklxdialog | ||
94 | $(obj)/dochecklxdialog: | ||
95 | $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_LOADLIBES) | ||
96 | |||
97 | always := dochecklxdialog | ||
98 | |||
99 | |||
84 | # =========================================================================== | 100 | # =========================================================================== |
85 | # Shared Makefile for the various kconfig executables: | 101 | # Shared Makefile for the various kconfig executables: |
86 | # conf: Used for defconfig, oldconfig and related targets | 102 | # conf: Used for defconfig, oldconfig and related targets |
@@ -92,9 +108,12 @@ help: | |||
92 | # Based on GTK which needs to be installed to compile it | 108 | # Based on GTK which needs to be installed to compile it |
93 | # object files used by all kconfig flavours | 109 | # object files used by all kconfig flavours |
94 | 110 | ||
111 | lxdialog := lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o | ||
112 | lxdialog += lxdialog/textbox.o lxdialog/yesno.o lxdialog/menubox.o | ||
113 | |||
95 | hostprogs-y := conf mconf qconf gconf kxgettext | 114 | hostprogs-y := conf mconf qconf gconf kxgettext |
96 | conf-objs := conf.o zconf.tab.o | 115 | conf-objs := conf.o zconf.tab.o |
97 | mconf-objs := mconf.o zconf.tab.o | 116 | mconf-objs := mconf.o zconf.tab.o $(lxdialog) |
98 | kxgettext-objs := kxgettext.o zconf.tab.o | 117 | kxgettext-objs := kxgettext.o zconf.tab.o |
99 | 118 | ||
100 | ifeq ($(MAKECMDGOALS),xconfig) | 119 | ifeq ($(MAKECMDGOALS),xconfig) |