summaryrefslogtreecommitdiff
path: root/libresolv
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2005-11-22 21:45:24 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2005-11-22 21:45:24 +0000
commit72c0f6a2d644754439d57acd2a90108d2ec2c9fe (patch)
treee3775d451c00797b522da9292247a97067ecc7a4 /libresolv
parent5073e39d0a59b88dfadbe41b53ffd7cc3689e032 (diff)
Depedencies corrected (less make oldconfig/headers), rerunning make remakes only headers
Diffstat (limited to 'libresolv')
-rw-r--r--libresolv/Makefile.in18
1 files changed, 10 insertions, 8 deletions
diff --git a/libresolv/Makefile.in b/libresolv/Makefile.in
index da699a8ca..acf59ea20 100644
--- a/libresolv/Makefile.in
+++ b/libresolv/Makefile.in
@@ -19,7 +19,11 @@ libresolv_OUT := $(top_builddir)libresolv
libresolv_SRC := $(libresolv_DIR)/resolv.c
libresolv_OBJ := $(patsubst $(libresolv_DIR)/%.c,$(libresolv_OUT)/%.o,$(libresolv_SRC))
+ifeq ($(DOPIC),y)
+libresolv-a-y := $(libresolv_OBJ:.o=.os)
+else
libresolv-a-y := $(libresolv_OBJ)
+endif
libresolv-so-y := $(libresolv_OBJ:.o=.os)
libresolv-multi-y := $(libresolv_SRC)
@@ -28,7 +32,11 @@ lib-a-y += $(top_builddir)lib/libresolv.a
lib-so-y += $(top_builddir)lib/libresolv.so
objclean-y += libresolv_clean
-$(top_builddir)lib/libresolv.so: $(libresolv_OUT)/libresolv_so.a $(libc-so-dep)
+ifeq ($(DOPIC),y)
+$(top_builddir)lib/libresolv.so: $(top_builddir)lib/libresolv.a $(libc)
+else
+$(top_builddir)lib/libresolv.so: $(libresolv_OUT)/libresolv_so.a $(libc)
+endif
$(call link.so,$(libresolv_FULL_NAME),$(MAJOR_VERSION))
$(libresolv_OUT)/libresolv_so.a: $(libresolv-so-y)
@@ -36,16 +44,10 @@ $(libresolv_OUT)/libresolv_so.a: $(libresolv-so-y)
$(do_strip)
$(do_ar)
-ifeq ($(DOPIC),y)
-$(top_builddir)lib/libresolv.a: $(libresolv-a-y:.o=.os)
-else
-$(top_builddir)lib/libresolv.a: $(libresolv-a-y) $(libresolv_OUT)/libresolv_so.a
-endif
+$(top_builddir)lib/libresolv.a: $(libresolv-a-y)
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@
-ifneq ($(DOPIC),y)
$(do_strip)
-endif
$(do_ar)
libresolv_clean: