aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-01-25 11:18:10 +0000
committerUlrich Drepper <drepper@redhat.com>1999-01-25 11:18:10 +0000
commitaaff4ba9a63d3bf8ba2df5ca18f15ab9681f17ee (patch)
tree05912d8aee3d2306a4d9fdbe1070ee944d187183
parentb57018905f25910ac0a4af81e3ea61629a1783e9 (diff)
downloadglibc-aaff4ba9a63d3bf8ba2df5ca18f15ab9681f17ee.tar
glibc-aaff4ba9a63d3bf8ba2df5ca18f15ab9681f17ee.tar.gz
glibc-aaff4ba9a63d3bf8ba2df5ca18f15ab9681f17ee.tar.bz2
glibc-aaff4ba9a63d3bf8ba2df5ca18f15ab9681f17ee.zip
Update.
1999-01-25 Ulrich Drepper <drepper@cygnus.com> * elf/Makefile: Define libdl variable as name of libdl library and use it in all dependencies.
-rw-r--r--ChangeLog5
-rw-r--r--elf/Makefile33
2 files changed, 22 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 948c052eb7..64e301bd66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-01-25 Ulrich Drepper <drepper@cygnus.com>
+
+ * elf/Makefile: Define libdl variable as name of libdl library and
+ use it in all dependencies.
+
1999-01-26 Geoff Keating <geoffk@ozemail.com.au>
* nss/nss_db/db-netgrp.c (_nss_db_setnetgrent): Suppress warning
diff --git a/elf/Makefile b/elf/Makefile
index d28d7064e7..6142848be9 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -79,6 +79,12 @@ endif
tests = loadtest restest1 preloadtest loadfail
+ifeq ($(build-shared),yes)
+libdl = $(objpfx)libdl.so$(libdl.so-version)
+else
+libdl = $(objpfx)libdl.a
+endif
+
include ../Rules
@@ -198,36 +204,31 @@ $(objpfx)ldd: ldd.bash.in $(common-objpfx)soversions.mk \
mv -f $@.new $@
-ifeq ($(build-shared),yes)
-$(objpfx)sprof: $(objpfx)libdl.so$(libdl.so-version)
-else
-$(objpfx)sprof: $(objpfx)libdl.a
-endif
+$(objpfx)sprof: $(libdl)
modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
testobj1_1 failobj
test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names)))
generated += $(test-modules)
-$(objpfx)testobj1.so: $(objpfx)libdl.so
-$(objpfx)testobj1_1.so: $(objpfx)testobj1.so $(objpfx)libdl.so
-$(objpfx)testobj2.so: $(objpfx)testobj1.so $(objpfx)libdl.so
-$(objpfx)testobj3.so: $(objpfx)libdl.so
-$(objpfx)testobj4.so: $(objpfx)libdl.so
-$(objpfx)testobj5.so: $(objpfx)libdl.so
-$(objpfx)testobj6.so: $(objpfx)libdl.so
+$(objpfx)testobj1.so: $(libdl)
+$(objpfx)testobj1_1.so: $(objpfx)testobj1.so $(libdl)
+$(objpfx)testobj2.so: $(objpfx)testobj1.so $(libdl)
+$(objpfx)testobj3.so: $(libdl)
+$(objpfx)testobj4.so: $(libdl)
+$(objpfx)testobj5.so: $(libdl)
+$(objpfx)testobj6.so: $(libdl)
$(objpfx)failobj.so: $(objpfx)testobj6.so
$(test-modules): $(objpfx)%.so: $(objpfx)%.os
$(build-module)
-$(objpfx)loadtest: $(objpfx)libdl.so
+$(objpfx)loadtest: $(libdl)
LDFLAGS-loadtest = -rdynamic
$(objpfx)loadtest.out: $(test-modules)
-$(objpfx)restest1: $(objpfx)testobj1.so $(objpfx)testobj1_1.so \
- $(objpfx)libdl.so
+$(objpfx)restest1: $(objpfx)testobj1.so $(objpfx)testobj1_1.so $(libdl)
LDFLAGS-restest1 = -rdynamic
$(objpfx)restest1.out: $(test-modules)
@@ -239,7 +240,7 @@ $(objpfx)preloadtest.out: $(preloadtest-preloads:%=$(objpfx)%.so)
preloadtest-ENV = \
LD_PRELOAD=$(subst $(empty) ,:,$(strip $(preloadtest-preloads:=.so)))
-$(objpfx)loadfail: $(objpfx)libdl.so
+$(objpfx)loadfail: $(libdl)
LDFLAGS-loadfail = -rdynamic
$(objpfx)loadfile.out: $(objpfx)failobj.so