[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  31ff45aa975acb43f1da20e714eadf4649655714 (commit)
      from  9598996c93c572c173c6966082b08ce02c94841b (commit)


- Log -----------------------------------------------------------------
commit 31ff45aa975acb43f1da20e714eadf4649655714
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat May 2 14:42:21 2015 +0200

    Remove obsolete make variables
    
    ONEDIRS, EDIRS and WDIRS aren't used anywhere.  Most probably remains
    from a build system of the past, it's time they get put to rest.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Makefile.org            | 7 -------
 engines/ccgost/Makefile | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/Makefile.org b/Makefile.org
index 3a67c94..8146eed 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -166,9 +166,6 @@ HTMLDIR=$(OPENSSLDIR)/html
 SHELL=/bin/sh
 
 TOP=    .
-ONEDIRS=out tmp
-EDIRS=  times doc bugs util include certs ms demos VMS
-WDIRS=  windows
 LIBS=   libcrypto.a libssl.a
 SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
 SHARED_SSL=libssl$(SHLIB_EXT)
@@ -413,10 +410,6 @@ clean:	libclean
 	rm -f openssl.pc libssl.pc libcrypto.pc
 	rm -f speed.* .pure
 	rm -f $(TARFILE)
-	@set -e; for i in $(ONEDIRS) ;\
-	do \
-	rm -fr $$i/*; \
-	done
 
 makefile.one: files
 	$(PERL) util/mk1mf.pl >makefile.one; \
diff --git a/engines/ccgost/Makefile b/engines/ccgost/Makefile
index edd1e50..1ce1848 100644
--- a/engines/ccgost/Makefile
+++ b/engines/ccgost/Makefile
@@ -17,7 +17,7 @@ SRC=$(LIBSRC)
 LIBNAME=gost
 
 top: 
-	(cd $(TOP); $(MAKE) DIRS=engines EDIRS=$(DIR) sub_all)
+	(cd $(TOP); $(MAKE) DIRS=engines sub_all)
 
 all: lib