[uClibc-cvs] uClibc Makefile,1.195,1.196 Rules.mak,1.119,1.120

[Erik Andersen]

Update of /var/cvs/uClibc
In directory winder:/tmp/cvs-serv2819

Modified Files:
	Makefile Rules.mak 
Log Message:
Only build the ncurses stuff when it is needed, based on a
patch from Stefan Allius (though the extra/config/Makefile
rework is mine),
 -Erik


Index: Makefile
===================================================================
RCS file: /var/cvs/uClibc/Makefile,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- Makefile	12 Dec 2002 03:10:14 -0000	1.195
+++ Makefile	13 Dec 2002 22:43:35 -0000	1.196
@@ -34,7 +34,7 @@
 
 DIRS = extra ldso libc libcrypt libresolv libnsl libutil libm libpthread
 
-ifdef include_config
+ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 
 all: headers subdirs shared utils finished
 
@@ -80,7 +80,7 @@
 
 include/bits/uClibc_config.h: .config
 	@if [ ! -x ./extra/config/conf ] ; then \
-	    make -C extra/config; \
+	    make -C extra/config conf; \
 	fi;
 	rm -rf include/bits
 	mkdir -p include/bits
@@ -290,18 +290,21 @@
 	@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
 # ---------------------------------------------------------------------------
 
-extra/config/conf extra/config/mconf:
-	make -C extra/config
+extra/config/conf:
+	make -C extra/config conf
+	- at if [ ! -f .config ] ; then \
+		cp extra/Configs/Config.$(TARGET_ARCH).default .config; \
+	fi
+
+extra/config/mconf:
+	make -C extra/config ncurses conf mconf
 	- at if [ ! -f .config ] ; then \
 		cp extra/Configs/Config.$(TARGET_ARCH).default .config; \
 	fi
@@ -384,8 +387,7 @@
 						\
 	tar -cvzf uClibc-$(VERSION).tar.gz --exclude CVS uClibc-$(VERSION)/;
 
-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
 

Index: Rules.mak
===================================================================
RCS file: /var/cvs/uClibc/Rules.mak,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- Rules.mak	13 Dec 2002 04:40:10 -0000	1.119
+++ Rules.mak	13 Dec 2002 22:43:35 -0000	1.120
@@ -66,7 +66,6 @@
 
 # Pull in the user's uClibc configuration
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
-include_config := 1
 -include $(TOPDIR).config
 endif