From 00e04cb76f79f8cb50c23d0bca378b2b0b3f9f26 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Mon, 21 Nov 2005 13:42:00 +0000 Subject: 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. --- ldso/ldso/Makefile.in | 14 +++----------- ldso/libdl/Makefile.in | 2 +- utils/Makefile | 14 ++++---------- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in index 490770b3d..98de4c9d5 100644 --- a/ldso/ldso/Makefile.in +++ b/ldso/ldso/Makefile.in @@ -10,7 +10,7 @@ CFLAGS-ldso := -DNOT_IN_libc -DIS_IN_rtld $(SSP_DISABLE_FLAGS) -D_GNU_SOURCE # This stuff will not work with -fomit-frame-pointer CFLAGS-ldso += -fno-omit-frame-pointer -CFLAGS-ldso += -I$(top_builddir)ldso/include -I$(top_builddir)ldso/ldso +CFLAGS-ldso += -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) -I$(top_srcdir)ldso/include -I$(top_builddir)ldso/ldso CFLAGS-ldso += -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" ifeq ($(SUPPORT_LD_DEBUG),y) @@ -52,9 +52,7 @@ ld-uClibc_OBJS := $(ld-uClibc_COBJ) $(ld-uClibc_SOBJ) ld-uClibc-so-y := $(ld-uClibc_OBJS:.o=.os) -LN_HEADERS := $(patsubst %, $(top_builddir)ldso/include/%, elf.h) -LN_ARCH_HEADERS := $(patsubst %, $(top_builddir)ldso/include/%, dl-startup.h dl-syscalls.h dl-sysdep.h dl-debug.h) -HEADERS := $(LN_HEADERS) $(LN_ARCH_HEADERS) $(top_builddir)ldso/include/dl-progname.h +HEADERS := $(top_builddir)ldso/ldso/dl-progname.h #lib-so-y := $(top_builddir)lib/$(patsubst %.$(MAJOR_VERSION),%,$(UCLIBC_LDSO)) ld-uClibc-y := $(top_builddir)lib/$(patsubst %.$(MAJOR_VERSION),%,$(UCLIBC_LDSO)) @@ -72,13 +70,7 @@ $(ld-uClibc_OUT)/ld-uClibc_so.a: $(ld-uClibc-so-y) ldso_headers: $(HEADERS) -$(LN_HEADERS): - $(LN) -sf ../../$(top_srcdir)include/$(notdir $@) $@ - -$(LN_ARCH_HEADERS): - $(LN) -sf ../../$(top_srcdir)ldso/ldso/$(TARGET_ARCH)/$(notdir $@) $@ - -$(top_builddir)ldso/include/dl-progname.h: +$(top_builddir)ldso/ldso/dl-progname.h: echo '#include "$(TARGET_ARCH)/elfinterp.c"' > $@ ldso_headers_clean: diff --git a/ldso/libdl/Makefile.in b/ldso/libdl/Makefile.in index 77f18909c..836e68607 100644 --- a/ldso/libdl/Makefile.in +++ b/ldso/libdl/Makefile.in @@ -8,7 +8,7 @@ CFLAGS-libdl := -DNOT_IN_libc -DIS_IN_libdl $(SSP_ALL_CFLAGS) -CFLAGS-libdl +=-I$(top_builddir)ldso/include -I$(top_builddir)ldso/ldso +CFLAGS-libdl += -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) -I$(top_srcdir)ldso/include -I$(top_builddir)ldso/ldso CFLAGS-libdl += -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" 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) -- cgit v1.2.3