Commit 41d2a336 authored by Richard Levitte's avatar Richard Levitte
Browse files

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.
parent 627774fd

Makefile.org

+9 −2
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ NAME= $(BASENAME)-$(VERSION) 
TARFILE=        $(NAME).tar

WTARFILE=       $(NAME)-win.tar

EXHEADER=       e_os2.h

LNHEADER=       e_os.h

HEADER=         e_os.h



# When we're prepared to use shared libraries in the programs we link here
@@ -375,7 +374,7 @@ files: 
links:

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

	@$(PERL) $(TOP)/util/mkdir-p.pl include/openssl

	@$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER) $(LNHEADER)

	@$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)

	@for i in $(DIRS); do \

	if [ -d "$$i" ]; then \

		(cd $$i && echo "making links in $$i..." && \
@@ -467,6 +466,14 @@ tar: 
	gzip --best >../$(TARFILE).gz; \

	ls -l ../$(TARFILE).gz



tar-snap:

	@$(TAR) $(TARFLAGS) -cvf - \

		`find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \! -name '*test' \! -name '.#*' | sort` |\

	tardy --user_number=0  --user_name=openssl \

	      --group_number=0 --group_name=openssl \

	      --prefix=openssl-$(VERSION) - > ../$(TARFILE);\

	ls -l ../$(TARFILE)



dist:   

	$(PERL) Configure dist

	@$(MAKE) dist_pem_h

apps/Makefile.ssl

+724 −742

File changed.

Preview size limit exceeded, changes collapsed.

apps/apps.h

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

#define HEADER_APPS_H



#include "openssl/e_os.h"

#include "e_os.h"



#include <openssl/buffer.h>

#include <openssl/bio.h>

apps/makeapps.com

+6 −3
Original line number Diff line number Diff line
@@ -838,7 +838,8 @@ $ CC = "CC" 
$     IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" -

	 THEN CC = "CC/DECC"

$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + -

           "/NOLIST/PREFIX=ALL" + CCEXTRAFLAGS

           "/NOLIST/PREFIX=ALL" + -

	   "/INCLUDE=(SYS$DISK:[-])" + CCEXTRAFLAGS

$!

$!    Define The Linker Options File Name.

$!
@@ -869,7 +870,8 @@ $ WRITE SYS$OUTPUT "There is no VAX C on Alpha!" 
$	EXIT

$     ENDIF

$     IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC"

$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST" + CCEXTRAFLAGS

$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -

	   "/INCLUDE=(SYS$DISK:[-])" + CCEXTRAFLAGS

$     CCDEFS = CCDEFS + ",""VAXC"""

$!

$!    Define <sys> As SYS$COMMON:[SYSLIB]
@@ -900,7 +902,8 @@ $! 
$!    Use GNU C...

$!

$     IF F$TYPE(GCC) .EQS. "" THEN GCC := GCC

$     CC = GCC+"/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + CCEXTRAFLAGS

$     CC = GCC+"/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -

	   "/INCLUDE=(SYS$DISK:[-])" + CCEXTRAFLAGS

$!

$!    Define The Linker Options File Name.

$!

crypto/Makefile.ssl

+39 −44
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ 
DIR=		crypto

TOP=		..

CC=		cc

INCLUDE=	-I. -I../include

INCLUDES=	-I.. -I../../include

INCLUDE=	-I. -I$(TOP) -I../include

INCLUDES=	-I.. -I../.. -I../../include

CFLAG=		-g

INSTALL_PREFIX=

OPENSSLDIR=     /usr/local/ssl
@@ -162,49 +162,44 @@ cpt_err.o: ../include/openssl/e_os2.h ../include/openssl/err.h 
cpt_err.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h

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

cpt_err.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cpt_err.c

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/lhash.h ../include/openssl/opensslconf.h

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

cryptlib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.c

cryptlib.o: cryptlib.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/lhash.h ../include/openssl/opensslconf.h

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

cversion.o: ../include/openssl/stack.h ../include/openssl/symhacks.h buildinf.h

cversion.o: cryptlib.h cversion.c

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/lhash.h

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

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

cryptlib.o: ../include/openssl/symhacks.h cryptlib.c cryptlib.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/lhash.h

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

cversion.o: ../include/openssl/safestack.h ../include/openssl/stack.h

cversion.o: ../include/openssl/symhacks.h buildinf.h cryptlib.h cversion.c

ebcdic.o: ../include/openssl/opensslconf.h ebcdic.c

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/safestack.h

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

ex_data.o: ex_data.c

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/safestack.h

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

mem.o: mem.c

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

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

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

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

mem_dbg.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h

mem_dbg.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h

mem_dbg.o: mem_dbg.c

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/lhash.h ../include/openssl/opensslconf.h

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

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

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

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/safestack.h ../include/openssl/stack.h

ex_data.o: ../include/openssl/symhacks.h cryptlib.h ex_data.c

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/safestack.h ../include/openssl/stack.h

mem.o: ../include/openssl/symhacks.h cryptlib.h mem.c

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

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

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

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

mem_dbg.o: ../include/openssl/safestack.h ../include/openssl/stack.h

mem_dbg.o: ../include/openssl/symhacks.h cryptlib.h mem_dbg.c

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/lhash.h

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

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

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

tmdiff.o: tmdiff.c

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

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

uid.o: ../include/openssl/safestack.h ../include/openssl/stack.h