The branch master has been updated
via 68a5f1a278e34ae2c59e3c4492e174155fb88b6b (commit)
via dde10ab4d25fd5f6d1b4342d66459f981495f17b (commit)
from b3214008e42eba8e8d05b52f22b50570927962c7 (commit)
- Log -----------------------------------------------------------------
commit 68a5f1a278e34ae2c59e3c4492e174155fb88b6b
Author: Richard Levitte <[email protected]>
Date: Sat Feb 13 18:15:51 2016 +0100
Don't build test programs by default, add convenience targets for unified
build
Test programs are now only built when running "make test" or "make
build_tests".
Reviewed-by: Rich Salz <[email protected]>
commit dde10ab4d25fd5f6d1b4342d66459f981495f17b
Author: Richard Levitte <[email protected]>
Date: Sat Feb 13 17:55:48 2016 +0100
Have the same installation directories in unified as in unixmake
unix-Makefile.tmpl was lagging behind on this point.
Reviewed-by: Rich Salz <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Configurations/descrip.mms.tmpl | 9 +++++++--
Configurations/unix-Makefile.tmpl | 20 +++++++++++++++-----
Makefile.in | 7 ++++---
3 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 1c5f58a..d449a42 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -200,9 +200,14 @@ NODEBUG=@
# The main targets ###################################################
-all : descrip.mms, $(LIBS), $(ENGINES), $(PROGRAMS), $(SCRIPTS), $(TESTPROGS)
+all : descrip.mms, build_libs, build_engines, build_apps
-test tests : $(TESTPROGS), rehash
+build_libs : $(LIBS)
+build_engines : $(ENGINES)
+build_apps : $(PROGRAMS), $(SCRIPTS)
+build_tests : $(TESTPROGS)
+
+test tests : build_tests, rehash
SET DEFAULT [.test]{- move("test") -}
DEFINE SRCTOP {- sourcedir() -}
DEFINE BLDTOP {- builddir() -}
diff --git a/Configurations/unix-Makefile.tmpl
b/Configurations/unix-Makefile.tmpl
index 4049846..fe524e1 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -82,8 +82,8 @@ LIBDIR={- #
ENGINESDIR={- use File::Spec::Functions;
catdir($prefix,$libdir,"engines") -}
-MANDIR=$(OPENSSLDIR)/man
-HTMLDIR=$(OPENSSLDIR)/html
+MANDIR=$(INSTALLTOP)/share/man
+HTMLDIR=$(INSTALLTOP)/share/doc/$(BASENAME)/html
MANSUFFIX=ssl
HTMLSUFFIX=html
@@ -143,9 +143,15 @@ PROCESSOR= {- $config{processor} -}
# The main targets ###################################################
-all: Makefile libcrypto.pc libssl.pc openssl.pc $(ENGINES) $(PROGRAMS)
$(SCRIPTS) $(TESTPROGS) link-utils
+all: build_libs build_engines build_apps link-utils
-test tests: $(TESTPROGS) rehash
+# The pkg-config files depend on the libraries as well as Makefile
+build_libs: libcrypto.pc libssl.pc openssl.pc
+build_engines: $(ENGINES)
+build_apps: $(PROGRAMS) $(SCRIPTS)
+build_tests: $(TESTPROGS)
+
+test tests: build_tests rehash
( cd test; \
SRCTOP=../$(SRCDIR) \
BLDTOP=../$(BLDDIR) \
@@ -157,7 +163,7 @@ list-tests:
libclean:
-rm -f `find $(BLDDIR) -name '*$(LIB_EXT)' -o -name '*$(SHLIB_EXT)'`
-install: install_sw install_docs
+install: install_sw install_ssldirs install_docs
uninstall: uninstall_docs uninstall_sw
@@ -196,6 +202,10 @@ install_docs: install_man_docs install_html_docs
uninstall_docs: uninstall_man_docs uninstall_html_docs
+install_ssldirs:
+ @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/certs
+ @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/private
+
install_dev:
@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
@echo "*** Installing development files"
diff --git a/Makefile.in b/Makefile.in
index ad51e76..cc2c0b5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -224,7 +224,7 @@ INSTALLDIRS= \
$(DESTDIR)$(OPENSSLDIR)/certs \
$(DESTDIR)$(OPENSSLDIR)/private
-all: Makefile build_all
+all: Makefile build_all_but_tests
# as we stick to -e, CLEARENV ensures that local variables in lower
# Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn
@@ -311,7 +311,8 @@ reflect:
sub_all: build_all
-build_all: build_libs build_apps build_tests build_tools
+build_all_but_tests: build_libs build_apps build_tools
+build_all: build_all_but_tests build_tests
build_libs: build_libcrypto build_libssl openssl.pc
@@ -477,7 +478,7 @@ rehash.time: certs build_apps build_tools
test: files tests
-tests: rehash
+tests: build_tests rehash
@(cd test && echo "testing..." && \
$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)'
OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests );
@if [ -z "$(CROSS_COMPILE)" ]; then \
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
