- fix building mconf with curses flags

- make sure to rm .config when the first 'make menuconfig' was interrupted and thus no .config.cmd was created.
This commit is contained in:
Bernhard Reutner-Fischer 2007-07-27 12:37:30 +00:00
parent 0c238e669f
commit 153b1beaeb
3 changed files with 8 additions and 3 deletions

View File

@ -320,9 +320,11 @@ $(CONFIG)/mconf:
menuconfig: $(CONFIG)/mconf menuconfig: $(CONFIG)/mconf
@-mkdir -p $(CONFIG)/buildroot-config @-mkdir -p $(CONFIG)/buildroot-config
@KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \ @if ! KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \
KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \ KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \
$(CONFIG)/mconf $(CONFIG_CONFIG_IN) $(CONFIG)/mconf $(CONFIG_CONFIG_IN); then \
test -f .config.cmd || rm -f .config; \
fi
config: $(CONFIG)/conf config: $(CONFIG)/conf
@-mkdir -p $(CONFIG)/buildroot-config @-mkdir -p $(CONFIG)/buildroot-config

View File

@ -5,7 +5,7 @@ top_builddir=../../
srctree := . srctree := .
include Makefile.kconfig include Makefile.kconfig
HOSTCFLAGS+=-Dinline="" -include foo.h #HOSTCFLAGS+=-Dinline="" -include foo.h
-include .depend -include .depend
.depend: $(wildcard *.h *.c) .depend: $(wildcard *.h *.c)
$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) -MM *.c > .depend 2>/dev/null || : $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) -MM *.c > .depend 2>/dev/null || :

View File

@ -120,6 +120,9 @@ hostprogs-y := conf qconf gconf kxgettext
ifeq ($(MAKECMDGOALS),menuconfig) ifeq ($(MAKECMDGOALS),menuconfig)
hostprogs-y += mconf hostprogs-y += mconf
endif endif
ifeq ($(findstring mconf,$(MAKECMDGOALS)),mconf)
hostprogs-y += mconf
endif
ifeq ($(MAKECMDGOALS),xconfig) ifeq ($(MAKECMDGOALS),xconfig)
qconf-target := 1 qconf-target := 1