From b5675ab467771c01084f78ae48fb510acc9c7e1a Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Wed, 11 Jul 2001 01:28:18 +0000
Subject: Rewrite of ldd so it works as expected, and does not invoke the
 shared lib loader at all.  This will allow us to throw out the support code
 for that from ld-linux.so.0  -Erik

---
 ldso/util/Makefile | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'ldso/util/Makefile')

diff --git a/ldso/util/Makefile b/ldso/util/Makefile
index dd69c9b10..646fd69b6 100644
--- a/ldso/util/Makefile
+++ b/ldso/util/Makefile
@@ -6,24 +6,25 @@ all: ldconfig ldd readelf
 readsoname.o: readsoname.c readsoname2.c
 	$(TARGET_CC) $(TARGET_CFLAGS) -c $< -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
-
+    
 ldconfig.o: ldconfig.c
-	$(TARGET_CC) $(TARGET_CFLAGS) -DUCLIBC_ROOT_DIR=\"$(ROOT_DIR)\" -c $< -o $@
-	$(STRIPTOOL) -x -R .note -R .comment $*.o
-
-ldd.o: ldd.c 
-	$(TARGET_CC) $(TARGET_CFLAGS)  -DUCLIBC_ROOT_DIR=\"$(ROOT_DIR)\" \
-	    -DLDSO_ADDR="0x62f00020" -c $< -o $@
+	$(TARGET_CC) $(TARGET_CFLAGS) -DUCLIBC_ROOT_DIR=\"$(ROOT_DIR)\" \
+		-c $< -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 readelf: readelf.c
 	$(TARGET_CC) $(TARGET_CFLAGS) -static readelf.c -o $@
+	$(STRIPTOOL) -x -R .note -R .comment $@
 
 ldconfig: ldconfig.o readsoname.o
 	$(TARGET_CC) $(TARGET_CFLAGS) -static $^ -o $@
+	$(STRIPTOOL) -x -R .note -R .comment $@
 
-ldd:	ldd.o readsoname.o
-	$(TARGET_CC) $(TARGET_CFLAGS) -static $^ -o $@
+ldd: ldd.c
+	$(TARGET_CC) $(TARGET_CFLAGS) -DUCLIBC_ROOT_DIR=\"$(ROOT_DIR)\" \
+		-DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR); pwd)\" \
+		-static ldd.c -o $@
+	$(STRIPTOOL) -x -R .note -R .comment $@
 
 clean:
 	rm -f ldconfig ldd readelf *.o *~ core
-- 
cgit v1.2.3