Update the build system, yet again. I hope this is the last time...

Here is the basic theory of operation:
    SHARED_LIB_LOADER_PATH/     <The location where the shared lib
                                loader will be installed and where the
                                compiler will cause apps to look for it.>
    DEVEL_PREFIX/
                bin/            <contains gcc, ld, etc for setting PATH=$DEVEL_PREFIX/bin:$PATH>
                lib/            <contains all runtime and static libs>
                include/        <Where all the header files go>
    SYSTEM_DEVEL_PREFIX/
                usr/bin/        <contains arch-uclibc-gcc, arch-uclibc-ld, etc that
                                might be installed by a .deb or .rpm into /usr/bin,
                                but can happily live under DEVEL_PREFIX>
    PREFIX
            This is prepended during 'make install's allowing you to shift things to
            be installed under some alternate location (such as when building a .deb)
 -Erik

1 files changed, 6 insertions, 11 deletions

diff --git a/ldso/Makefile b/ldso/Makefile
index 0337ab90a..c606a9fba 100644
--- a/ldso/Makefile
+++ b/ldso/Makefile
@@ -1,24 +1,19 @@
 TOPDIR=../
 include $(TOPDIR)Rules.mak
 
-SUBDIRS = libdl
-ALL_SUBDIRS = util libdl d-link
-
+ALL_SUBDIRS = d-link libdl util
 
 
 all:
-ifeq ($(strip $(HAVE_SHARED)),true)
-	@if [ -d $(TOPDIR)ldso/d-link/$(TARGET_ARCH) ] ; then \
-		$(MAKE) -C d-link; \
-	fi;
+ifeq ($(strip $(BUILD_UCLIBC_LDSO)),true)
+	$(MAKE) -C $(LIBRARY_CACHE) d-link;
 endif
 
 shared:
-ifeq ($(strip $(HAVE_SHARED)),true)
-	@if [ -d $(TOPDIR)ldso/d-link/$(TARGET_ARCH) ] ; then \
-		set -e ; for d in $(SUBDIRS) ; do $(MAKE) -C $$d ; done \
-	fi;
+ifeq ($(strip $(BUILD_UCLIBC_LDSO)),true)
+	$(MAKE) -C $(LIBRARY_CACHE) libdl;
 endif
+	$(MAKE) -C $(LIBRARY_CACHE) util;
 
 clean:
 	set -e ; for d in $(ALL_SUBDIRS) ; do $(MAKE) -C $$d $@ ; done