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.

2 files changed, 54 insertions, 54 deletions

diff --git a/crypto/rsa/Makefile.ssl b/crypto/rsa/Makefile.ssl
index a2c7bdcde9..7012ab256d 100644
--- a/crypto/rsa/Makefile.ssl
+++ b/crypto/rsa/Makefile.ssl
@@ -5,7 +5,7 @@
 DIR=	rsa
 TOP=	../..
 CC=	cc
-INCLUDES= -I.. -I../../include
+INCLUDES= -I.. -I$(TOP) -I../../include
 CFLAG=-g
 INSTALL_PREFIX=
 OPENSSLDIR=     /usr/local/ssl
@@ -84,29 +84,29 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-rsa_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
-rsa_asn1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-rsa_asn1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-rsa_asn1.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+rsa_asn1.o: ../../e_os.h ../../include/openssl/asn1.h
+rsa_asn1.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+rsa_asn1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+rsa_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 rsa_asn1.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
 rsa_asn1.o: ../../include/openssl/opensslconf.h
 rsa_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
 rsa_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 rsa_asn1.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_asn1.c
-rsa_chk.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-rsa_chk.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-rsa_chk.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+rsa_chk.o: ../../e_os.h ../../include/openssl/asn1.h
+rsa_chk.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+rsa_chk.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 rsa_chk.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
 rsa_chk.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 rsa_chk.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 rsa_chk.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rsa_chk.o: rsa_chk.c
-rsa_eay.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-rsa_eay.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-rsa_eay.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-rsa_eay.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-rsa_eay.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-rsa_eay.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+rsa_eay.o: ../../e_os.h ../../include/openssl/asn1.h
+rsa_eay.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+rsa_eay.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+rsa_eay.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+rsa_eay.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+rsa_eay.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
 rsa_eay.o: ../../include/openssl/engine.h ../../include/openssl/err.h
 rsa_eay.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
 rsa_eay.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
@@ -120,28 +120,28 @@ rsa_eay.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 rsa_eay.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 rsa_eay.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 rsa_eay.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_eay.c
-rsa_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-rsa_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-rsa_err.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+rsa_err.o: ../../e_os.h ../../include/openssl/asn1.h
+rsa_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+rsa_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 rsa_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
 rsa_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 rsa_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 rsa_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rsa_err.o: rsa_err.c
-rsa_gen.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-rsa_gen.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-rsa_gen.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
+rsa_gen.o: ../../e_os.h ../../include/openssl/asn1.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_os2.h ../../include/openssl/err.h
 rsa_gen.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 rsa_gen.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
 rsa_gen.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 rsa_gen.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_gen.c
-rsa_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-rsa_lib.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-rsa_lib.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
-rsa_lib.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-rsa_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-rsa_lib.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+rsa_lib.o: ../../e_os.h ../../include/openssl/asn1.h
+rsa_lib.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+rsa_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+rsa_lib.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+rsa_lib.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+rsa_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
 rsa_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h
 rsa_lib.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
 rsa_lib.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
@@ -155,48 +155,48 @@ rsa_lib.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 rsa_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 rsa_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 rsa_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_lib.c
-rsa_none.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-rsa_none.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-rsa_none.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
+rsa_none.o: ../../e_os.h ../../include/openssl/asn1.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_os2.h ../../include/openssl/err.h
 rsa_none.o: ../../include/openssl/lhash.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/safestack.h
 rsa_none.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rsa_none.o: ../cryptlib.h rsa_none.c
-rsa_null.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-rsa_null.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-rsa_null.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
+rsa_null.o: ../../e_os.h ../../include/openssl/asn1.h
+rsa_null.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+rsa_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 rsa_null.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 rsa_null.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 rsa_null.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
 rsa_null.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 rsa_null.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rsa_null.o: ../cryptlib.h rsa_null.c
-rsa_oaep.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-rsa_oaep.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-rsa_oaep.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
+rsa_oaep.o: ../../e_os.h ../../include/openssl/asn1.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_os2.h ../../include/openssl/err.h
 rsa_oaep.o: ../../include/openssl/lhash.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/safestack.h
 rsa_oaep.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 rsa_oaep.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_oaep.c
-rsa_pk1.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-rsa_pk1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-rsa_pk1.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
+rsa_pk1.o: ../../e_os.h ../../include/openssl/asn1.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_os2.h ../../include/openssl/err.h
 rsa_pk1.o: ../../include/openssl/lhash.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/safestack.h
 rsa_pk1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rsa_pk1.o: ../cryptlib.h rsa_pk1.c
-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_os.h ../../include/openssl/e_os2.h
+rsa_saos.o: ../../e_os.h ../../include/openssl/asn1.h
+rsa_saos.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+rsa_saos.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+rsa_saos.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+rsa_saos.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+rsa_saos.o: ../../include/openssl/dsa.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/lhash.h
 rsa_saos.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
@@ -211,12 +211,12 @@ 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/symhacks.h ../../include/openssl/x509.h
 rsa_saos.o: ../../include/openssl/x509_vfy.h ../cryptlib.h rsa_saos.c
-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_os.h ../../include/openssl/e_os2.h
+rsa_sign.o: ../../e_os.h ../../include/openssl/asn1.h
+rsa_sign.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+rsa_sign.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+rsa_sign.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+rsa_sign.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+rsa_sign.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
 rsa_sign.o: ../../include/openssl/engine.h ../../include/openssl/err.h
 rsa_sign.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
 rsa_sign.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
@@ -232,9 +232,9 @@ rsa_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 rsa_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rsa_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 rsa_sign.o: ../cryptlib.h rsa_sign.c
-rsa_ssl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-rsa_ssl.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-rsa_ssl.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
+rsa_ssl.o: ../../e_os.h ../../include/openssl/asn1.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_os2.h ../../include/openssl/err.h
 rsa_ssl.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 rsa_ssl.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
diff --git a/crypto/rsa/rsa_test.c b/crypto/rsa/rsa_test.c
index d91e045abf..e882b5b416 100644
--- a/crypto/rsa/rsa_test.c
+++ b/crypto/rsa/rsa_test.c
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "openssl/e_os.h"
+#include "e_os.h"
 
 #include <openssl/crypto.h>
 #include <openssl/err.h>