wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Consolidate "make update"

Browse source 
Rename 'update' to 'generate'.  Rather than recurse, just explicitly
call the three generate targets directly.
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Rich Salz 2016-01-17 16:53:53 -05:00 committed by Rich Salz
parent 7bb196a71a
commit 8cef1212f3
8 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Makefile.in
View file

@ -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'"':"; \

2
apps/Makefile.in
View file

@ -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

2
crypto/bn/Makefile.in
View file

@ -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...

2
crypto/objects/Makefile.in
View file

@ -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...

3
demos/engines/cluster_labs/Makefile.in
View file

@ -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

3
demos/engines/ibmca/Makefile.in
View file

@ -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

3
demos/engines/rsaref/Makefile.in
View file

@ -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

3
demos/engines/zencod/Makefile.in
View file

@ -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