From f68eb8d50b11310628f53a9378bf612e8d4bfa09 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Mon, 4 Jun 2001 22:13:51 +0000
Subject: Teach the ldso stuff to use the proper elf.h header file, not a local
 copy.  -Erik

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

(limited to 'ldso/util/Makefile')

diff --git a/ldso/util/Makefile b/ldso/util/Makefile
index a8f482f20..8fe733eb9 100644
--- a/ldso/util/Makefile
+++ b/ldso/util/Makefile
@@ -2,14 +2,15 @@ TOPDIR=../../
 include $(TOPDIR)/ldso/Rules.mak
 
 CFLAGS += -DLDSO_ADDR="0x62f00020" # needed by ldd.o
-CFLAGS += -I./ -I../../include/
-LDFLAGS += -nostdlib $(TOPDIR)lib/libc.a $(TOPDIR)lib/crt0.o $(GCCINCDIR)/../libgcc.a
+#CFLAGS += -I./ -I../../include/
+#LDFLAGS += -nostdlib $(TOPDIR)lib/libc.a $(TOPDIR)lib/crt0.o $(GCCINCDIR)/../libgcc.a
+LDFLAGS += $(TOPDIR)lib/libc.a $(TOPDIR)lib/crt0.o $(GCCINCDIR)/../libgcc.a
 
-ALL	= ldconfig ldd # lddstub
+ALL	= ldconfig ldd readelf # lddstub
 
 all:	$(ALL)
 
-CSRC= readelf.c ldconfig.c ldd.c
+CSRC= readelf.c ldconfig.c ldd.c readsoname.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
 OBJS=$(COBJS)
 
@@ -17,13 +18,16 @@ $(COBJS): %.o : %.c
 	$(CC) $(CFLAGS) -c $< -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
-readelf.o: readelf.c readelf2.c
+readsoname.o: readsoname.c readsoname2.c
 
-ldconfig: ldconfig.o readelf.o
-	$(CC) -static $(CFLAGS) $^ $(LDFLAGS) -o $@
+readelf: readelf.o
+	$(CC) $(CFLAGS) $^ -o $@
 
-ldd:	ldd.o readelf.o
-	$(CC) -static $(CFLAGS) $^ $(LDFLAGS) -o $@
+ldconfig: ldconfig.o readsoname.o
+	$(CC) $(CFLAGS) $^ -o $@
+
+ldd:	ldd.o readsoname.o
+	$(CC) $(CFLAGS) $^ -o $@
 
 #ifeq ($(DEBUG),true)
 #STUBFLAGS = -Wl,-dynamic-linker,../d-link/ld-linux.so
-- 
cgit v1.2.3