Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES
authorJonathan Nieder <jrnieder@gmail.com>
Sun, 9 May 2010 04:00:10 +0000 (23:00 -0500)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 05:30:51 +0000 (22:30 -0700)
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>
Makefile

index 567b859a4765dc74bba69ed4922a5a06f59f020c..0025b98b954d16600b99593604b4aedf3029f80c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1063,6 +1063,7 @@ endif
 -include config.mak
 
 ifdef CHECK_HEADER_DEPENDENCIES
+COMPUTE_HEADER_DEPENDENCIES =
 USE_COMPUTED_HEADER_DEPENDENCIES =
 endif