aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-05-08 23:00:10 -0500
committerJunio C Hamano <gitster@pobox.com>2010-05-08 22:30:51 -0700
commit57e8743d1a2a06c4141b2a231bfcc54e2b0c2ad6 (patch)
treef4cdb6de7922d174c054a6660248b12b79050dc6 /Makefile
parente3925b1222b0adac00b957132526b5b25f341702 (diff)
downloadgit-57e8743d1a2a06c4141b2a231bfcc54e2b0c2ad6.tar.gz
git-57e8743d1a2a06c4141b2a231bfcc54e2b0c2ad6.tar.xz
Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES
This way, if you have “COMPUTE_HEADER_DEPENDENCIES = YesPlease” in your config.mak, you can still “make CHECK_HEADER_DEPENDENCIES=Yes” to check the makefile after a successful build. This change does not affect the result of the command “make CHECK_HEADER_DEPENDENCIES=Yes COMPUTE_HEADER_DEPENDENCIES=Yes”. That will still die with an error message: cannot compute header dependencies outside a normal build The message is appropriate because still true. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 567b859a4..0025b98b9 100644
--- a/Makefile
+++ b/Makefile
@@ -1063,6 +1063,7 @@ endif
-include config.mak
ifdef CHECK_HEADER_DEPENDENCIES
+COMPUTE_HEADER_DEPENDENCIES =
USE_COMPUTED_HEADER_DEPENDENCIES =
endif