From c85e77b1fb17b14dd8db16fe85bfa05b333899df Mon Sep 17 00:00:00 2001
From: Ben Laurie <ben@openssl.org>
Date: Sun, 9 Mar 2008 18:22:50 +0000
Subject: [PATCH] Fix dependencies. Again.

---
 crypto/evp/Makefile  | 23 +++++++++++++++++++++++
 util/clean-depend.pl |  4 ++++
 2 files changed, 27 insertions(+)

diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile
index 0261eb3b5e..6cbe777b34 100644
--- a/crypto/evp/Makefile
+++ b/crypto/evp/Makefile
@@ -527,6 +527,29 @@ evp_acnf.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 evp_acnf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 evp_acnf.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
 evp_acnf.o: ../../include/openssl/ui_compat.h ../cryptlib.h evp_acnf.c
+evp_cnf.o: ../../e_os.h ../../include/openssl/aes.h
+evp_cnf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+evp_cnf.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+evp_cnf.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
+evp_cnf.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+evp_cnf.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+evp_cnf.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+evp_cnf.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
+evp_cnf.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+evp_cnf.o: ../../include/openssl/fips.h ../../include/openssl/idea.h
+evp_cnf.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+evp_cnf.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+evp_cnf.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
+evp_cnf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+evp_cnf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+evp_cnf.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+evp_cnf.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+evp_cnf.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+evp_cnf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+evp_cnf.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+evp_cnf.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+evp_cnf.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+evp_cnf.o: ../../include/openssl/x509v3.h ../cryptlib.h evp_cnf.c
 evp_enc.o: ../../e_os.h ../../include/openssl/aes.h
 evp_enc.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 evp_enc.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
diff --git a/util/clean-depend.pl b/util/clean-depend.pl
index 6c485d1e2f..e31bda4ad8 100755
--- a/util/clean-depend.pl
+++ b/util/clean-depend.pl
@@ -37,6 +37,10 @@ foreach $file (sort keys %files) {
     $file=~s/^\.\///;
     push @{$files{$file}},$origfile;
     my $prevdep="";
+
+    # Remove leading ./ before sorting
+    my @deps = map { $_ =~ s/^\.\///; $_ } @{$files{$file}};
+
     foreach $dep (sort @{$files{$file}}) {
 	$dep=~s/^\.\///;
 	next if $prevdep eq $dep; # to exterminate duplicates...
-- 
2.25.1