summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2005-11-21 13:42:00 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2005-11-21 13:42:00 +0000
commit00e04cb76f79f8cb50c23d0bca378b2b0b3f9f26 (patch)
tree9d9c553bea182ae25eceeafe3742fc7828fea0a2 /utils
parenta794254f4c8448acafe7a988ceaf174f6d686bed (diff)
Do not create header links, use -I to find them. Moved dl-progname.h to ldso/ldso, that will exist if top_srcdir != top_builddir.
Diffstat (limited to 'utils')
-rw-r--r--utils/Makefile14
1 files changed, 4 insertions, 10 deletions
diff --git a/utils/Makefile b/utils/Makefile
index b665fb7a8..a0ba63376 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -9,7 +9,7 @@ top_srcdir=../
top_builddir=../
include $(top_builddir)Rules.mak
-CFLAGS += $(SSP_ALL_CFLAGS) -B$(top_builddir)lib -I$(top_builddir)ldso/include
+CFLAGS += $(SSP_ALL_CFLAGS) -B$(top_builddir)lib -I$(top_srcdir)ldso/include
TARGETS = ldd ldconfig
@@ -33,12 +33,6 @@ else
all: $(TARGET_ICONV)
endif
-headers:
- @$(LN) -fs $(top_builddir)include/elf.h
- @$(LN) -fs $(top_builddir)include/link.h
-
-readelf.c ldconfig.c ldd.c: headers
-
readelf: readelf.c
$(CC) $(CFLAGS) $^ -o $@
$(STRIPTOOL) -s -x -R .note -R .comment $@
@@ -79,20 +73,20 @@ endif
ldd.host: ldd.c
$(HOSTCC) $(HOSTCFLAGS) -Wl,-s \
-DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" $(HOST_LDSO_CACHE_FLAG) \
- -DUCLIBC_LDSO=$(UCLIBC_LDSO) -I. -I$(top_builddir)ldso/include \
+ -DUCLIBC_LDSO=$(UCLIBC_LDSO) -I$(top_srcdir)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$(top_builddir)ldso/include \
+ -DUCLIBC_LDSO=$(UCLIBC_LDSO) -I$(top_srcdir)ldso/include \
$^ -o $@
readelf.host: readelf.c
$(HOSTCC) $(HOSTCFLAGS) -Wl,-s $^ -o $@
clean:
- $(RM) $(TARGETS) *.o *~ core elf.h link.h readelf iconv *.host
+ $(RM) $(TARGETS) *.o *~ core readelf iconv *.host
install: all
ifeq ($(HAVE_SHARED),y)