diff options
| author | Manuel Novoa III <mjn3@codepoet.org> | 2001-06-02 02:00:23 +0000 |
|---|---|---|
| committer | Manuel Novoa III <mjn3@codepoet.org> | 2001-06-02 02:00:23 +0000 |
| commit | eb8bb5738da2748fcfcd9d32b04d9d08845213fb (patch) | |
| tree | 8feb75a1e4e9d5e09577659ca4ea9140d918c98a | |
| parent | 47c1983b76408513ce082457fdccfb107ad93901 (diff) | |
Only build ldso if building shared. Also, if building ldso, build all subdirs.
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | ldso/Makefile | 5 |
2 files changed, 4 insertions, 8 deletions
@@ -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 \ |