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>

diff --git a/Makefile.in b/Makefile.in
index 69e2706e8e1c7bd709988000027fd3c322e6a6cf..6c74a704a3506d6fae176e09ad0456a7c2969f46 100644 (file)
--- 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'"':"; \

diff --git a/apps/Makefile.in b/apps/Makefile.in
index 73a665b6fcef42f056f436006ca63a88053ccb95..4832364cea4a9150119de439e5269f76d9188650 100644 (file)
--- a/apps/Makefile.in
+++ b/apps/Makefile.in
@@ -106,7 +106,7 @@ uninstall:
        done
        $(RM) $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
 
-update: openssl-vms.cnf local_depend
+generate: openssl-vms.cnf
 
 depend: local_depend
        @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi

diff --git a/crypto/bn/Makefile.in b/crypto/bn/Makefile.in
index d7133283ee36dbae1ce8a6b44306407cb3657a82..964f8ecc61f177c41c193e252680274274ae632f 100644 (file)
--- a/crypto/bn/Makefile.in
+++ b/crypto/bn/Makefile.in
@@ -150,7 +150,7 @@ div:
        rm -f a.out
        gcc -I.. -g div.c ../../libcrypto.a
 
-update: bn_prime.h depend
+generate: bn_prime.h
 
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...

diff --git a/crypto/objects/Makefile.in b/crypto/objects/Makefile.in
index 8e4b577a808d64e2d84c941db81fbec226d971da..826d5710074c8074761ce2eafea9ace0f1c27d4f 100644 (file)
--- a/crypto/objects/Makefile.in
+++ b/crypto/objects/Makefile.in
@@ -50,7 +50,7 @@ obj_xref.h: objxref.pl obj_xref.txt obj_mac.num
 files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-update: obj_dat.h ../../include/openssl/obj_mac.h obj_xref.h depend
+generate: obj_dat.h ../../include/openssl/obj_mac.h obj_xref.h
 
 depend:
        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...

diff --git a/demos/engines/cluster_labs/Makefile.in b/demos/engines/cluster_labs/Makefile.in
index e299d33d72b83351271ededcd52ee81f9c0f8358..48f696c85c778a547ad64ce6915d81d02687b9a8 100644 (file)
--- a/demos/engines/cluster_labs/Makefile.in
+++ b/demos/engines/cluster_labs/Makefile.in
@@ -24,8 +24,7 @@ all:
                @echo 'gnu:      Generic GNU-based system (gcc and GNU ld)'
                @echo ''
 
-FORCE.update:
-update:                FORCE.update
+generate:
                perl ../../../util/mkerr.pl -conf hw_cluster_labs.ec \
                        -nostatic -staticloader -write hw_cluster_labs.c
 

diff --git a/demos/engines/ibmca/Makefile.in b/demos/engines/ibmca/Makefile.in
index 652d0b19c5c554300d8614cf71df4adb1e09f6e0..d0d74dffdf05a1399600dd5ed45f3d3771e7554d 100644 (file)
--- a/demos/engines/ibmca/Makefile.in
+++ b/demos/engines/ibmca/Makefile.in
@@ -24,8 +24,7 @@ all:
                @echo 'gnu:      Generic GNU-based system (gcc and GNU ld)'
                @echo ''
 
-FORCE.update:
-update:                FORCE.update
+generate:
                perl ../../../util/mkerr.pl -conf hw_ibmca.ec \
                        -nostatic -staticloader -write hw_ibmca.c
 

diff --git a/demos/engines/rsaref/Makefile.in b/demos/engines/rsaref/Makefile.in
index 04481e31ce06e7fc1fc31c86b225ad50009c6f1d..94af60c401fcf495250e036b42fabafe2d3898a6 100644 (file)
--- a/demos/engines/rsaref/Makefile.in
+++ b/demos/engines/rsaref/Makefile.in
@@ -29,8 +29,7 @@ install:      FORCE.install
                cd install; \
                        make -f unix/makefile CFLAGS='-I. -DPROTOTYPES=1 -O -c' RSAREFLIB=librsaref.a librsaref.a
 
-FORCE.update:
-update:                FORCE.update
+generate:
                perl ../../../util/mkerr.pl -conf rsaref.ec \
                        -nostatic -staticloader -write rsaref.c
 

diff --git a/demos/engines/zencod/Makefile.in b/demos/engines/zencod/Makefile.in
index fe02034e59d879ec3911d7627d4b7f306e6fa6ae..240ae7dae8b450eceaa5a866b72e85ef3e6702b9 100644 (file)
--- a/demos/engines/zencod/Makefile.in
+++ b/demos/engines/zencod/Makefile.in
@@ -24,8 +24,7 @@ all:
                @echo 'gnu:      Generic GNU-based system (gcc and GNU ld)'
                @echo ''
 
-FORCE.update:
-update:                FORCE.update
+generate:
                perl ../../../util/mkerr.pl -conf hw_zencod.ec \
                        -nostatic -staticloader -write hw_zencod.c