From 72c0f6a2d644754439d57acd2a90108d2ec2c9fe Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Tue, 22 Nov 2005 21:45:24 +0000 Subject: Depedencies corrected (less make oldconfig/headers), rerunning make remakes only headers --- libutil/Makefile.in | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'libutil/Makefile.in') diff --git a/libutil/Makefile.in b/libutil/Makefile.in index 4267ce594..bc6943aeb 100644 --- a/libutil/Makefile.in +++ b/libutil/Makefile.in @@ -22,7 +22,11 @@ libutil_SRC := $(filter-out $(libutil_DIR)/forkpty.c,$(libutil_SRC)) endif libutil_OBJ := $(patsubst $(libutil_DIR)/%.c,$(libutil_OUT)/%.o,$(libutil_SRC)) +ifeq ($(DOPIC),y) +libutil-a-y := $(libutil_OBJ:.o=.os) +else libutil-a-y := $(libutil_OBJ) +endif libutil-so-y := $(libutil_OBJ:.o=.os) libutil-multi-y := $(libutil_SRC) @@ -31,7 +35,11 @@ lib-a-y += $(top_builddir)lib/libutil.a lib-so-y += $(top_builddir)lib/libutil.so objclean-y += libutil_clean -$(top_builddir)lib/libutil.so: $(libutil_OUT)/libutil_so.a $(libc-so-dep) +ifeq ($(DOPIC),y) +$(top_builddir)lib/libutil.so: $(top_builddir)lib/libutil.a $(libc) +else +$(top_builddir)lib/libutil.so: $(libutil_OUT)/libutil_so.a $(libc) +endif $(call link.so,$(libutil_FULL_NAME),$(MAJOR_VERSION)) $(libutil_OUT)/libutil_so.a: $(libutil-so-y) @@ -39,16 +47,10 @@ $(libutil_OUT)/libutil_so.a: $(libutil-so-y) $(do_strip) $(do_ar) -ifeq ($(DOPIC),y) -$(top_builddir)lib/libutil.a: $(libutil-a-y:.o=.os) -else -$(top_builddir)lib/libutil.a: $(libutil-a-y) $(libutil_OUT)/libutil_so.a -endif +$(top_builddir)lib/libutil.a: $(libutil-a-y) $(Q)$(INSTALL) -d $(dir $@) $(Q)$(RM) $@ -ifneq ($(DOPIC),y) $(do_strip) -endif $(do_ar) libutil_clean: -- cgit v1.2.3