[uClibc-cvs] uClibc/ldso/util Makefile, 1.32, 1.33 ldconfig.c, 1.9, 1.10

[Erik Andersen]

Update of /var/cvs/uClibc/ldso/util
In directory winder:/tmp/cvs-serv5232/util

Modified Files:
	Makefile ldconfig.c 
Log Message:
Phase one of my evil plan to clean up ld.so...


Index: ldconfig.c
===================================================================
RCS file: /var/cvs/uClibc/ldso/util/ldconfig.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ldconfig.c	31 Jan 2002 01:37:38 -0000	1.9
+++ ldconfig.c	19 Aug 2003 06:05:34 -0000	1.10
@@ -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 @@
     exit(EXIT_FATAL);
 }
 
+#define DIR_SEP      ":, \t\n"
 int main(int argc, char **argv)
 {
     int i, c;

Index: Makefile
===================================================================
RCS file: /var/cvs/uClibc/ldso/util/Makefile,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Makefile	7 Mar 2003 12:23:11 -0000	1.32
+++ Makefile	19 Aug 2003 06:05:33 -0000	1.33
@@ -24,7 +24,7 @@
 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 @@
 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 @@
 	$(STRIPTOOL) -x -R .note -R .comment $@
 
 clean:
-	rm -f $(TARGETS) *.o *~ core ./elf.h *.target
+	rm -f $(TARGETS) *.o *~ core *.target