From eb8bb5738da2748fcfcd9d32b04d9d08845213fb Mon Sep 17 00:00:00 2001
From: Manuel Novoa III <mjn3@codepoet.org>
Date: Sat, 2 Jun 2001 02:00:23 +0000
Subject: Only build ldso if building shared.  Also, if building ldso, build
 all subdirs.

---
 Makefile      | 7 +++----
 ldso/Makefile | 5 +----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index d45ba108a..c48a46181 100644
--- a/Makefile
+++ b/Makefile
@@ -30,10 +30,7 @@
 TOPDIR=./
 include Rules.mak
 
-ifeq ($(LDSO_PRESENT), $(TARGET_ARCH))
-    LDSO_DIR = ldso
-endif
-DIRS = extra $(LDSO_DIR) libc libcrypt libresolv libutil libm  
+DIRS = extra libc libcrypt libresolv libutil libm  
 
 ifndef $(TARGET_PREFIX)
 	TARGET_PREFIX = `pwd`/_install
@@ -43,7 +40,9 @@ all: headers uClibc_config.h subdirs $(DO_SHARED) done
 
 shared:
 	@$(MAKE) -C libc shared
+ifeq ($(LDSO_PRESENT), $(TARGET_ARCH))
 	@$(MAKE) -C ldso shared
+endif
 	@$(MAKE) -C libcrypt shared
 	@$(MAKE) -C libutil shared
 	@$(MAKE) -C libm shared
diff --git a/ldso/Makefile b/ldso/Makefile
index dab0025f4..8608bfd0c 100644
--- a/ldso/Makefile
+++ b/ldso/Makefile
@@ -3,10 +3,7 @@ include Rules.mak
 
 SUBDIRS = util d-link libdl # man
 
-all:
-	@if [ -d $(TOPDIR)ldso/d-link/$(TARGET_ARCH) ] ; then \
-		$(MAKE) -C d-link; \
-	fi;
+all: shared
 
 shared:
 	@if [ -d $(TOPDIR)ldso/d-link/$(TARGET_ARCH) ] ; then \
-- 
cgit v1.2.3