e_os.h does not belong with the exported headers. Do not put it there

and make all files the depend on it include it without prefixing it
with openssl/.

This means that all Makefiles will have $(TOP) as one of the include
directories.

1 files changed, 59 insertions, 59 deletions

diff --git a/crypto/engine/Makefile.ssl b/crypto/engine/Makefile.ssl
index 05236a7161..c82b3e83c1 100644
--- a/crypto/engine/Makefile.ssl
+++ b/crypto/engine/Makefile.ssl
@@ -5,7 +5,7 @@
 DIR=	engine
 TOP=	../..
 CC=	cc
-INCLUDES= -I.. -I../../include
+INCLUDES= -I.. -I$(TOP) -I../../include
 CFLAG=-g
 INSTALL_PREFIX=
 OPENSSLDIR=     /usr/local/ssl
@@ -81,11 +81,11 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-engine_all.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-engine_all.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-engine_all.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-engine_all.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-engine_all.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
+engine_all.o: ../../e_os.h ../../include/openssl/asn1.h
+engine_all.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+engine_all.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
+engine_all.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+engine_all.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
 engine_all.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
 engine_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 engine_all.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
@@ -100,11 +100,11 @@ engine_all.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 engine_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 engine_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 engine_all.o: ../../include/openssl/symhacks.h engine_all.c engine_int.h
-engine_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-engine_err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-engine_err.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-engine_err.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-engine_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
+engine_err.o: ../../e_os.h ../../include/openssl/asn1.h
+engine_err.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+engine_err.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
+engine_err.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+engine_err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
 engine_err.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
 engine_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 engine_err.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
@@ -119,12 +119,12 @@ engine_err.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 engine_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 engine_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 engine_err.o: ../../include/openssl/symhacks.h engine_err.c
-engine_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-engine_lib.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-engine_lib.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-engine_lib.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-engine_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-engine_lib.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+engine_lib.o: ../../e_os.h ../../include/openssl/asn1.h
+engine_lib.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+engine_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+engine_lib.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+engine_lib.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+engine_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
 engine_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h
 engine_lib.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
 engine_lib.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
@@ -140,12 +140,12 @@ engine_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 engine_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 engine_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h engine_int.h
 engine_lib.o: engine_lib.c
-engine_list.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-engine_list.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-engine_list.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-engine_list.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-engine_list.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-engine_list.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+engine_list.o: ../../e_os.h ../../include/openssl/asn1.h
+engine_list.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+engine_list.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+engine_list.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+engine_list.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+engine_list.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
 engine_list.o: ../../include/openssl/engine.h ../../include/openssl/err.h
 engine_list.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
 engine_list.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
@@ -161,12 +161,12 @@ engine_list.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 engine_list.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 engine_list.o: ../../include/openssl/symhacks.h ../cryptlib.h engine_int.h
 engine_list.o: engine_list.c
-engine_openssl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-engine_openssl.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-engine_openssl.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-engine_openssl.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-engine_openssl.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-engine_openssl.o: ../../include/openssl/dso.h ../../include/openssl/e_os.h
+engine_openssl.o: ../../e_os.h ../../include/openssl/asn1.h
+engine_openssl.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+engine_openssl.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+engine_openssl.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+engine_openssl.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+engine_openssl.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
 engine_openssl.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
 engine_openssl.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 engine_openssl.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
@@ -184,12 +184,12 @@ engine_openssl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 engine_openssl.o: ../../include/openssl/stack.h
 engine_openssl.o: ../../include/openssl/symhacks.h ../cryptlib.h engine_int.h
 engine_openssl.o: engine_openssl.c
-hw_atalla.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-hw_atalla.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-hw_atalla.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-hw_atalla.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-hw_atalla.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-hw_atalla.o: ../../include/openssl/dso.h ../../include/openssl/e_os.h
+hw_atalla.o: ../../e_os.h ../../include/openssl/asn1.h
+hw_atalla.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+hw_atalla.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+hw_atalla.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+hw_atalla.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+hw_atalla.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
 hw_atalla.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
 hw_atalla.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 hw_atalla.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
@@ -205,12 +205,12 @@ hw_atalla.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 hw_atalla.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 hw_atalla.o: ../../include/openssl/symhacks.h ../cryptlib.h engine_int.h
 hw_atalla.o: hw_atalla.c vendor_defns/atalla.h
-hw_cswift.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-hw_cswift.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-hw_cswift.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-hw_cswift.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-hw_cswift.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-hw_cswift.o: ../../include/openssl/dso.h ../../include/openssl/e_os.h
+hw_cswift.o: ../../e_os.h ../../include/openssl/asn1.h
+hw_cswift.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+hw_cswift.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+hw_cswift.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+hw_cswift.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+hw_cswift.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
 hw_cswift.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
 hw_cswift.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 hw_cswift.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
@@ -226,12 +226,12 @@ hw_cswift.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 hw_cswift.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 hw_cswift.o: ../../include/openssl/symhacks.h ../cryptlib.h engine_int.h
 hw_cswift.o: hw_cswift.c vendor_defns/cswift.h
-hw_ncipher.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-hw_ncipher.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-hw_ncipher.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-hw_ncipher.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-hw_ncipher.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-hw_ncipher.o: ../../include/openssl/dso.h ../../include/openssl/e_os.h
+hw_ncipher.o: ../../e_os.h ../../include/openssl/asn1.h
+hw_ncipher.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+hw_ncipher.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+hw_ncipher.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+hw_ncipher.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+hw_ncipher.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
 hw_ncipher.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
 hw_ncipher.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 hw_ncipher.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
@@ -250,12 +250,12 @@ hw_ncipher.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 hw_ncipher.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 hw_ncipher.o: ../cryptlib.h engine_int.h hw_ncipher.c
 hw_ncipher.o: vendor_defns/hwcryptohook.h
-hw_nuron.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-hw_nuron.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-hw_nuron.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-hw_nuron.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-hw_nuron.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-hw_nuron.o: ../../include/openssl/dso.h ../../include/openssl/e_os.h
+hw_nuron.o: ../../e_os.h ../../include/openssl/asn1.h
+hw_nuron.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+hw_nuron.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+hw_nuron.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+hw_nuron.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+hw_nuron.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
 hw_nuron.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
 hw_nuron.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 hw_nuron.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
@@ -271,12 +271,12 @@ hw_nuron.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 hw_nuron.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 hw_nuron.o: ../../include/openssl/symhacks.h ../cryptlib.h engine_int.h
 hw_nuron.o: hw_nuron.c
-hw_ubsec.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-hw_ubsec.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-hw_ubsec.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-hw_ubsec.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-hw_ubsec.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-hw_ubsec.o: ../../include/openssl/dso.h ../../include/openssl/e_os.h
+hw_ubsec.o: ../../e_os.h ../../include/openssl/asn1.h
+hw_ubsec.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+hw_ubsec.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+hw_ubsec.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+hw_ubsec.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+hw_ubsec.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
 hw_ubsec.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
 hw_ubsec.o: ../../include/openssl/err.h ../../include/openssl/evp.h
 hw_ubsec.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h