Fix usage message on gendsa:

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index e7b57b45278187747fe591d225e3bec1c575919d..5f9c86c73a944b67cdd705e79d9f140e9acccf8c 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -1,6 +1,6 @@
 #
 # Makefile for all the SSL related library routines and utilities
-VERSION = 0.9.1c
+VERSION = 0.9.2
 PLATFORM=FreeBSD
 #
 # make install will install:
@@ -156,8 +156,8 @@ SDIRS=  \
        md2 md5 sha mdc2 hmac ripemd \
        des rc2 rc4 rc5 idea bf cast \
        bn rsa dsa dh \
-       buffer bio stack lhash rand pem err objects \
-       evp asn1 x509 conf txt_db pkcs7 comp
+       buffer bio stack lhash rand err objects \
+       evp asn1 pem x509 x509v3 conf txt_db pkcs7 comp
 
 # If you change the INSTALLTOP, make sure to also change the values
 # in crypto/location.h
@@ -184,7 +184,7 @@ WTARFILE=       $(NAME)-win.tar
 EXHEADER=       e_os.h
 HEADER=         e_os.h
 
-all:
+all: Makefile.ssl
        @for i in $(DIRS) ;\
        do \
        (cd $$i && echo "making $$i..." && \
@@ -198,6 +198,11 @@ sub_all:
        $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' 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}' AR='${AR}' all ) || exit 1; \
        done;
 
+Makefile.ssl: Makefile.org
+       @echo "Makefile.ssl is older than Makefile.org. Rerun Configuration"
+       @echo "and do a make links and a make errors."
+       @false
+
 libclean:
        /bin/rm *.a */lib */*/lib
 
@@ -237,7 +242,7 @@ links:
        (cd $$i && echo "making links in $$i..." && \
        $(MAKE) SDIRS='${SDIRS}' links ) || exit 1; \
        done;
-       @(SSLEAY="`pwd`/apps/ssleay"; export SSLEAY; sh tools/c_rehash certs)
+       @(OPENSSL="`pwd`/apps/openssl"; export OPENSSL; sh tools/c_rehash certs)
 
 dclean:
        /bin/rm -f *.bak
@@ -248,14 +253,14 @@ dclean:
        done;
 
 rehash:
-       @(PATH="`pwd`/apps:${PATH}"; sh tools/c_rehash certs)
+       @(OPENSSL="`pwd`/apps/openssl"; export OPENSSL; sh tools/c_rehash certs)
 
 test:   tests
 
 tests:
        (cd test && echo "testing $$i..." && \
        $(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/ssleay version -a
+       @apps/openssl version -a
 
 depend:
        @for i in $(DIRS) ;\