Change rules to find map files on common-objpfx.

[kopensolaris-gnu/glibc.git] / md5-crypt / Makefile

diff --git a/md5-crypt/Makefile b/md5-crypt/Makefile
index 4c461b0..40186ec 100644 (file)
--- a/md5-crypt/Makefile
+++ b/md5-crypt/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998 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
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or


@@ -30,16 +30,23 @@ tests       := md5test md5c-test
 extra-libs := libcrypt
 extra-libs-others := $(extra-libs)
 
 extra-libs := libcrypt
 extra-libs-others := $(extra-libs)
 

-libcrypt-routines := crypt-entry md5-crypt md5
+md5-routines := crypt-entry md5-crypt md5
+libcrypt-routines := $(md5-routines)
+
+onlymd5-routines := onlymd5-entry md5-crypt md5
+distribute += onlymd5-entry.c
+extra-objs = $(patsubst %,onlymd5-entry%,$(object-suffixes))

 
 include ../Makeconfig
 
 
 include ../Makeconfig
 

-rpath-link := $(common-objpfx)crypt:$(rpath-link)
+rpath-dirs += md5-crypt

 
 ifeq ($(crypt-in-libc),yes)
 routines += $(libcrypt-routines)
 endif
 
 
 ifeq ($(crypt-in-libc),yes)
 routines += $(libcrypt-routines)
 endif
 

+$(objpfx)md5test: $(objpfx)md5.o
+

 include ../Rules
 
 ifeq ($(build-shared),yes)
 include ../Rules
 
 ifeq ($(build-shared),yes)


@@ -49,3 +56,28 @@ libdepend = $(common-objpfx)md5-crypt/libcrypt.a
 endif
 
 $(objpfx)md5test $(objpfx)md5c-test: $(libdepend)
 endif
 
 $(objpfx)md5test $(objpfx)md5c-test: $(libdepend)

+
+.PHONY: libmd5crypt
+libmd5crypt: $(foreach o,$(object-suffixes), \
+                   $(addprefix $(objpfx),$(patsubst %,$(libtype$o),md5crypt)))
+ifeq ($(build-shared),yes)
+libmd5crypt: $(objpfx)libmd5crypt.so
+# Use the same soname as the real libcrypt, so that it can be used as a
+# drop in replacement.
+LDFLAGS-md5crypt.so = -Wl,-soname=lib$(libprefix)crypt.so$(libcrypt.so-version)
+# We also use the same version script.
+libmd5crypt-map := $(common-objpfx)libcrypt.map
+endif
+
+define o-iterator-doit
+$(objpfx)$(patsubst %,$(libtype$o),md5crypt): \
+  $(onlymd5-routines:%=$(objpfx)%$o); $$(build-extra-lib)
+endef
+object-suffixes-left = $(object-suffixes)
+include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes))
+
+# 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
+$(objpfx)libmd5crypt.so: $(common-objpfx)libc.so