[uClibc-cvs] uClibc/ldso/ldso Makefile, 1.47, 1.48 readelflib1.c, 1.48, 1.49

[Erik Andersen]

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

Modified Files:
	Makefile readelflib1.c 
Log Message:
Rework the config system.  Better utilize the Kconfig language
which should simplify enabling arbitrary architectures.
 -Erik


Index: readelflib1.c
===================================================================
RCS file: /var/cvs/uClibc/ldso/ldso/readelflib1.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- readelflib1.c	9 Oct 2003 06:07:24 -0000	1.48
+++ readelflib1.c	4 Nov 2003 13:07:43 -0000	1.49
@@ -361,11 +361,9 @@
 	if(_dl_debug) _dl_dprintf(_dl_debug_file, "\tsearching full lib path list\n");
 #endif
 	if ((tpnt1 = search_for_named_library(libname, secure, 
-			UCLIBC_TARGET_PREFIX "/usr/X11R6/lib:"
-			UCLIBC_TARGET_PREFIX "/usr/lib:"
-			UCLIBC_TARGET_PREFIX "/lib:"
-			UCLIBC_DEVEL_PREFIX "/lib:"
-			UCLIBC_BUILD_DIR "/lib:"
+			UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib:"
+			UCLIBC_RUNTIME_PREFIX "usr/lib:"
+			UCLIBC_RUNTIME_PREFIX "lib:"
 			"/usr/lib:"
 			"/lib", rpnt)
 		    ) != NULL) 

Index: Makefile
===================================================================
RCS file: /var/cvs/uClibc/ldso/ldso/Makefile,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- Makefile	18 Oct 2003 10:50:38 -0000	1.47
+++ Makefile	4 Nov 2003 13:07:43 -0000	1.48
@@ -28,16 +28,12 @@
 
 
 XXFLAGS=$(XWARNINGS) $(OPTIMIZATION) $(XARCH_CFLAGS) $(CPU_CFLAGS) $(PICFLAG) \
-	-DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \
-	-DUCLIBC_DEVEL_PREFIX=\"$(DEVEL_PREFIX)\" \
-	-DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR) && pwd)\" \
+	-DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
 	-fno-builtin -nostdinc -I$(TOPDIR)ldso/include -I. -I$(TOPDIR)include
 
 ifeq ($(DODEBUG),y)
 XXFLAGS=$(XWARNINGS) -O0 -g3 $(XARCH_CFLAGS) $(CPU_CFLAGS) $(PICFLAG) \
-	-DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \
-	-DUCLIBC_DEVEL_PREFIX=\"$(DEVEL_PREFIX)\" \
-	-DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR) && pwd)\" \
+	-DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
 	-fno-builtin -nostdinc -I$(TOPDIR)ldso/include -I. -I$(TOPDIR)include
 endif