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

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 6392105ae5e0e8a226a5e1551dddcdced345eb3a..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.
 #
@@ -151,7 +149,7 @@ 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
 
@@ -219,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..." && \
@@ -264,7 +262,7 @@ dclean:
 
 rehash: rehash.time
 rehash.time: certs
-       @(OPENSSL="`pwd`/apps/openssl"; export OPENSSL; sh tools/c_rehash certs)
+       @(OPENSSL="`pwd`/apps/openssl"; export OPENSSL; $(PERL) tools/c_rehash certs)
        touch rehash.time
 
 test:   tests
@@ -301,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
 
@@ -314,7 +315,7 @@ 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) $(TARFLAGS) -cvf - \
@@ -368,21 +369,28 @@ install_docs:
                $(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`; \
+               (cd `dirname $$i`; \
                $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
-                        --release=$(VERSION) `basename $$i` \
-                       >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec); \
+                        --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`; \
+               (cd `dirname $$i`; \
                $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
-                       --release=$(VERSION) `basename $$i` \
-                       >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec); \
+                       --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.