aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2016-01-17 16:53:53 -0500
committerRich Salz <rsalz@openssl.org>2016-01-20 09:09:14 -0500
commit8cef1212f3a8271e1d9f2b4b02720751084a1785 (patch)
treef69daa185d375affebadeddafbf4b3e880056d1c /Makefile.in
parent7bb196a71adef8440b6152b6174651a9c25588f1 (diff)
downloadopenssl-8cef1212f3a8271e1d9f2b4b02720751084a1785.tar.gz
Consolidate "make update"
Rename 'update' to 'generate'. Rather than recurse, just explicitly call the three generate targets directly. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in22
1 files changed, 13 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in
index 69e2706e8e..6c74a704a3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -435,8 +435,6 @@ rehash.time: certs build_apps
test: tests
-test_ordinals:
- TOP=$(TOP) PERL=$(PERL) $(PERL) test/run_tests.pl test_ordinals
tests: rehash
@(cd test && echo "testing..." && \
@@ -452,12 +450,6 @@ list-tests:
report:
@$(PERL) util/selftest.pl
-update: errors util/libeay.num util/ssleay.num TABLE test_ordinals
- @set -e; target=update; $(RECURSIVE_BUILD_CMD)
-
-depend:
- @set -e; target=depend; $(RECURSIVE_BUILD_CMD)
-
tags TAGS: FORCE
rm -f TAGS tags
-ctags -R .
@@ -465,17 +457,29 @@ tags TAGS: FORCE
FORCE:
+depend:
+ @set -e; target=depend; $(RECURSIVE_BUILD_CMD)
+
+update: generate errors ordinals depend
+
+generate:
+ (cd apps && $(MAKE) generate)
+ (cd crypto/bn && $(MAKE) generate)
+ (cd crypto/objects && $(MAKE) generate)
+
errors:
$(PERL) util/ck_errf.pl -strict */*.c */*/*.c
$(PERL) util/mkerr.pl -recurse -write
(cd engines; $(MAKE) PERL=$(PERL) errors)
(cd crypto/ct; $(MAKE) PERL=$(PERL) errors)
+ordinals: util/libeay.num util/ssleay.num test_ordinals TABLE
util/libeay.num::
$(PERL) util/mkdef.pl crypto update
-
util/ssleay.num::
$(PERL) util/mkdef.pl ssl update
+test_ordinals:
+ TOP=$(TOP) PERL=$(PERL) $(PERL) test/run_tests.pl test_ordinals
TABLE: Configure Configurations/*.conf
(echo 'Output of `Configure TABLE'"':"; \