Update.

[glibc.git] / crypt / Makefile

diff --git a/crypt/Makefile b/crypt/Makefile
index 1be33be0015493e483090aa5cc52904e2b911757..91a712109c360ad0f89c2d964ba98de9c853043c 100644 (file)
--- a/crypt/Makefile
+++ b/crypt/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996 Free Software Foundation, Inc.
+# Copyright (C) 1996, 2000 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -17,20 +17,44 @@
 # Boston, MA 02111-1307, USA.
 
 #
-#      Sub-makefile for DES crypt portion of the library.
+#      Sub-makefile for crypt() portion of the library.
 #
 subdir := crypt
 
-tests = cert
+headers := crypt.h
+
+distribute := md5.h
+
+extra-libs := libcrypt
+extra-libs-others := $(extra-libs)
+
+libcrypt-routines := crypt-entry md5-crypt md5 crypt crypt_util
+
+tests = cert md5test md5c-test
+
+distribute = ufc-crypt.h crypt-private.h ufc.c speeds.c README.ufc-crypt \
+            Banner md5.h
 
 include ../Makeconfig
 
-rpath-dirs += md5-crypt
+ifeq ($(crypt-in-libc),yes)
+routines += $(libcrypt-routines)
+endif
+
+$(objpfx)md5test: $(objpfx)md5.o
 
 include ../Rules
 
-ifeq ($(build-shared),yes)
-$(objpfx)cert: $(common-objpfx)md5-crypt/libcrypt.so$(libcrypt.so-version)
+ifeq (yes,$(build-shared))
+$(addprefix $(objpfx),$(tests)): $(objpfx)libcrypt.so
 else
-$(objpfx)cert: $(common-objpfx)md5-crypt/libcrypt.a
+$(addprefix $(objpfx),$(tests)): $(objpfx)libcrypt.a
 endif
+ifeq (yes,$(build-bounded))
+$(tests:%=$(objpfx)%-bp): $(objpfx)libcrypt_b.a
+endif
+
+# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
+# This ensures they will load libc.so for needed symbols if loaded by
+# a statically-linked program that hasn't already loaded it.
+$(objpfx)libcrypt.so: $(common-objpfx)libc.so