summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2005-11-18 00:26:19 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2005-11-18 00:26:19 +0000
commitfbad3ebcb4bb14d91304dc6b6f59f9ba9ad66593 (patch)
tree8e67d98d90cbd97a011de890f3be371eb6ab6a8f
parentd49d3d90d158b5207eac3f839e63a7e3bfa1f605 (diff)
Replace TOPDIR
-rw-r--r--utils/Makefile17
1 files changed, 10 insertions, 7 deletions
diff --git a/utils/Makefile b/utils/Makefile
index b928c9fe7..49cedc252 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -6,9 +6,12 @@
#
TOPDIR=../
-include $(TOPDIR)Rules.mak
-CFLAGS += $(SSP_ALL_CFLAGS) -B$(TOPDIR)lib -I$(TOPDIR)ldso/include
+top_srcdir=$(TOPDIR)
+top_builddir=../
+include $(top_builddir)Rules.mak
+
+CFLAGS += $(SSP_ALL_CFLAGS) -B$(top_builddir)lib -I$(top_builddir)ldso/include
TARGETS = ldd ldconfig
@@ -33,8 +36,8 @@ all: $(TARGET_ICONV)
endif
headers:
- @$(LN) -fs $(TOPDIR)include/elf.h
- @$(LN) -fs $(TOPDIR)include/link.h
+ @$(LN) -fs $(top_builddir)include/elf.h
+ @$(LN) -fs $(top_builddir)include/link.h
readelf.c ldconfig.c ldd.c: headers
@@ -63,7 +66,7 @@ ldd: ldd.c
$(STRIPTOOL) -s -x -R .note -R .comment $@
ICONV_CFLAGS := $(PIEFLAG) $(LDPIEFLAG)
-iconv: $(TOPDIR)libc/misc/wchar/wchar.c
+iconv: $(top_srcdir)libc/misc/wchar/wchar.c
$(CC) $(CFLAGS) $(ICONV_CFLAGS) \
-DL_iconv_main \
$^ -o $@
@@ -78,13 +81,13 @@ endif
ldd.host: ldd.c
$(HOSTCC) $(HOSTCFLAGS) -Wl,-s \
-DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" $(HOST_LDSO_CACHE_FLAG) \
- -DUCLIBC_LDSO=$(UCLIBC_LDSO) -I. -I$(TOPDIR)ldso/include \
+ -DUCLIBC_LDSO=$(UCLIBC_LDSO) -I. -I$(top_builddir)ldso/include \
$^ -o $@
ldconfig.host: ldconfig.c chroot_realpath.c
$(HOSTCC) $(HOSTCFLAGS) -Wl,-s \
-DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" $(HOST_LDSO_CACHE_FLAG) \
- -DUCLIBC_LDSO=$(UCLIBC_LDSO) -I. -I$(TOPDIR)ldso/include \
+ -DUCLIBC_LDSO=$(UCLIBC_LDSO) -I. -I$(top_builddir)ldso/include \
$^ -o $@
readelf.host: readelf.c