[BusyBox-cvs] busybox Makefile,1.269,1.270 Rules.mak,1.10,1.11

[Erik Andersen]

Update of /var/cvs/busybox
In directory winder:/tmp/cvs-serv3012

Modified Files:
	Makefile Rules.mak 
Log Message:
Don't build the ncurses stuff unless it is specifically asked for
 -Erik


Index: Makefile
===================================================================
RCS file: /var/cvs/busybox/Makefile,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -d -r1.269 -r1.270
--- Makefile	9 Dec 2002 21:16:39 -0000	1.269
+++ Makefile	13 Dec 2002 22:53:28 -0000	1.270
@@ -31,7 +31,7 @@
 	networking/libiproute networking/udhcp procps loginutils shell \
 	shellutils sysklogd textutils util-linux libbb libpwdgrp
 
-ifdef include_config
+ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 
 all: busybox busybox.links #doc
 
@@ -142,7 +142,7 @@
 
 include/config.h: .config
 	@if [ ! -x ./scripts/config/conf ] ; then \
-	    make -C scripts/config; \
+	    make -C scripts/config conf; \
 	fi;
 	@./scripts/config/conf -o sysdeps/$(TARGET_OS)/Config.in
 
@@ -154,18 +154,20 @@
 	@echo Finished installing...
 	@echo
 
-else # ifdef include_config
+else # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 
 all: menuconfig
 
-ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
-# Targets which don't need .config
-
 # configuration
 # ---------------------------------------------------------------------------
 
-scripts/config/conf scripts/config/mconf:
-	make -C scripts/config
+scripts/config/conf:
+	make -C scripts/config conf
+	- at if [ ! -f .config ] ; then \
+		cp sysdeps/$(TARGET_OS)/defconfig .config; \
+	fi
+scripts/config/mconf:
+	make -C scripts/config ncurses conf mconf
 	- at if [ ! -f .config ] ; then \
 		cp sysdeps/$(TARGET_OS)/defconfig .config; \
 	fi
@@ -239,8 +241,7 @@
 	ctags -R .
 
 
-endif # ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
-endif # ifdef include_config
+endif # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 
 .PHONY: dummy subdirs release distclean clean config oldconfig \
 	menuconfig tags check test tests depend

Index: Rules.mak
===================================================================
RCS file: /var/cvs/busybox/Rules.mak,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Rules.mak	5 Dec 2002 18:28:41 -0000	1.10
+++ Rules.mak	13 Dec 2002 22:53:28 -0000	1.11
@@ -103,7 +103,6 @@
 
 # Pull in the user's uClibc configuration
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
-include_config := 1
 -include $(TOPDIR).config
 endif