X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=Makefile.org;h=fbf293c76286006e69bc788abdf7fb44efc444e8;hp=ed0fc7a552d7582034e5ecba030fb460711f40cb;hb=84107e6ca812b1325907596b6a5bfa9080a16a92;hpb=b621d7725803c3b29aa6d746d1bd351cf8f92371

diff --git a/Makefile.org b/Makefile.org
index ed0fc7a552..fbf293c762 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:
@@ -157,7 +157,7 @@ SDIRS=  \
 	des rc2 rc4 rc5 idea bf cast \
 	bn rsa dsa dh \
 	buffer bio stack lhash rand err objects \
-	evp pem asn1 x509 x509v3 conf txt_db pkcs7 comp
+	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
@@ -187,38 +187,38 @@ HEADER=         e_os.h
 all: Makefile.ssl
 	@for i in $(DIRS) ;\
 	do \
-	(cd $$i && echo "making $$i..." && \
+	(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}' all ) || exit 1; \
 	done;
 
 sub_all:
 	@for i in $(DIRS) ;\
 	do \
-	(cd $$i && echo "making $$i..." && \
+	(cd $$i && echo "making all in $$i..." && \
 	$(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 "Makefile.ssl is older than Makefile.org. Rerun Configure"
 	@echo "and do a make links and a make errors."
 	@false
 
 libclean:
-	/bin/rm *.a */lib */*/lib
+	rm -f *.a */lib */*/lib
 
 clean:
-	/bin/rm -f shlib/*.o *.o core a.out fluff *.map
+	rm -f shlib/*.o *.o core a.out fluff *.map
 	@for i in $(DIRS) ;\
 	do \
-	(cd $$i && echo "cleaning $$i..." && \
+	(cd $$i && echo "making clean in $$i..." && \
 	$(MAKE) SDIRS='${SDIRS}' clean ) || exit 1; \
-	/bin/rm -f $(LIBS); \
+	rm -f $(LIBS); \
 	done;
-	/bin/rm -f *.a *.o speed.* *.map *.so .pure core
-	/bin/rm -f $(TARFILE)
+	rm -f *.a *.o speed.* *.map *.so .pure core
+	rm -f $(TARFILE)
 	@for i in $(ONEDIRS) ;\
 	do \
-	/bin/rm -fr $$i/*; \
+	rm -fr $$i/*; \
 	done
 
 makefile.one: files
@@ -234,21 +234,19 @@ files:  MINFO
 	done;
 
 links:
-	/bin/rm -f Makefile
-	./util/point.sh Makefile.ssl Makefile
-	$(TOP)/util/mklink.sh include $(EXHEADER)
-	@for i in $(DIRS) ;\
-	do \
+	@$(TOP)/util/point.sh Makefile.ssl Makefile
+	@$(TOP)/util/mklink.sh include $(EXHEADER)
+	@for i in $(DIRS); do \
 	(cd $$i && echo "making links in $$i..." && \
 	$(MAKE) SDIRS='${SDIRS}' links ) || exit 1; \
 	done;
 	@(OPENSSL="`pwd`/apps/openssl"; export OPENSSL; sh tools/c_rehash certs)
 
 dclean:
-	/bin/rm -f *.bak
+	rm -f *.bak
 	@for i in $(DIRS) ;\
 	do \
-	(cd $$i && echo "undoing makedepend in $$i..." && \
+	(cd $$i && echo "making dclean in $$i..." && \
 	$(MAKE) SDIRS='${SDIRS}' dclean ) || exit 1; \
 	done;
 
@@ -258,7 +256,7 @@ rehash:
 test:   tests
 
 tests:
-	(cd test && echo "testing $$i..." && \
+	@(cd test && echo "testing..." && \
 	$(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