diff options
| author | Eric Andersen <andersen@codepoet.org> | 2002-01-11 20:11:12 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2002-01-11 20:11:12 +0000 |
| commit | d7147f9226520ad9a688c53802a4c6c2c53592fc (patch) | |
| tree | e2a923a816960d2812741f9195925290d7531505 | |
| parent | 4d5785ca2df3eea5ce876ff63ac04b1c376384a1 (diff) | |
Remove the now obsolete d-link tree. Update things to cope
with the new naming
-Erik
| -rw-r--r-- | ldso/Makefile | 4 | ||||
| -rw-r--r-- | ldso/libdl/Makefile | 2 | ||||
| -rw-r--r-- | ldso/libdl/dlib.c | 7 | ||||
| -rw-r--r-- | ldso/libdl/libdl.c | 7 | ||||
| -rw-r--r-- | ldso/util/Makefile | 10 |
5 files changed, 14 insertions, 16 deletions
diff --git a/ldso/Makefile b/ldso/Makefile index 722757ebd..8eedd40b0 100644 --- a/ldso/Makefile +++ b/ldso/Makefile @@ -23,12 +23,12 @@ TOPDIR=../ include $(TOPDIR)Rules.mak -ALL_SUBDIRS = d-link libdl util +ALL_SUBDIRS = ldso libdl util all: ifeq ($(strip $(BUILD_UCLIBC_LDSO)),true) - $(MAKE) -C $(LIBRARY_CACHE) d-link; + $(MAKE) -C $(LIBRARY_CACHE) ldso; endif shared: diff --git a/ldso/libdl/Makefile b/ldso/libdl/Makefile index cccd9e473..97b7234a0 100644 --- a/ldso/libdl/Makefile +++ b/ldso/libdl/Makefile @@ -44,7 +44,7 @@ ar-target: $(OBJS) $(OBJS): %.o : %.c - $(TARGET_CC) -I../d-link -I../d-link/$(TARGET_ARCH) $(TARGET_CFLAGS) -c $< -o $@ + $(CC) -I../ldso -I../ldso/$(TARGET_ARCH) $(CFLAGS) -c $< -o $@ $(STRIPTOOL) -x -R .note -R .comment $*.o $(OBJ): Makefile diff --git a/ldso/libdl/dlib.c b/ldso/libdl/dlib.c index 540b6640f..901613f30 100644 --- a/ldso/libdl/dlib.c +++ b/ldso/libdl/dlib.c @@ -7,11 +7,10 @@ #include <stdlib.h> #include <features.h> #include "dlfcn.h" -#include "sysdep.h" -#include "syscall.h" -#include "hash.h" -#include "string.h" #include "linuxelf.h" +#include "ld_syscall.h" +#include "ld_hash.h" +#include "ld_string.h" extern int _dl_error_number; extern struct r_debug *_dl_debug_addr; diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c index 540b6640f..901613f30 100644 --- a/ldso/libdl/libdl.c +++ b/ldso/libdl/libdl.c @@ -7,11 +7,10 @@ #include <stdlib.h> #include <features.h> #include "dlfcn.h" -#include "sysdep.h" -#include "syscall.h" -#include "hash.h" -#include "string.h" #include "linuxelf.h" +#include "ld_syscall.h" +#include "ld_hash.h" +#include "ld_string.h" extern int _dl_error_number; extern struct r_debug *_dl_debug_addr; diff --git a/ldso/util/Makefile b/ldso/util/Makefile index 3814bfd2b..d514f3f9a 100644 --- a/ldso/util/Makefile +++ b/ldso/util/Makefile @@ -27,16 +27,16 @@ TARGETS=ldd.uclibc ldd readelf ldconfig all: $(TARGETS) readsoname.o: readsoname.c readsoname2.c - $(TARGET_CC) $(TARGET_CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) -c $< -o $@ $(STRIPTOOL) -x -R .note -R .comment $*.o ldconfig.o: ldconfig.c - $(TARGET_CC) $(TARGET_CFLAGS) -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \ + $(CC) $(CFLAGS) -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \ -c $< -o $@ $(STRIPTOOL) -x -R .note -R .comment $*.o readelf: readelf.c - $(TARGET_CC) $(TARGET_CFLAGS) -static readelf.c -o $@ + $(CC) $(CFLAGS) -static readelf.c -o $@ $(STRIPTOOL) -x -R .note -R .comment $@ ifeq ($(strip $(LIBRARY_CACHE)),) @@ -44,12 +44,12 @@ ldconfig: echo "LIBRARY_CACHE disabled -- not building ldconfig" else ldconfig: ldconfig.o readsoname.o - $(TARGET_CC) $(TARGET_CFLAGS) -static $^ -o $@ + $(CC) $(CFLAGS) -static $^ -o $@ $(STRIPTOOL) -x -R .note -R .comment $@ endif ldd: ldd.c - $(TARGET_CC) $(TARGET_CFLAGS) -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \ + $(CC) $(CFLAGS) -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \ -DUCLIBC_DEVEL_PREFIX=\"$(DEVEL_PREFIX)\" \ -DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR) && pwd)\" \ -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" \ |