diff options
| author | Geoff Keating <geoffk@cygnus.com> | 2000-03-04 00:47:31 +0000 |
|---|---|---|
| committer | Geoff Keating <geoffk@cygnus.com> | 2000-03-04 00:47:31 +0000 |
| commit | b11f59548803413101b72d28f42cbe997d64a144 (patch) | |
| tree | 4898a19a9169c9cedd0250e0e7590dbc6058b189 /crypt/Makefile | |
| parent | e3d53b06cc8520c23a010909ab2f0bde93f2abfc (diff) | |
* Makeconfig (rpath-dirs): Add crypt.
(all-subdirs): Remove md5crypt.
* crypt/sysdeps/unix/crypt.c: Move to crypt/.
* crypt/sysdeps/unix/crypt-entry.c: Move to crypt/.
* sysdeps/generic/crypt-entry.c: Delete.
* crypt/sysdeps/unix/crypt.h: Move to crypt/.
* sysdeps/generic/crypt.h: Delete.
* crypt/sysdeps/unix/crypt-private.h: Move to crypt/.
* crypt/sysdeps/unix/crypt_util.c: Move to crypt/.
* crypt/sysdeps/unix/des_impl.c: Move to sunrpc/.
* sysdeps/generic/des_impl.c: Delete.
* crypt/sysdeps/unix/ufc-crypt.h: Move to crypt/.
* crypt/sysdeps: Delete.
* crypt/crypt_util.c: Don't use `patchlevel.h'.
* md5-crypt/Versions: Move to crypt/.
* md5-crypt/md5-crypt.c: Move to crypt/.
* md5-crypt/md5.c: Move to crypt/.
* md5-crypt/md5c-test.c: Move to crypt/.
* md5-crypt/md5test.c: Move to crypt/.
* md5-crypt: Delete.
* crypt/Makefile: Adjust for new structure.
2000-03-03 Geoff Keating <geoffk@cygnus.com>
* Makeconfig (rpath-dirs): Add crypt.
(all-subdirs): Remove md5crypt.
* crypt/sysdeps/unix/crypt.c: Move to crypt/.
* crypt/sysdeps/unix/crypt-entry.c: Move to crypt/.
* sysdeps/generic/crypt-entry.c: Delete.
* crypt/sysdeps/unix/crypt.h: Move to crypt/.
* sysdeps/generic/crypt.h: Delete.
* crypt/sysdeps/unix/crypt-private.h: Move to crypt/.
* crypt/sysdeps/unix/crypt_util.c: Move to crypt/.
* crypt/sysdeps/unix/des_impl.c: Move to sunrpc/.
* sysdeps/generic/des_impl.c: Delete.
* crypt/sysdeps/unix/ufc-crypt.h: Move to crypt/.
* crypt/sysdeps: Delete.
* crypt/crypt_util.c: Don't use `patchlevel.h'.
* md5-crypt/Versions: Move to crypt/.
* md5-crypt/md5-crypt.c: Move to crypt/.
* md5-crypt/md5.c: Move to crypt/.
* md5-crypt/md5c-test.c: Move to crypt/.
* md5-crypt/md5test.c: Move to crypt/.
* md5-crypt: Delete.
* crypt/Makefile: Adjust for new structure.
Diffstat (limited to 'crypt/Makefile')
| -rw-r--r-- | crypt/Makefile | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/crypt/Makefile b/crypt/Makefile index 1be33be001..a9ce7da41e 100644 --- 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,35 @@ # 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 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) -else -$(objpfx)cert: $(common-objpfx)md5-crypt/libcrypt.a -endif +LDLIBS-cert = crypt/libcrypt +LDLIBS-md5c-test = crypt/libcrypt + +# 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 |