From bca6a155c79147f706242ed7c590a3538e407a40 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Tue, 19 Aug 2003 06:05:34 +0000
Subject: Phase one of my evil plan to clean up ld.so...

---
 ldso/util/Makefile   | 7 ++-----
 ldso/util/ldconfig.c | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'ldso/util')

diff --git a/ldso/util/Makefile b/ldso/util/Makefile
index b7712f82a..482fed3ce 100644
--- a/ldso/util/Makefile
+++ b/ldso/util/Makefile
@@ -24,7 +24,7 @@ TOPDIR=../../
 include $(TOPDIR)Rules.mak
 TARGET_CC = $(TOPDIR)extra/gcc-uClibc/$(TARGET_ARCH)-uclibc-gcc
 
-TARGETS = elf_header ldd
+TARGETS = ldd
 ifeq ($(OSTYPE),linux)
 TARGETS += readelf
 endif
@@ -37,9 +37,6 @@ ifeq ($(strip $(LDSO_LDD_SUPPORT)),y)
 XXFLAGS=-D__LDSO_LDD_SUPPORT
 endif
 
-elf_header:
-	ln -fs $(TOPDIR)include/elf.h
-
 readelf: readelf.c
 	$(HOSTCC) $(HOSTCFLAGS) -I . readelf.c -o $@
 	strip -x -R .note -R .comment $@
@@ -78,5 +75,5 @@ ldd.target: ldd.c
 	$(STRIPTOOL) -x -R .note -R .comment $@
 
 clean:
-	rm -f $(TARGETS) *.o *~ core ./elf.h *.target
+	rm -f $(TARGETS) *.o *~ core *.target
 
diff --git a/ldso/util/ldconfig.c b/ldso/util/ldconfig.c
index 4660bd458..f90cb073f 100644
--- a/ldso/util/ldconfig.c
+++ b/ldso/util/ldconfig.c
@@ -37,8 +37,7 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <errno.h>
-#include "elf.h"
-#include "../config.h"
+#include <ldso.h>
 #include "readsoname.h"
 
 struct exec
@@ -546,6 +545,7 @@ void usage(void)
     exit(EXIT_FATAL);
 }
 
+#define DIR_SEP      ":, \t\n"
 int main(int argc, char **argv)
 {
     int i, c;
-- 
cgit v1.2.3