Commit 17e3dd1c authored by Bodo Möller's avatar Bodo Möller
Browse files

Don't install e_os.h in include/openssl, use it only as a local 

include file.
parent 9dff4cc0

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_os.h e_os2.h

EXHEADER=       e_os2.h

HEADER=         e_os.h



all: Makefile.ssl

apps/Makefile.ssl

+412 −427

File changed.

Preview size limit exceeded, changes collapsed.

apps/apps.h

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

#define HEADER_APPS_H



#include <openssl/e_os.h>

#ifndef FLAT_INC

# include "../e_os.h"

#else

# include "e_os.h"

#endif



#include <openssl/buffer.h>

#include <openssl/bio.h>

apps/eay.c

+6 −1
Original line number Diff line number Diff line
@@ -62,7 +62,12 @@ 


#define MONOLITH

#define USE_SOCKETS

#include <openssl/e_os.h>



#ifndef FLAT_INC

# include "../e_os.h"

#else

# include "e_os.h"

#endif



#include <openssl/bio.h>

#include <openssl/stack.h>

crypto/Makefile.ssl

+26 −25
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ links: 
	@$(PERL) $(TOP)/util/mklink.pl ../test $(TEST)

	@$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS)

	@$(TOP)/util/point.sh Makefile.ssl Makefile

	@$(TOP)/util/point.sh ../e_os.h e_os.h

	@for i in $(SDIRS); do \

	(cd $$i; echo "making links in crypto/$$i..."; \

	$(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PERL='${PERL}' links ); \
@@ -145,28 +146,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: ../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
 
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