Fix code structure (if ... else if ... where both parts

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 257f6a5b6605306209a12ab33fedfeeecadb97bb..c1af781b6e4490567d4df442c10a7def732b9c8f 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -28,8 +28,6 @@ OPENSSLDIR=/usr/local/ssl
 # DEVRANDOM - Give this the value of the 'random device' if your OS supports
 #           one.  32 bytes will be read from this when the random
 #           number generator is initalised.
-# SSL_ALLOW_ADH - define if you want the server to be able to use the
-#           SSLv3 anon-DH ciphers.
 # SSL_FORBID_ENULL - define if you want the server to be not able to use the
 #           NULL encryption ciphers.
 #
@@ -56,6 +54,8 @@ EX_LIBS=
 AR=ar r
 RANLIB= ranlib
 PERL= perl
+TAR= tar
+TARFLAGS= --norecurse
 
 # Set BN_ASM to bn_asm.o if you want to use the C version
 BN_ASM= bn_asm.o
@@ -149,13 +149,14 @@ SHLIBDIRS= crypto ssl
 SDIRS=  \
        md2 md5 sha mdc2 hmac ripemd \
        des rc2 rc4 rc5 idea bf cast \
-       bn rsa dsa dh \
+       bn rsa dsa dh dso \
        buffer bio stack lhash rand err objects \
        evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp
 
 MAKEFILE= Makefile.ssl
 MAKE=     make -f Makefile.ssl
 
+MANDIR=$(OPENSSLDIR)/man
 MAN1=1
 MAN3=3
 SHELL=/bin/sh
@@ -216,7 +217,7 @@ libclean:
        rm -f *.a */lib */*/lib
 
 clean:
-       rm -f shlib/*.o *.o core a.out fluff *.map rehash.time
+       rm -f shlib/*.o *.o core a.out fluff *.map rehash.time testlog make.log cctest cctest.c
        @for i in $(DIRS) ;\
        do \
        (cd $$i && echo "making clean in $$i..." && \
@@ -261,8 +262,8 @@ dclean:
 
 rehash: rehash.time
 rehash.time: certs
-       @(OPENSSL="`pwd`/apps/openssl"; export OPENSSL; sh tools/c_rehash certs)
-       touch .rehash.time
+       @(OPENSSL="`pwd`/apps/openssl"; export OPENSSL; $(PERL) tools/c_rehash certs)
+       touch rehash.time
 
 test:   tests
 
@@ -271,6 +272,9 @@ tests: rehash
        $(MAKE) CC='${CC}' 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}' SDIRS='${SDIRS}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' tests );
        @apps/openssl version -a
 
+report:
+       @$(PERL) util/selftest.pl
+
 depend:
        @for i in $(DIRS) ;\
        do \
@@ -295,6 +299,9 @@ tags:
 errors:
        perl util/mkerr.pl -recurse -write
 
+stacks:
+       perl util/mkstack.pl -write
+
 util/libeay.num::
        perl util/mkdef.pl crypto update
 
@@ -308,10 +315,10 @@ TABLE: Configure
        (echo 'Output of `Configure TABLE'"':"; \
        perl Configure TABLE) > TABLE
 
-update: depend errors util/libeay.num util/ssleay.num crypto/objects/obj_dat.h TABLE
+update: depend errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h TABLE
 
 tar:
-       @tar --norecurse -cvf - \
+       @$(TAR) $(TARFLAGS) -cvf - \
                `find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort` |\
        tardy --user_number=0  --user_name=openssl \
              --group_number=0 --group_name=openssl \
@@ -356,13 +363,34 @@ install: all install_docs
 
 install_docs:
        @$(PERL) $(TOP)/util/mkdir-p.pl \
-               $(INSTALL_PREFIX)$(OPENSSLDIR)/man/man1 \
-               $(INSTALL_PREFIX)$(OPENSSLDIR)/man/man3 \
-               $(INSTALL_PREFIX)$(OPENSSLDIR)/man/man5 \
-               $(INSTALL_PREFIX)$(OPENSSLDIR)/man/man7
+               $(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`; ../../util/pod2man.pl --section=$$sec --center=OpenSSL --release=$(VERSION) `basename $$i` >  $(INSTALL_PREFIX)$(INSTALLTOP)/man/man$$sec/`basename $$i .pod`.$$sec); done
+       @for i in doc/apps/*.pod; do \
+               fn=`basename $$i .pod`; \
+               sec=`[ "$$fn" = "config" ] && echo 5 || echo 1`; \
+               (cd `dirname $$i`; \
+               $(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`; ../../util/pod2man.pl --section=$$sec --center=OpenSSL --release=$(VERSION) `basename $$i` >  $(INSTALL_PREFIX)$(INSTALLTOP)/man/man$$sec/`basename $$i .pod`.$$sec); done
+       @for i in doc/crypto/*.pod doc/ssl/*.pod; do \
+               fn=`basename $$i .pod`; \
+               sec=`[ "$$fn" = "des_modes" ] && echo 7 || echo 3`; \
+               (cd `dirname $$i`; \
+               $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
+                       --release=$(VERSION) `basename $$i`) \
+                       >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \
+       done
+
+shlib: all
+       if [ ! -d shlib_dir ] ; then mkdir shlib_dir ; else rm -f shlib_dir/* ; fi
+       cd shlib_dir ; ar -x ../libcrypto.a && $(CC) -shared ./*.o -Wl,-soname -Wl,libcrypto.so.0.9 \
+            -o ./libcrypto.so.0.9.4 && rm *.o
+       cd shlib_dir ; ar -x ../libssl.a && $(CC) -shared ./*.o -Wl,-soname -Wl,libssl.so.0.9 \
+            -o ./libssl.so.0.9.4 && rm *.o
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.