From 96277cfcea64ba6965b20fd78529f2f6fa59e32a Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 10 Aug 2001 08:00:08 +0000 Subject: Update the build system, yet again. I hope this is the last time... Here is the basic theory of operation: SHARED_LIB_LOADER_PATH/ DEVEL_PREFIX/ bin/ lib/ include/ SYSTEM_DEVEL_PREFIX/ usr/bin/ 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 --- ldso/Makefile | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'ldso/Makefile') 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 -- cgit v1.2.3