summaryrefslogtreecommitdiff
path: root/ldso
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2005-11-22 21:45:24 (GMT)
committerPeter S. Mazinger <ps.m@gmx.net>2005-11-22 21:45:24 (GMT)
commit72c0f6a2d644754439d57acd2a90108d2ec2c9fe (patch)
treee3775d451c00797b522da9292247a97067ecc7a4 /ldso
parent5073e39d0a59b88dfadbe41b53ffd7cc3689e032 (diff)
Depedencies corrected (less make oldconfig/headers), rerunning make remakes only headers
Diffstat (limited to 'ldso')
-rw-r--r--ldso/ldso/Makefile.in5
-rw-r--r--ldso/libdl/Makefile.in15
2 files changed, 8 insertions, 12 deletions
diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in
index 8e6c432..3396e7c 100644
--- a/ldso/ldso/Makefile.in
+++ b/ldso/ldso/Makefile.in
@@ -54,11 +54,10 @@ ld-uClibc_OBJS := $(ld-uClibc_COBJ) $(ld-uClibc_SOBJ)
ld-uClibc-so-y := $(ld-uClibc_OBJS:.o=.os)
-#lib-so-y := $(top_builddir)lib/$(patsubst %.$(MAJOR_VERSION),%,$(UCLIBC_LDSO))
-ld-uClibc-y := $(top_builddir)lib/$(patsubst %.$(MAJOR_VERSION),%,$(UCLIBC_LDSO))
+lib-so-y += $(ldso)
objclean-y += ld-uClibc_clean
-$(top_builddir)lib/$(patsubst %.$(MAJOR_VERSION),%,$(UCLIBC_LDSO)): $(ld-uClibc_OUT)/ld-uClibc_so.a
+$(ldso:.$(MAJOR_VERSION)=): $(ld-uClibc_OUT)/ld-uClibc_so.a
$(call link.so,$(ldso_FULL_NAME),$(MAJOR_VERSION))
$(ld-uClibc_OUT)/ld-uClibc_so.a: $(ld-uClibc-so-y)
diff --git a/ldso/libdl/Makefile.in b/ldso/libdl/Makefile.in
index f90cee0..2458324 100644
--- a/ldso/libdl/Makefile.in
+++ b/ldso/libdl/Makefile.in
@@ -20,7 +20,7 @@ CFLAGS-libdl.c := -DLDSO_ELFINTERP=\"$(TARGET_ARCH)/elfinterp.c\"
LDFLAGS-libdl.so := $(LDFLAGS) -fini dl_cleanup
-LIBS-libdl.so := $(LIBS) $(top_builddir)lib/$(UCLIBC_LDSO)
+LIBS-libdl.so := $(LIBS) $(ldso)
libdl_FULL_NAME := libdl-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
@@ -33,13 +33,16 @@ libdl_OBJ := $(patsubst $(libdl_DIR)/%.c,$(libdl_OUT)/%.o,$(libdl_SRC))
resolve := $(top_builddir)ldso/ldso/$(TARGET_ARCH)/resolve.o
libdl-a-y := $(libdl_OBJ) $(resolve)
+ifeq ($(DOPIC),y)
+libdl-a-y := $(libdl-a-y:.o=.os)
+endif
libdl-so-y := $(libdl_OUT)/libdl.oS
lib-a-$(HAVE_SHARED) += $(top_builddir)lib/libdl.a
lib-so-y += $(top_builddir)lib/libdl.so
objclean-y += libdl_clean
-$(top_builddir)lib/libdl.so: $(libdl_OUT)/libdl_so.a $(ld-uClibc-y) $(libc-so-dep)
+$(top_builddir)lib/libdl.so: $(libdl_OUT)/libdl_so.a $(libc)
$(call link.so,$(libdl_FULL_NAME),$(MAJOR_VERSION))
$(libdl_OUT)/libdl_so.a: $(libdl-so-y)
@@ -47,16 +50,10 @@ $(libdl_OUT)/libdl_so.a: $(libdl-so-y)
$(do_strip)
$(do_ar)
-ifeq ($(DOPIC),y)
-$(top_builddir)lib/libdl.a: $(libdl-a-y:.o=.os)
-else
-$(top_builddir)lib/libdl.a: $(libdl-a-y) $(libdl_OUT)/libdl_so.a
-endif
+$(top_builddir)lib/libdl.a: $(libdl-a-y)
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@
-ifneq ($(DOPIC),y)
$(do_strip)
-endif
$(do_ar)
libdl_clean: