[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  1b741653ce9c1a893a9402c5fc36c46f4b62f4a9 (commit)
      from  d979e7f56715d33d4bee0805d0a01ef83886117d (commit)


- Log -----------------------------------------------------------------
commit 1b741653ce9c1a893a9402c5fc36c46f4b62f4a9
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Apr 18 14:09:36 2016 +0200

    Build: Make 'test' depend on 'tests'
    
    Because we have a directory 'test', the target 'test' may be confusing
    to make.  However, if we make it depend on 'tests', which doesn't
    exist, make should never fail to run the actions.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 Configurations/unix-Makefile.tmpl    | 5 +++--
 Configurations/windows-makefile.tmpl | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index ed64e65..1676b71 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -217,8 +217,9 @@ build_apps_nodep: $(PROGRAMS) $(SCRIPTS)
 build_tests: configdata.pm build_tests_nodep depend
 build_tests_nodep: $(TESTPROGS)
 
-test tests: build_tests_nodep build_apps_nodep build_engines_nodep \
-            depend link-utils
+test: tests
+tests: build_tests_nodep build_apps_nodep build_engines_nodep \
+       depend link-utils
 	@ : {- output_off() if $disabled{tests}; "" -}
 	( cd test; \
 	  SRCTOP=../$(SRCDIR) \
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 0c043a0..c3233ee 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -138,7 +138,8 @@ build_apps_nodep: $(PROGRAMS) $(SCRIPTS)
 build_tests: configdata.pm build_tests_nodep depend
 build_tests_nodep: $(TESTPROGS)
 
-test tests: build_tests_nodep build_apps_nodep build_engines_nodep depend
+test: tests
+tests: build_tests_nodep build_apps_nodep build_engines_nodep depend
 	@rem {- output_off() if $disabled{tests}; "" -}
 	set SRCTOP=$(SRCDIR)
 	set BLDTOP=$(BLDDIR)