libcrypt: add support for SHA256-CRYPT password hashing

[uclinux-h8/uClibc.git] / libcrypt / Makefile.in

diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in
index a74e4ec..94753f4 100644 (file)
--- a/libcrypt/Makefile.in
+++ b/libcrypt/Makefile.in
@@ -1,12 +1,15 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
+subdirs += libcrypt
+
 CFLAGS-libcrypt := -DNOT_IN_libc -DIS_IN_libcrypt $(SSP_ALL_CFLAGS)
 
+LDFLAGS-$(UCLIBC_FORMAT_DSBT_ELF)-libcrypt.so := -Wl,--dsbt-index=4
 LDFLAGS-libcrypt.so := $(LDFLAGS)
 
 LIBS-libcrypt.so := $(LIBS)
@@ -16,14 +19,13 @@ libcrypt_FULL_NAME := libcrypt-$(VERSION).so
 libcrypt_DIR := $(top_srcdir)libcrypt
 libcrypt_OUT := $(top_builddir)libcrypt
 
-ifeq ($(UCLIBC_HAS_CRYPT_IMPL),y)
-CSRC := crypt.c des.c md5.c
-endif
-ifeq ($(UCLIBC_HAS_CRYPT_STUB),y)
-CSRC := crypt_stub.c
-endif
+libcrypt_SRC-y :=
+libcrypt_SRC-$(UCLIBC_HAS_CRYPT_IMPL) += crypt.c des.c md5.c
+libcrypt_SRC-$(UCLIBC_HAS_SHA256_CRYPT_IMPL) += sha256.c sha256-crypt.c
+libcrypt_SRC-$(UCLIBC_HAS_SHA512_CRYPT_IMPL) += sha512.c sha512-crypt.c
+libcrypt_SRC-$(UCLIBC_HAS_CRYPT_STUB) += crypt_stub.c
 
-libcrypt_SRC := $(addprefix $(libcrypt_DIR)/,$(CSRC))
+libcrypt_SRC := $(addprefix $(libcrypt_DIR)/,$(libcrypt_SRC-y))
 libcrypt_OBJ := $(patsubst $(libcrypt_DIR)/%.c,$(libcrypt_OUT)/%.o,$(libcrypt_SRC))
 
 ifeq ($(DOPIC),y)
@@ -33,11 +35,9 @@ libcrypt-a-y := $(libcrypt_OBJ)
 endif
 libcrypt-so-y := $(libcrypt_OBJ:.o=.os)
 
-ifeq ($(UCLIBC_HAS_CRYPT),y)
-lib-a-y += $(top_builddir)lib/libcrypt.a
-lib-so-y += $(top_builddir)lib/libcrypt.so
-endif
-objclean-y += libcrypt_clean
+lib-a-$(UCLIBC_HAS_CRYPT)  += $(top_builddir)lib/libcrypt.a
+lib-so-$(UCLIBC_HAS_CRYPT) += $(top_builddir)lib/libcrypt.so
+objclean-y += CLEAN_libcrypt
 
 ifeq ($(DOMULTI),n)
 ifeq ($(DOPIC),y)
@@ -45,10 +45,10 @@ $(top_builddir)lib/libcrypt.so: $(top_builddir)lib/libcrypt.a $(libc.depend)
 else
 $(top_builddir)lib/libcrypt.so: $(libcrypt_OUT)/libcrypt_so.a $(libc.depend)
 endif
-       $(call link.so,$(libcrypt_FULL_NAME),$(MAJOR_VERSION))
+       $(call link.so,$(libcrypt_FULL_NAME),$(ABI_VERSION))
 else
 $(top_builddir)lib/libcrypt.so: $(libcrypt_OUT)/libcrypt.oS | $(libc.depend)
-       $(call linkm.so,$(libcrypt_FULL_NAME),$(MAJOR_VERSION))
+       $(call linkm.so,$(libcrypt_FULL_NAME),$(ABI_VERSION))
 endif
 
 $(libcrypt_OUT)/libcrypt_so.a: $(libcrypt-so-y)
@@ -64,5 +64,5 @@ $(top_builddir)lib/libcrypt.a: $(libcrypt-a-y)
        $(Q)$(RM) $@
        $(do_ar)
 
-libcrypt_clean:
-       $(RM) $(libcrypt_OUT)/*.{o,os,oS,a}
+CLEAN_libcrypt:
+       $(do_rm) $(addprefix $(libcrypt_OUT)/*., o os oS a)