소스 검색

Only build ldso if building shared. Also, if building ldso, build all subdirs.

Manuel Novoa III 24 년 전
부모
커밋
eb8bb5738d
2개의 변경된 파일4개의 추가작업 그리고 8개의 파일을 삭제
  1. 3 4
      Makefile
  2. 1 4
      ldso/Makefile

+ 3 - 4
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

+ 1 - 4
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 \