From ffc7bb39cce77ae6243aa903f0cc1a96ab42bce8 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Thu, 12 Jul 2001 21:41:31 +0000 Subject: This commit merges David Schleef's updates to the build system, which a few tiny fixups here and there from me. Seems to work just fine and will hopefully be a bit better behaved. -Erik --- ldso/ldso/Makefile | 4 ++-- ldso/util/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ldso') diff --git a/ldso/ldso/Makefile b/ldso/ldso/Makefile index 7128b0185..b0586fc30 100644 --- a/ldso/ldso/Makefile +++ b/ldso/ldso/Makefile @@ -28,8 +28,8 @@ TARGET_CFLAGS += #-DDL_DEBUG #-funroll-loops -LDSO_FULLNAME=ld-uclibc-$(MAJOR_VERSION).$(MINOR_VERSION).so -TARGET_CFLAGS+=-fPIC -D__PIC__ -DUCLIBC_ROOT_DIR=\"$(ROOT_DIR)\" -DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR); pwd)\" +LDSO_FULLNAME=ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).so +TARGET_CFLAGS+=-fPIC -D__PIC__ -DUCLIBC_ROOT_DIR=\"$(DEVEL_PREFIX)\" -DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR); pwd)\" CSRC= boot1.c hash.c readelflib1.c vsprintf.c $(TARGET_ARCH)/elfinterp.c COBJS=$(patsubst %.c,%.o, $(CSRC)) ASRC=$(shell ls $(TARGET_ARCH)/*.S) diff --git a/ldso/util/Makefile b/ldso/util/Makefile index 646fd69b6..f1485d50e 100644 --- a/ldso/util/Makefile +++ b/ldso/util/Makefile @@ -8,7 +8,7 @@ readsoname.o: readsoname.c readsoname2.c $(STRIPTOOL) -x -R .note -R .comment $*.o ldconfig.o: ldconfig.c - $(TARGET_CC) $(TARGET_CFLAGS) -DUCLIBC_ROOT_DIR=\"$(ROOT_DIR)\" \ + $(TARGET_CC) $(TARGET_CFLAGS) -DUCLIBC_ROOT_DIR=\"$(DEVEL_PREFIX)\" \ -c $< -o $@ $(STRIPTOOL) -x -R .note -R .comment $*.o @@ -21,7 +21,7 @@ ldconfig: ldconfig.o readsoname.o $(STRIPTOOL) -x -R .note -R .comment $@ ldd: ldd.c - $(TARGET_CC) $(TARGET_CFLAGS) -DUCLIBC_ROOT_DIR=\"$(ROOT_DIR)\" \ + $(TARGET_CC) $(TARGET_CFLAGS) -DUCLIBC_ROOT_DIR=\"$(DEVEL_PREFIX)\" \ -DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR); pwd)\" \ -static ldd.c -o $@ $(STRIPTOOL) -x -R .note -R .comment $@ -- cgit v1.2.3