svn commit: trunk/uClibc

psm at uclibc.org psm at uclibc.org
Wed Sep 21 23:44:11 UTC 2005


Author: psm
Date: 2005-09-21 16:44:10 -0700 (Wed, 21 Sep 2005)
New Revision: 11546

Log:
do not recurse into subdirs if related options are not set

Modified:
   trunk/uClibc/Makefile


Changeset:
Modified: trunk/uClibc/Makefile
===================================================================
--- trunk/uClibc/Makefile	2005-09-21 23:40:27 UTC (rev 11545)
+++ trunk/uClibc/Makefile	2005-09-21 23:44:10 UTC (rev 11546)
@@ -28,7 +28,13 @@
 TOPDIR=./
 include Rules.mak
 
-DIRS = ldso libc libcrypt libresolv libnsl libutil libm libpthread librt
+DIRS = ldso libc libcrypt libresolv libnsl libutil librt
+ifeq ($(strip $(UCLIBC_HAS_FLOATS)),y)
+	DIRS += libm
+endif
+ifeq ($(strip $(UCLIBC_HAS_THREADS)),y)
+	DIRS += libpthread
+endif
 ifeq ($(strip $(UCLIBC_HAS_GETTEXT_AWARENESS)),y)
 	DIRS += libintl
 endif
@@ -40,23 +46,13 @@
 # In this section, we need .config
 -include .config.cmd
 
-shared: subdirs
+shared: $(patsubst %, _shared_dir_%, $(DIRS))
+$(patsubst %, _shared_dir_%, $(DIRS)): subdirs
 ifeq ($(strip $(HAVE_SHARED)),y)
 	$(SECHO)
 	$(SECHO) Building shared libraries ...
 	$(SECHO)
-	@$(MAKE) -C libc shared
-	@$(MAKE) -C ldso shared
-	@$(MAKE) -C libcrypt shared
-	@$(MAKE) -C libresolv shared
-	@$(MAKE) -C libnsl shared
-	@$(MAKE) -C libutil shared
-	@$(MAKE) -C libm shared
-	@$(MAKE) -C libpthread shared
-	@$(MAKE) -C librt shared
-ifeq ($(strip $(UCLIBC_HAS_GETTEXT_AWARENESS)),y)
-	@$(MAKE) -C libintl shared
-endif
+	$(MAKE) -C $(patsubst _shared_dir_%, %, $@) shared
 else
 	$(SECHO)
 	$(SECHO) Not building shared libraries ...




More information about the uClibc-cvs mailing list