aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-01-22 09:29:52 +0000
committerUlrich Drepper <drepper@redhat.com>1999-01-22 09:29:52 +0000
commite18db2b0eec02e478cfaaed5a7ac71bef4fccc6a (patch)
treec6cb724304bcb78f83486c7fca3dd34eb85f4c50 /elf
parent61d97e921b82c646d98a23c7ca16d2f1997006d7 (diff)
downloadglibc-e18db2b0eec02e478cfaaed5a7ac71bef4fccc6a.tar
glibc-e18db2b0eec02e478cfaaed5a7ac71bef4fccc6a.tar.gz
glibc-e18db2b0eec02e478cfaaed5a7ac71bef4fccc6a.tar.bz2
glibc-e18db2b0eec02e478cfaaed5a7ac71bef4fccc6a.zip
Update.
1999-01-20 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * elf/Makefile: Make dependencies between test modules explicit. (preloadtest-preloads): New variable. ($(objpfx)preloadtest.out): Use it. (preloadtest-ENV): Use it. 1999-01-22 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * sysdeps/unix/sysv/linux/arm/Dist: Undo last change. Not needed. * elf/Makefile: Add missing dependency for preloadtest binary. 1999-01-21 Ulrich Drepper <drepper@cygnus.com>
Diffstat (limited to 'elf')
-rw-r--r--elf/Makefile29
1 files changed, 15 insertions, 14 deletions
diff --git a/elf/Makefile b/elf/Makefile
index 185cd48fec..d28d7064e7 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -209,16 +209,14 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names)))
generated += $(test-modules)
-LDLIBS-testobj1.so = -ldl
-$(objpfx)testobj1_1.so: $(objpfx)testobj1.so
-LDLIBS-testobj1_1.so = $(objpfx)testobj1.so
-$(objpfx)testobj2.so: $(objpfx)testobj1.so
-LDLIBS-testobj2.so = $(objpfx)testobj1.so -ldl
-LDLIBS-testobj3.so = -ldl
-LDLIBS-testobj4.so = -ldl
-LDLIBS-testobj5.so = -ldl
-LDLIBS-testobj6.so = -ldl
-LDLIBS-failobj.so = $(objpfx)testobj6.so
+$(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)failobj.so: $(objpfx)testobj6.so
$(test-modules): $(objpfx)%.so: $(objpfx)%.os
$(build-module)
@@ -228,15 +226,18 @@ LDFLAGS-loadtest = -rdynamic
$(objpfx)loadtest.out: $(test-modules)
-$(objpfx)restest1: $(objpfx)libdl.so
-LDFLAGS-restest1 = -rdynamic $(objpfx)testobj1.so $(objpfx)testobj1_1.so
+$(objpfx)restest1: $(objpfx)testobj1.so $(objpfx)testobj1_1.so \
+ $(objpfx)libdl.so
+LDFLAGS-restest1 = -rdynamic
$(objpfx)restest1.out: $(test-modules)
+preloadtest-preloads = testobj1 testobj2 testobj3 testobj4 testobj5
$(objpfx)preloadtest: $(objpfx)testobj6.so
-$(objpfx)preloadtest.out: $(test-modules)
LDFLAGS-preloadtest = -rdynamic
-preloadtest-ENV = LD_PRELOAD=testobj1.so:testobj2.so:testobj3.so:testobj4.so:testobj5.so
+$(objpfx)preloadtest.out: $(preloadtest-preloads:%=$(objpfx)%.so)
+preloadtest-ENV = \
+ LD_PRELOAD=$(subst $(empty) ,:,$(strip $(preloadtest-preloads:=.so)))
$(objpfx)loadfail: $(objpfx)libdl.so
LDFLAGS-loadfail = -rdynamic