summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Laurie <ben@openssl.org>2007-09-19 13:10:34 +0000
committerBen Laurie <ben@openssl.org>2007-09-19 13:10:34 +0000
commit1c90899eef5ce012b9dcc5697d28e30b57ed208d (patch)
tree1af5200a88cbece0adea929e72bc2d6249498496
parent4f2b7d48b120d27018f122dc614b271a541445c9 (diff)
downloadopenssl-new-1c90899eef5ce012b9dcc5697d28e30b57ed208d.tar.gz
Slight bug in dependencies caused occasional unnecessary diffs. Fixed.
-rw-r--r--apps/Makefile2
-rwxr-xr-xutil/clean-depend.pl7
2 files changed, 6 insertions, 3 deletions
diff --git a/apps/Makefile b/apps/Makefile
index 7019cfcdf2..c433ae0422 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -831,7 +831,7 @@ speed.o: ../include/openssl/safestack.h ../include/openssl/sha.h
speed.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
speed.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
speed.o: ../include/openssl/ui_compat.h ../include/openssl/x509.h
-speed.o: ../include/openssl/x509_vfy.h testdsa.h testrsa.h apps.h speed.c
+speed.o: ../include/openssl/x509_vfy.h apps.h speed.c testdsa.h testrsa.h
spkac.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
spkac.o: ../include/openssl/buffer.h ../include/openssl/conf.h
spkac.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
diff --git a/util/clean-depend.pl b/util/clean-depend.pl
index 6c485d1e2f..2b2bdb4048 100755
--- a/util/clean-depend.pl
+++ b/util/clean-depend.pl
@@ -37,8 +37,11 @@ foreach $file (sort keys %files) {
$file=~s/^\.\///;
push @{$files{$file}},$origfile;
my $prevdep="";
- foreach $dep (sort @{$files{$file}}) {
- $dep=~s/^\.\///;
+
+ # Remove leading ./ before sorting
+ my @deps = map { $_ =~ s/^\.\///; $_ } @{$files{$file}};
+
+ foreach $dep (sort @deps) {
next if $prevdep eq $dep; # to exterminate duplicates...
$prevdep = $dep;
$len=0 if $len+length($dep)+1 >= 80;