diff options
author | Richard Levitte <levitte@openssl.org> | 2015-05-22 17:54:06 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2015-05-22 18:44:33 +0200 |
commit | 0f539dc1a2f45580435c39dada44dd276e79cb88 (patch) | |
tree | bb72d0787997435b7151733f0db43f2c729742fc /crypto/Makefile | |
parent | 8757bf83775afe10cb18d15943248a75bcc6a24b (diff) |
Fix the update target and remove duplicate file updates
We had updates of certain header files in both Makefile.org and the
Makefile in the directory the header file lived in. This is error
prone and also sometimes generates slightly different results (usually
just a comment that differs) depending on which way the update was
done.
This removes the file update targets from the top level Makefile, adds
an update: target in all Makefiles and has it depend on the depend: or
local_depend: targets, whichever is appropriate, so we don't get a
double run through the whole file tree.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/Makefile')
-rw-r--r-- | crypto/Makefile | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/crypto/Makefile b/crypto/Makefile index b0645fc5dc..99cd65c5bc 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -110,12 +110,17 @@ libs: lint: @target=lint; $(RECURSIVE_MAKE) -depend: +update: local_depend + @[ -z "$(THIS)" ] || (set -e; target=update; $(RECURSIVE_MAKE) ) + @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi + +depend: local_depend + @[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) ) + @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi +local_depend: @[ -z "$(THIS)" -o -f buildinf.h ] || touch buildinf.h # fake buildinf.h if it does not exist @[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDE) $(DEPFLAG) -- $(PROGS) $(LIBSRC) @[ -z "$(THIS)" -o -s buildinf.h ] || rm buildinf.h - @[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) ) - @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi clean: rm -f buildinf.h *.s *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff |