From f0da4aa1d854ca9c2a0e652dcb1d81bbf4d971f4 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Sat, 12 May 2001 06:19:18 +0000 Subject: Ok, this should finish off my massive ro-organization. The source tree is less messy now (which helps), all libraries are placed into uClibc/lib when compiling, all libraries now use a consistant mechanism for being built, all libraries use a consistant naming scheme where the lib name includes the uClibc version number, which makes ldconfig happy and willing to work with us. -Erik --- ldso/Makefile | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'ldso/Makefile') diff --git a/ldso/Makefile b/ldso/Makefile index d7af33f89..dab0025f4 100644 --- a/ldso/Makefile +++ b/ldso/Makefile @@ -3,22 +3,14 @@ include Rules.mak SUBDIRS = util d-link libdl # man - all: - @if [ -d $(TOPDIR)ld.so-1/d-link/$(TARGET_ARCH) ] ; then \ - set -e ; for d in $(SUBDIRS) ; do $(MAKE) -C $$d ; done \ - fi; - @if [ -d $(TOPDIR)ld.so-1/d-link/$(TARGET_ARCH) ] ; then \ - install -d $(TOPDIR)lib ; \ - install -m 755 $(TOPDIR)ld.so-1/d-link/$(UCLIBC_LDSO) $(TOPDIR)lib/ld-linux-uclibc.so ; \ - install -m 644 $(TOPDIR)ld.so-1/libdl/$(LIBDL).$(MAJOR_VERSION) $(TOPDIR)lib ; \ - (cd $(TOPDIR)lib;ln -sf ld-linux-uclibc.so $(UCLIBC_LDSO)); \ - (cd $(TOPDIR)lib;ln -sf $(LIBDL).$(MAJOR_VERSION) $(LIBDL)) ; \ + @if [ -d $(TOPDIR)ldso/d-link/$(TARGET_ARCH) ] ; then \ + $(MAKE) -C d-link; \ fi; -ldso: - @if [ -d $(TOPDIR)ld.so-1/d-link/$(TARGET_ARCH) ] ; then \ - $(MAKE) -C d-link; \ +shared: + @if [ -d $(TOPDIR)ldso/d-link/$(TARGET_ARCH) ] ; then \ + set -e ; for d in $(SUBDIRS) ; do $(MAKE) -C $$d ; done \ fi; clean: -- cgit v1.2.3