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 --- libcrypt/Makefile.in | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'libcrypt') diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in index ed65f0f81..7c8b4589f 100644 --- a/libcrypt/Makefile.in +++ b/libcrypt/Makefile.in @@ -20,7 +20,11 @@ libcrypt_OUT := $(top_builddir)libcrypt libcrypt_SRC := $(wildcard $(libcrypt_DIR)/*.c) libcrypt_OBJ := $(patsubst $(libcrypt_DIR)/%.c,$(libcrypt_OUT)/%.o,$(libcrypt_SRC)) +ifeq ($(DOPIC),y) +libcrypt-a-y := $(libcrypt_OBJ:.o=.os) +else libcrypt-a-y := $(libcrypt_OBJ) +endif libcrypt-so-y := $(libcrypt_OBJ:.o=.os) libcrypt-multi-y := $(libcrypt_SRC) @@ -29,7 +33,11 @@ lib-a-y += $(top_builddir)lib/libcrypt.a lib-so-y += $(top_builddir)lib/libcrypt.so objclean-y += libcrypt_clean -$(top_builddir)lib/libcrypt.so: $(libcrypt_OUT)/libcrypt_so.a $(libc-so-dep) +ifeq ($(DOPIC),y) +$(top_builddir)lib/libcrypt.so: $(top_builddir)lib/libcrypt.a $(libc) +else +$(top_builddir)lib/libcrypt.so: $(libcrypt_OUT)/libcrypt_so.a $(libc) +endif $(call link.so,$(libcrypt_FULL_NAME),$(MAJOR_VERSION)) $(libcrypt_OUT)/libcrypt_so.a: $(libcrypt-so-y) @@ -37,16 +45,10 @@ $(libcrypt_OUT)/libcrypt_so.a: $(libcrypt-so-y) $(do_strip) $(do_ar) -ifeq ($(DOPIC),y) -$(top_builddir)lib/libcrypt.a: $(libcrypt-a-y:.o=.os) -else -$(top_builddir)lib/libcrypt.a: $(libcrypt-a-y) $(libcrypt_OUT)/libcrypt_so.a -endif +$(top_builddir)lib/libcrypt.a: $(libcrypt-a-y) $(Q)$(INSTALL) -d $(dir $@) $(Q)$(RM) $@ -ifneq ($(DOPIC),y) $(do_strip) -endif $(do_ar) libcrypt_clean: -- cgit v1.2.3