diff options
author | nir.tzachar@gmail.com <nir.tzachar@gmail.com> | 2009-11-25 05:28:43 -0500 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-02-02 08:33:55 -0500 |
commit | 692d97c380c6dce2c35a04c5dcbce4e831a42fa0 (patch) | |
tree | eff5fc88659da67cce720dd643f50137ef5b906a /scripts/kconfig/Makefile | |
parent | c64152bfd0106807c8d3ddbe6d0928e14a64f7bb (diff) |
kconfig: new configuration interface (nconfig)
This patch was inspired by the kernel projects page, where an ncurses
replacement for menuconfig was mentioned (by Sam Ravnborg).
Building on menuconfig, this patch implements a more modern look
interface using ncurses and ncurses' satellite libraries (menu, panel,
form). The implementation does not depend on lxdialog, which is
currently distributed with the kernel.
Signed-off-by: Nir Tzachar <nir.tzachar@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/kconfig/Makefile')
-rw-r--r-- | scripts/kconfig/Makefile | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 999e8a7d5bf7..75bdf5ae202c 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
@@ -23,6 +23,9 @@ menuconfig: $(obj)/mconf | |||
23 | config: $(obj)/conf | 23 | config: $(obj)/conf |
24 | $< $(Kconfig) | 24 | $< $(Kconfig) |
25 | 25 | ||
26 | nconfig: $(obj)/nconf | ||
27 | $< $(Kconfig) | ||
28 | |||
26 | oldconfig: $(obj)/conf | 29 | oldconfig: $(obj)/conf |
27 | $< -o $(Kconfig) | 30 | $< -o $(Kconfig) |
28 | 31 | ||
@@ -110,6 +113,7 @@ endif | |||
110 | # Help text used by make help | 113 | # Help text used by make help |
111 | help: | 114 | help: |
112 | @echo ' config - Update current config utilising a line-oriented program' | 115 | @echo ' config - Update current config utilising a line-oriented program' |
116 | @echo ' nconfig - Update current config utilising a ncurses menu based program' | ||
113 | @echo ' menuconfig - Update current config utilising a menu based program' | 117 | @echo ' menuconfig - Update current config utilising a menu based program' |
114 | @echo ' xconfig - Update current config utilising a QT based front-end' | 118 | @echo ' xconfig - Update current config utilising a QT based front-end' |
115 | @echo ' gconfig - Update current config utilising a GTK based front-end' | 119 | @echo ' gconfig - Update current config utilising a GTK based front-end' |
@@ -137,6 +141,8 @@ HOST_EXTRACFLAGS += -DLOCALE | |||
137 | # =========================================================================== | 141 | # =========================================================================== |
138 | # Shared Makefile for the various kconfig executables: | 142 | # Shared Makefile for the various kconfig executables: |
139 | # conf: Used for defconfig, oldconfig and related targets | 143 | # conf: Used for defconfig, oldconfig and related targets |
144 | # nconf: Used for the nconfig target. | ||
145 | # Utilizes ncurses | ||
140 | # mconf: Used for the menuconfig target | 146 | # mconf: Used for the menuconfig target |
141 | # Utilizes the lxdialog package | 147 | # Utilizes the lxdialog package |
142 | # qconf: Used for the xconfig target | 148 | # qconf: Used for the xconfig target |
@@ -149,11 +155,16 @@ lxdialog := lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o | |||
149 | lxdialog += lxdialog/textbox.o lxdialog/yesno.o lxdialog/menubox.o | 155 | lxdialog += lxdialog/textbox.o lxdialog/yesno.o lxdialog/menubox.o |
150 | 156 | ||
151 | conf-objs := conf.o zconf.tab.o | 157 | conf-objs := conf.o zconf.tab.o |
152 | mconf-objs := mconf.o zconf.tab.o $(lxdialog) | 158 | mconf-objs := mconf.o zconf.tab.o $(lxdialog) |
159 | nconf-objs := nconf.o zconf.tab.o nconf.gui.o | ||
153 | kxgettext-objs := kxgettext.o zconf.tab.o | 160 | kxgettext-objs := kxgettext.o zconf.tab.o |
154 | 161 | ||
155 | hostprogs-y := conf qconf gconf kxgettext | 162 | hostprogs-y := conf qconf gconf kxgettext |
156 | 163 | ||
164 | ifeq ($(MAKECMDGOALS),nconfig) | ||
165 | hostprogs-y += nconf | ||
166 | endif | ||
167 | |||
157 | ifeq ($(MAKECMDGOALS),menuconfig) | 168 | ifeq ($(MAKECMDGOALS),menuconfig) |
158 | hostprogs-y += mconf | 169 | hostprogs-y += mconf |
159 | endif | 170 | endif |
@@ -177,7 +188,7 @@ endif | |||
177 | 188 | ||
178 | clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \ | 189 | clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \ |
179 | .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h | 190 | .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h |
180 | clean-files += mconf qconf gconf | 191 | clean-files += mconf qconf gconf nconf |
181 | clean-files += config.pot linux.pot | 192 | clean-files += config.pot linux.pot |
182 | 193 | ||
183 | # Check that we have the required ncurses stuff installed for lxdialog (menuconfig) | 194 | # Check that we have the required ncurses stuff installed for lxdialog (menuconfig) |
@@ -202,6 +213,7 @@ HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` | |||
202 | HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ | 213 | HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ |
203 | -D LKC_DIRECT_LINK | 214 | -D LKC_DIRECT_LINK |
204 | 215 | ||
216 | HOSTLOADLIBES_nconf = -lmenu -lpanel -lncurses | ||
205 | $(obj)/qconf.o: $(obj)/.tmp_qtcheck | 217 | $(obj)/qconf.o: $(obj)/.tmp_qtcheck |
206 | 218 | ||
207 | ifeq ($(qconf-target),1) | 219 | ifeq ($(qconf-target),1) |