It was a very bad idea to use #include "../e_os.h" -- when this occurs
in cryptlib.h (which is often included as "../cryptlib.h"), then the question remains relative to which directory this is to be interpreted. gcc went one further directory up, as intended; but makedepend thinks differently, and so probably do some C compilers. So the ../ must go away; thus e_os.h goes back into include/openssl (but I now use #include "openssl/e_os.h" instead of <openssl/e_os.h> to make the point) -- and we have another huge bunch of dependency changes. Argh.
This commit is contained in:
@@ -82,80 +82,87 @@ clean:
|
||||
|
||||
rsa_eay.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
|
||||
rsa_eay.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
|
||||
rsa_eay.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
|
||||
rsa_eay.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
|
||||
rsa_eay.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
|
||||
rsa_eay.o: ../../include/openssl/rsa.h ../../include/openssl/stack.h
|
||||
rsa_eay.o: ../cryptlib.h ../e_os.h
|
||||
rsa_eay.o: ../cryptlib.h
|
||||
rsa_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
|
||||
rsa_err.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
|
||||
rsa_err.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
|
||||
rsa_err.o: ../../include/openssl/stack.h
|
||||
rsa_gen.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
|
||||
rsa_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
|
||||
rsa_gen.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
|
||||
rsa_gen.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
|
||||
rsa_gen.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
|
||||
rsa_gen.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h
|
||||
rsa_gen.o: ../../include/openssl/stack.h ../cryptlib.h
|
||||
rsa_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
|
||||
rsa_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
|
||||
rsa_lib.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
|
||||
rsa_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
|
||||
rsa_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
|
||||
rsa_lib.o: ../../include/openssl/rsa.h ../../include/openssl/stack.h
|
||||
rsa_lib.o: ../cryptlib.h ../e_os.h
|
||||
rsa_lib.o: ../cryptlib.h
|
||||
rsa_none.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
|
||||
rsa_none.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
|
||||
rsa_none.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
|
||||
rsa_none.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
|
||||
rsa_none.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
|
||||
rsa_none.o: ../../include/openssl/rsa.h ../../include/openssl/stack.h
|
||||
rsa_none.o: ../cryptlib.h ../e_os.h
|
||||
rsa_none.o: ../cryptlib.h
|
||||
rsa_oaep.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
|
||||
rsa_oaep.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
|
||||
rsa_oaep.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
|
||||
rsa_oaep.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
|
||||
rsa_oaep.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
|
||||
rsa_oaep.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h
|
||||
rsa_oaep.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h
|
||||
rsa_oaep.o: ../../include/openssl/stack.h ../cryptlib.h
|
||||
rsa_pk1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
|
||||
rsa_pk1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
|
||||
rsa_pk1.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
|
||||
rsa_pk1.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
|
||||
rsa_pk1.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
|
||||
rsa_pk1.o: ../../include/openssl/rsa.h ../../include/openssl/stack.h
|
||||
rsa_pk1.o: ../cryptlib.h ../e_os.h
|
||||
rsa_pk1.o: ../cryptlib.h
|
||||
rsa_saos.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
|
||||
rsa_saos.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
|
||||
rsa_saos.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
|
||||
rsa_saos.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
|
||||
rsa_saos.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
|
||||
rsa_saos.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
|
||||
rsa_saos.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
|
||||
rsa_saos.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
|
||||
rsa_saos.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
|
||||
rsa_saos.o: ../../include/openssl/opensslconf.h
|
||||
rsa_saos.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
|
||||
rsa_saos.o: ../../include/openssl/err.h ../../include/openssl/evp.h
|
||||
rsa_saos.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
|
||||
rsa_saos.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
|
||||
rsa_saos.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
|
||||
rsa_saos.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
|
||||
rsa_saos.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
|
||||
rsa_saos.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
|
||||
rsa_saos.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
|
||||
rsa_saos.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
|
||||
rsa_saos.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
|
||||
rsa_saos.o: ../cryptlib.h ../e_os.h
|
||||
rsa_saos.o: ../cryptlib.h
|
||||
rsa_sign.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
|
||||
rsa_sign.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
|
||||
rsa_sign.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
|
||||
rsa_sign.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
|
||||
rsa_sign.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
|
||||
rsa_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
|
||||
rsa_sign.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
|
||||
rsa_sign.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
|
||||
rsa_sign.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
|
||||
rsa_sign.o: ../../include/openssl/opensslconf.h
|
||||
rsa_sign.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
|
||||
rsa_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h
|
||||
rsa_sign.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
|
||||
rsa_sign.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
|
||||
rsa_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
|
||||
rsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
|
||||
rsa_sign.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
|
||||
rsa_sign.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
|
||||
rsa_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
|
||||
rsa_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
|
||||
rsa_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
|
||||
rsa_sign.o: ../cryptlib.h ../e_os.h
|
||||
rsa_sign.o: ../cryptlib.h
|
||||
rsa_ssl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
|
||||
rsa_ssl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
|
||||
rsa_ssl.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
|
||||
rsa_ssl.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
|
||||
rsa_ssl.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
|
||||
rsa_ssl.o: ../../include/openssl/rsa.h ../../include/openssl/stack.h
|
||||
rsa_ssl.o: ../cryptlib.h ../e_os.h
|
||||
rsa_ssl.o: ../cryptlib.h
|
||||
|
||||
@@ -3,11 +3,7 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifndef FLAT_INC
|
||||
# include "../e_os.h"
|
||||
#else
|
||||
# include "e_os.h"
|
||||
#endif
|
||||
#include "openssl/e_os.h"
|
||||
|
||||
#include <openssl/err.h>
|
||||
#ifdef NO_RSA
|
||||
|
||||
Reference in New Issue
Block a user