X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=Makefile.org;h=5f9c86c73a944b67cdd705e79d9f140e9acccf8c;hp=c415184700ed5ef4fbc8649625559ad6bd6a2f44;hb=f2f351ce9c9e8db53b0bb7bfd49bb71ad8e612d6;hpb=724e095e76be5c690f0a6b44ebef8098200ca54a

diff --git a/Makefile.org b/Makefile.org
index c415184700..5f9c86c73a 100644
--- 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
 
@@ -248,7 +253,7 @@ 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