Commit 8cef1212 authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

Consolidate "make update" 



Rename 'update' to 'generate'.  Rather than recurse, just explicitly
call the three generate targets directly.
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 7bb196a7

Makefile.in

+13 −9
Original line number Diff line number Diff line
@@ -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'"':"; \

apps/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -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

crypto/bn/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -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...

crypto/objects/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -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...

demos/engines/cluster_labs/Makefile.in

+1 −2
Original line number Diff line number Diff line
@@ -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