1.1 --- a/kconfig/kconfig.mk Mon May 24 16:33:45 2010 +0200
1.2 +++ b/kconfig/kconfig.mk Sat Jan 08 18:49:08 2011 +0100
1.3 @@ -73,7 +73,11 @@
1.4
1.5 # Compiler and linker flags to use ncurses
1.6 NCURSES_CFLAGS = $(shell $(SHELL) $(check_lxdialog) -ccflags)
1.7 -NCURSES_LDFLAGS = $(shell $(SHELL) $(check_lxdialog) -ldflags $(HOST_CC) $(LX_FLAGS) $(EXTRA_CFLAGS))
1.8 +NCURSES_LDFLAGS = $(shell $(SHELL) $(check_lxdialog) -ldflags $(HOST_CC))
1.9 +
1.10 +# Check that we have the required ncurses stuff installed for lxdialog (menuconfig)
1.11 +dochecklxdialog:
1.12 + $(SILENT)$(SHELL) $(check_lxdialog) -check $(HOST_CC) $(NCURSES_CFLAGS) $(NCURSES_LDFLAGS)
1.13
1.14 # Common source files
1.15 COMMON_SRC = kconfig/zconf.tab.c
1.16 @@ -113,6 +117,8 @@
1.17 # We must be carefull what we enclose, because we need some of the variable
1.18 # definitions for clean (and distclean) at least.
1.19 # Just protecting the "-include $(DEPS)" line should be sufficient.
1.20 +# And in case we want menuconfig, we have to check that lxdialog
1.21 +# can find a curses lib.
1.22
1.23 ifneq ($(strip $(MAKECMDGOALS)),)
1.24 ifneq ($(strip $(filter $(configurators),$(MAKECMDGOALS))),)
1.25 @@ -123,6 +129,9 @@
1.26 endif
1.27 ifneq ($(strip $(filter menuconfig,$(MAKECMDGOALS))),)
1.28 DEPS += $(mconf_DEP) $(LX_DEP)
1.29 +$(COMMON_OBJ) $(COMMON_DEP): |dochecklxdialog
1.30 +$(LX_OBJ) $(LX_DEP): |dochecklxdialog
1.31 +$(mconf_OBJ) $(mconf_DEP): |dochecklxdialog
1.32 endif
1.33
1.34 -include $(DEPS)