diff options
author | Ben Laurie <ben@links.org> | 2015-10-03 16:43:21 +0100 |
---|---|---|
committer | Ben Laurie <ben@links.org> | 2015-10-24 17:34:21 +0100 |
commit | 84cf97af0691290d53c0a51807fa15f0843219ef (patch) | |
tree | 8277e43442178ab13a80520dbc2ad443b89f64b0 | |
parent | 2f1a5d1694c4b59ea94115ed4e9577c5bb826c26 (diff) |
Improve make depend.
Reviewed-by: Richard Levitte <levitte@openssl.org>
-rw-r--r-- | crypto/engine/eng_cryptodev.c | 34 | ||||
-rw-r--r-- | crypto/evp/Makefile | 1 | ||||
-rw-r--r-- | test/Makefile | 6 | ||||
-rwxr-xr-x | util/clean-depend.pl | 7 |
4 files changed, 30 insertions, 18 deletions
diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c index 65fc29e472..c67ecc5515 100644 --- a/crypto/engine/eng_cryptodev.c +++ b/crypto/engine/eng_cryptodev.c @@ -42,6 +42,24 @@ # endif #endif +#include <sys/types.h> +#ifdef HAVE_CRYPTODEV +# include <crypto/cryptodev.h> +#endif +#include <openssl/dh.h> +#include <openssl/dsa.h> +#include <openssl/err.h> +#include <openssl/rsa.h> +#include <sys/ioctl.h> +#include <errno.h> +#include <stdio.h> +#include <unistd.h> +#include <fcntl.h> +#include <stdarg.h> +#include <syslog.h> +#include <errno.h> +#include <string.h> + #ifndef HAVE_CRYPTODEV void ENGINE_load_cryptodev(void) @@ -52,22 +70,6 @@ void ENGINE_load_cryptodev(void) #else -# include <sys/types.h> -# include <crypto/cryptodev.h> -# include <openssl/dh.h> -# include <openssl/dsa.h> -# include <openssl/err.h> -# include <openssl/rsa.h> -# include <sys/ioctl.h> -# include <errno.h> -# include <stdio.h> -# include <unistd.h> -# include <fcntl.h> -# include <stdarg.h> -# include <syslog.h> -# include <errno.h> -# include <string.h> - struct dev_crypto_state { struct session_op d_sess; int d_fd; diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile index a175d0bde1..1a65b46893 100644 --- a/crypto/evp/Makefile +++ b/crypto/evp/Makefile @@ -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 diff --git a/test/Makefile b/test/Makefile index e9386335f5..6f32758074 100644 --- a/test/Makefile +++ b/test/Makefile @@ -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 diff --git a/util/clean-depend.pl b/util/clean-depend.pl index 30197b798d..f29192f246 100755 --- a/util/clean-depend.pl +++ b/util/clean-depend.pl @@ -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/^\.\///; |