Move MAC computations for Finished from ssl3_read_bytes into

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index ec50e75c3a7385acf17229a90c3f6401160df0b1..55213dd1256480851549fcce63e983fc3257a53d 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -156,6 +156,7 @@ SDIRS=  \
 MAKEFILE= Makefile.ssl
 MAKE=     make -f Makefile.ssl
 
+MANDIR=$(OPENSSLDIR)/man
 MAN1=1
 MAN3=3
 SHELL=/bin/sh
@@ -179,8 +180,9 @@ all: Makefile.ssl
        do \
        (cd $$i && echo "making all in $$i..." && \
        $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
-       done;
-       cd perl; $(PERL) Makefile.PL; make
+       done
+       -@# cd crypto; $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' testapps
+       -@# cd perl; $(PERL) Makefile.PL; make
 
 sub_all:
        @for i in $(DIRS) ;\
@@ -215,7 +217,7 @@ libclean:
        rm -f *.a */lib */*/lib
 
 clean:
-       rm -f shlib/*.o *.o core a.out fluff *.map
+       rm -f shlib/*.o *.o core a.out fluff *.map rehash.time
        @for i in $(DIRS) ;\
        do \
        (cd $$i && echo "making clean in $$i..." && \
@@ -258,8 +260,10 @@ dclean:
        $(MAKE) SDIRS='${SDIRS}' PERL='${PERL}' dclean ) || exit 1; \
        done;
 
-rehash:
+rehash: rehash.time
+rehash.time: certs
        @(OPENSSL="`pwd`/apps/openssl"; export OPENSSL; sh tools/c_rehash certs)
+       touch rehash.time
 
 test:   tests
 
@@ -298,11 +302,14 @@ util/libeay.num::
 util/ssleay.num::
        perl util/mkdef.pl ssl update
 
+crypto/objects/obj_dat.h: crypto/objects/objects.h crypto/objects/obj_dat.pl
+       perl crypto/objects/obj_dat.pl crypto/objects/objects.h crypto/objects/obj_dat.h
+
 TABLE: Configure
        (echo 'Output of `Configure TABLE'"':"; \
        perl Configure TABLE) > TABLE
 
-update: depend errors util/libeay.num util/ssleay.num TABLE
+update: depend errors util/libeay.num util/ssleay.num crypto/objects/obj_dat.h TABLE
 
 tar:
        @tar --norecurse -cvf - \
@@ -322,7 +329,7 @@ dist:
 dist_pem_h:
        (cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
 
-install: all
+install: all install_docs
        @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
                $(INSTALL_PREFIX)$(INSTALLTOP)/lib \
                $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
@@ -338,7 +345,7 @@ install: all
        @for i in $(DIRS) ;\
        do \
        (cd $$i; echo "installing $$i..."; \
-       $(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}' EX_LIBS='${EX_LIBS}' SDIRS='${SDIRS}' install ); \
+       $(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}' EX_LIBS='${EX_LIBS}' SDIRS='${SDIRS}' RANLIB='${RANLIB}' install ); \
        done
        @for i in $(LIBS) ;\
        do \
@@ -348,4 +355,29 @@ install: all
                chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
        done
 
+install_docs:
+       @$(PERL) $(TOP)/util/mkdir-p.pl \
+               $(INSTALL_PREFIX)$(MANDIR)/man1 \
+               $(INSTALL_PREFIX)$(MANDIR)/man3 \
+               $(INSTALL_PREFIX)$(MANDIR)/man5 \
+               $(INSTALL_PREFIX)$(MANDIR)/man7
+       @echo installing man 1 and man 5
+       @for i in doc/apps/*.pod; do \
+               (cd `dirname $$i`; \
+               fn=`basename $$i .pod`; \
+               sec=`[ "$$fn" = "config" ] && echo 5 || echo 1`; \
+               $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
+                        --release=$(VERSION) `basename $$i` \
+                       >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec); \
+       done
+       @echo installing man 3 and man 7
+       @for i in doc/crypto/*.pod doc/ssl/*.pod; do \
+               (cd `dirname $$i`; \
+               fn=`basename $$i .pod`; \
+               sec=`[ "$$fn" = "des_modes" ] && echo 7 || echo 3`; \
+               $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
+                       --release=$(VERSION) `basename $$i` \
+                       >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec); \
+       done
+
 # DO NOT DELETE THIS LINE -- make depend depends on it.