Commit 84cf97af authored by Ben Laurie's avatar Ben Laurie
Browse files

Improve make depend. 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 2f1a5d16

crypto/engine/eng_cryptodev.c

+18 −16
Original line number Diff line number Diff line
@@ -42,18 +42,10 @@ 
# endif

#endif



#ifndef HAVE_CRYPTODEV



void ENGINE_load_cryptodev(void)

{

    /* This is a NOP on platforms without /dev/crypto */

    return;

}



#else



#include <sys/types.h>

#ifdef HAVE_CRYPTODEV

# include <crypto/cryptodev.h>

#endif

#include <openssl/dh.h>

#include <openssl/dsa.h>

#include <openssl/err.h>
@@ -68,6 +60,16 @@ void ENGINE_load_cryptodev(void) 
#include <errno.h>

#include <string.h>



#ifndef HAVE_CRYPTODEV



void ENGINE_load_cryptodev(void)

{

    /* This is a NOP on platforms without /dev/crypto */

    return;

}



#else



struct dev_crypto_state {

    struct session_op d_sess;

    int d_fd;

crypto/evp/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ e_null.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 
e_null.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h

e_null.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

e_null.o: ../include/internal/cryptlib.h e_null.c

e_old.o: e_old.c

e_rc2.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h

e_rc2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

e_rc2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

test/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -416,7 +416,8 @@ clienthellotest.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h 
clienthellotest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h

clienthellotest.o: clienthellotest.c

constant_time_test.o: ../e_os.h ../include/internal/constant_time_locl.h

constant_time_test.o: constant_time_test.c

constant_time_test.o: ../include/openssl/e_os2.h

constant_time_test.o: ../include/openssl/opensslconf.h constant_time_test.c

destest.o: ../include/openssl/des.h ../include/openssl/e_os2.h

destest.o: ../include/openssl/opensslconf.h destest.c

dhtest.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/bn.h
@@ -681,7 +682,8 @@ ssltest.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h 
ssltest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h

ssltest.o: ../include/openssl/x509v3.h ../ssl/packet_locl.h

ssltest.o: ../ssl/record/record.h ../ssl/ssl_locl.h ssltest.c

testutil.o: ../e_os.h testutil.c testutil.h

testutil.o: ../e_os.h ../include/openssl/e_os2.h

testutil.o: ../include/openssl/opensslconf.h testutil.c testutil.h

v3nametest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h

v3nametest.o: ../include/openssl/buffer.h ../include/openssl/conf.h

v3nametest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h

util/clean-depend.pl

+7 −0
Original line number Diff line number Diff line
@@ -3,6 +3,11 @@ 
# Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999



use strict;

use Cwd;



my $path = getcwd();

$path =~ /([^\/]+)$/;

$path = $1;



while(<STDIN>) {

    print;
@@ -56,6 +61,8 @@ foreach $file (sort keys %files) { 


    # Remove leading ./ before sorting

    my @deps = map { $_ =~ s/^\.\///; $_ } @{$files{$file}};

    # Remove ../thisdir/

    @deps = map { $_ =~ s|^../$path/||; $_ } @deps;



    foreach $dep (sort @deps) {

	$dep=~s/^\.\///;