diff options
author | Richard Levitte <levitte@openssl.org> | 2016-02-13 18:15:51 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-02-13 18:32:01 +0100 |
commit | 68a5f1a278e34ae2c59e3c4492e174155fb88b6b (patch) | |
tree | 4f4bb257772d4c2e40b0269fdcd69715290cc7e7 /Configurations | |
parent | dde10ab4d25fd5f6d1b4342d66459f981495f17b (diff) |
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 <rsalz@openssl.org>
Diffstat (limited to 'Configurations')
-rw-r--r-- | Configurations/descrip.mms.tmpl | 9 | ||||
-rw-r--r-- | Configurations/unix-Makefile.tmpl | 10 |
2 files changed, 15 insertions, 4 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 1c5f58af25..d449a42895 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 84b3630c53..fe524e187b 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -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) \ |