From ecd44a3c1e860ea204194e3010e3d40cc75f626b Mon Sep 17 00:00:00 2001 From: Ben Laurie Date: Sun, 14 Feb 2016 18:41:52 +0000 Subject: [PATCH] Address comments. Reviewed-by: Richard Levitte --- 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 74fec4c003..4ce797324f 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 a663589d8d..726784f2a8 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 build_apps build_engines build_libs 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" || :; \ -- GitLab