[openssl-commits] [openssl] master update
Ben Laurie
ben at openssl.org
Mon Feb 15 12:16:17 UTC 2016
The branch master has been updated
via ecd44a3c1e860ea204194e3010e3d40cc75f626b (commit)
via 18c7e6dda8937337d73f4e76b5a0e07aeb71568d (commit)
from d9d8e7a9c150dea538ceffe4cac6140e46389986 (commit)
- Log -----------------------------------------------------------------
commit ecd44a3c1e860ea204194e3010e3d40cc75f626b
Author: Ben Laurie <ben at links.org>
Date: Sun Feb 14 18:41:52 2016 +0000
Address comments.
Reviewed-by: Richard Levitte <levitte at openssl.org>
commit 18c7e6dda8937337d73f4e76b5a0e07aeb71568d
Author: Ben Laurie <ben at links.org>
Date: Sun Feb 14 05:32:19 2016 +0000
Tests depend on everything.
Reviewed-by: Richard Levitte <levitte at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Configurations/descrip.mms.tmpl | 4 ++--
Configurations/unix-Makefile.tmpl | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 74fec4c..4ce7973 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -207,7 +207,7 @@ build_engines : $(ENGINES)
build_apps : $(PROGRAMS), $(SCRIPTS)
build_tests : $(TESTPROGS)
-test tests : build_tests, rehash
+test tests : build_apps, build_engines, build_tests, rehash
SET DEFAULT [.test]{- move("test") -}
DEFINE SRCTOP {- sourcedir() -}
DEFINE BLDTOP {- builddir() -}
@@ -293,7 +293,7 @@ install_dev : check_INSTALLTOP
@ {- output_off() if $config{no_shared}; "" -} !
{- join("\n ",
map { "COPY/PROT=W:RE $_.EXE ossl_installroot:['arch'.LIB]" }
- map { $unified_info{sharednames}->{$_} || () }
+ map { $unified_info{sharednames}->{$_} || () }
@{$unified_info{libraries}}) -}
@ {- output_on() if $config{no_shared}; "" -} !
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index f816b54..726784f 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -151,7 +151,7 @@ build_engines: $(ENGINES)
build_apps: $(PROGRAMS) $(SCRIPTS)
build_tests: $(TESTPROGS)
-test tests: build_tests rehash
+test tests: build_tests build_apps build_engines rehash
( cd test; \
SRCTOP=../$(SRCDIR) \
BLDTOP=../$(BLDDIR) \
@@ -575,7 +575,7 @@ dist:
# Helper targets #####################################################
-rehash: link-utils copy-certs
+rehash: link-utils copy-certs build_apps
@if [ -z "$(CROSS_COMPILE)" ]; then \
(OPENSSL="$(BLDDIR)/util/shlib_wrap.sh apps/openssl"; \
[ -x "$(BLDDIR)/openssl.exe" ] && OPENSSL="$(BLDDIR)/openssl.exe" || :; \
More information about the openssl-commits
mailing list