From 8cef1212f3a8271e1d9f2b4b02720751084a1785 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Sun, 17 Jan 2016 16:53:53 -0500 Subject: Consolidate "make update" Rename 'update' to 'generate'. Rather than recurse, just explicitly call the three generate targets directly. Reviewed-by: Richard Levitte --- Makefile.in | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'Makefile.in') 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'"':"; \ -- cgit v1.2.3