Commit 7e701817 authored by Bodo Möller's avatar Bodo Möller
Browse files

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.
parent d76c85a3

Makefile.org

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ BASENAME= openssl 
NAME=           $(BASENAME)-$(VERSION)

TARFILE=        $(NAME).tar

WTARFILE=       $(NAME)-win.tar

EXHEADER=       e_os2.h

EXHEADER=       e_os.h e_os2.h

HEADER=         e_os.h



all: Makefile.ssl

apps/Makefile.ssl

+427 −412

File changed.

Preview size limit exceeded, changes collapsed.

apps/apps.h

+1 −5
Original line number Diff line number Diff line
@@ -59,11 +59,7 @@ 
#ifndef HEADER_APPS_H

#define HEADER_APPS_H



#ifndef FLAT_INC

# include "../e_os.h"

#else

# include "e_os.h"

#endif

#include "openssl/e_os.h"



#include <openssl/buffer.h>

#include <openssl/bio.h>

apps/eay.c

+1 −5
Original line number Diff line number Diff line
@@ -63,11 +63,7 @@ 
#define MONOLITH

#define USE_SOCKETS



#ifndef FLAT_INC

# include "../e_os.h"

#else

# include "e_os.h"

#endif

#include "openssl/e_os.h"



#include <openssl/bio.h>

#include <openssl/stack.h>

crypto/Makefile.ssl

+25 −25
Original line number Diff line number Diff line
@@ -145,28 +145,28 @@ dclean: 


cpt_err.o: ../include/openssl/crypto.h ../include/openssl/err.h

cpt_err.o: ../include/openssl/opensslv.h ../include/openssl/stack.h

cryptlib.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h

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

cryptlib.o: ../include/openssl/err.h ../include/openssl/opensslconf.h

cryptlib.o: ../include/openssl/opensslv.h ../include/openssl/stack.h cryptlib.h

cryptlib.o: date.h

cversion.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h

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

cversion.o: ../include/openssl/err.h ../include/openssl/opensslconf.h

cversion.o: ../include/openssl/opensslv.h ../include/openssl/stack.h cryptlib.h

cversion.o: date.h

ex_data.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h

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

ex_data.o: ../include/openssl/err.h ../include/openssl/lhash.h

ex_data.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h

ex_data.o: ../include/openssl/stack.h cryptlib.h

mem.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h

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

mem.o: ../include/openssl/err.h ../include/openssl/lhash.h

mem.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h

mem.o: ../include/openssl/stack.h cryptlib.h

tmdiff.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h

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

tmdiff.o: ../include/openssl/err.h ../include/openssl/opensslconf.h

tmdiff.o: ../include/openssl/opensslv.h ../include/openssl/stack.h

tmdiff.o: ../include/openssl/tmdiff.h cryptlib.h
 
cryptlib.o: ../include/openssl/bio.h ../include/openssl/buffer.h

cryptlib.o: ../include/openssl/crypto.h ../include/openssl/e_os.h

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

cryptlib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h

cryptlib.o: ../include/openssl/stack.h cryptlib.h date.h

cversion.o: ../include/openssl/bio.h ../include/openssl/buffer.h

cversion.o: ../include/openssl/crypto.h ../include/openssl/e_os.h

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

cversion.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h

cversion.o: ../include/openssl/stack.h cryptlib.h date.h

ex_data.o: ../include/openssl/bio.h ../include/openssl/buffer.h

ex_data.o: ../include/openssl/crypto.h ../include/openssl/e_os.h

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

ex_data.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h

ex_data.o: ../include/openssl/opensslv.h ../include/openssl/stack.h cryptlib.h

mem.o: ../include/openssl/bio.h ../include/openssl/buffer.h

mem.o: ../include/openssl/crypto.h ../include/openssl/e_os.h

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

mem.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h

mem.o: ../include/openssl/opensslv.h ../include/openssl/stack.h cryptlib.h

tmdiff.o: ../include/openssl/bio.h ../include/openssl/buffer.h

tmdiff.o: ../include/openssl/crypto.h ../include/openssl/e_os.h

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

tmdiff.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h

tmdiff.o: ../include/openssl/stack.h ../include/openssl/tmdiff.h cryptlib.h