From a17d863945361b067988adb12efee72651905845 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 18 May 2001 20:31:18 +0000 Subject: I wasn't building the libdl shared lib anymore. Make each lib install a libfoo.so symlink as well as a libfoo.so.0 link, since gcc is currently only looking for files ending in .so. wierd. -Erik --- ldso/libdl/Makefile | 9 +++++---- libcrypt/Makefile | 1 + libm/Makefile | 3 ++- libutil/Makefile | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ldso/libdl/Makefile b/ldso/libdl/Makefile index 1e1a0ac36..7d5f27d29 100644 --- a/ldso/libdl/Makefile +++ b/ldso/libdl/Makefile @@ -34,15 +34,15 @@ OBJS=$(patsubst %.c,%.o, $(CSRC)) CFLAGS += -DUSE_CACHE #-fPIC -D__PIC__ #-funroll-loops -all: $(OBJS) $(LIBDL) +all: $(OBJS) $(LIBDL) shared $(LIBDL): ar-target ar-target: $(OBJS) $(AR) $(ARFLAGS) $(LIBDL) $(OBJS) - install -d $(TOPDIR)lib - rm -f $(TOPDIR)lib/$(LIBDL) - install -m 644 $(LIBDL) $(TOPDIR)lib + #install -d $(TOPDIR)lib + #rm -f $(TOPDIR)lib/$(LIBDL) + #install -m 644 $(LIBDL) $(TOPDIR)lib $(OBJS): %.o : %.c $(TARGET_CC) -I../d-link -I../d-link/$(TARGET_ARCH) $(CFLAGS) -c $< -o $@ @@ -57,6 +57,7 @@ shared: all install -d $(TOPDIR)lib rm -f $(TOPDIR)lib/$(LIBDL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBDL_SHARED).$(MAJOR_VERSION) install -m 644 $(LIBDL_SHARED_FULLNAME) $(TOPDIR)lib; + (cd $(TOPDIR)lib; ln -sf $(LIBDL_SHARED_FULLNAME) $(LIBDL_SHARED)); (cd $(TOPDIR)lib; ln -sf $(LIBDL_SHARED_FULLNAME) $(LIBDL_SHARED).$(MAJOR_VERSION)); clean: diff --git a/libcrypt/Makefile b/libcrypt/Makefile index 6eac3299a..4c118c10b 100644 --- a/libcrypt/Makefile +++ b/libcrypt/Makefile @@ -54,6 +54,7 @@ shared: all install -d $(TOPDIR)lib rm -f $(TOPDIR)lib/$(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBCRYPT_SHARED).$(MAJOR_VERSION) install -m 644 $(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib; + (cd $(TOPDIR)lib; ln -sf $(LIBCRYPT_SHARED_FULLNAME) $(LIBCRYPT_SHARED)); (cd $(TOPDIR)lib; ln -sf $(LIBCRYPT_SHARED_FULLNAME) $(LIBCRYPT_SHARED).$(MAJOR_VERSION)); clean: diff --git a/libm/Makefile b/libm/Makefile index 419e365c2..22e6c8e1c 100644 --- a/libm/Makefile +++ b/libm/Makefile @@ -52,13 +52,14 @@ tags: ctags -R shared: all - @if [ -f $(LIBM) ] ; then \ + if [ -f $(LIBM) ] ; then \ $(TARGET_CC) $(LDFLAGS) -shared -o $(LIBM_SHARED_FULLNAME) \ -Wl,-soname,$(LIBM_SHARED).$(MAJOR_VERSION) -Wl,--whole-archive \ $(LIBM) $(TOPDIR)lib/$(SHARED_FULLNAME); \ install -d $(TOPDIR)lib; \ rm -f $(TOPDIR)lib/$(LIBM_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBM_SHARED).$(MAJOR_VERSION); \ install -m 644 $(LIBM_SHARED_FULLNAME) $(TOPDIR)lib; \ + (cd $(TOPDIR)lib; ln -sf $(LIBM_SHARED_FULLNAME) $(LIBM_SHARED)); \ (cd $(TOPDIR)lib; ln -sf $(LIBM_SHARED_FULLNAME) $(LIBM_SHARED).$(MAJOR_VERSION)); \ fi; diff --git a/libutil/Makefile b/libutil/Makefile index 70c274233..6c12869e7 100644 --- a/libutil/Makefile +++ b/libutil/Makefile @@ -53,6 +53,7 @@ shared: all install -d $(TOPDIR)lib rm -f $(TOPDIR)lib/$(LIBUTIL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBUTIL_SHARED).$(MAJOR_VERSION) install -m 644 $(LIBUTIL_SHARED_FULLNAME) $(TOPDIR)lib/; + (cd $(TOPDIR)lib; ln -sf $(LIBUTIL_SHARED_FULLNAME) $(LIBUTIL_SHARED)); (cd $(TOPDIR)lib; ln -sf $(LIBUTIL_SHARED_FULLNAME) $(LIBUTIL_SHARED).$(MAJOR_VERSION)); clean: -- cgit v1.2.3