From e3925b1222b0adac00b957132526b5b25f341702 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Sat, 8 May 2010 22:57:28 -0500 Subject: [PATCH 1/2] Makefile: fix header dependency checker to allow NO_CURL builds Do not expect to find http-related dependency fragments after a build with HTTP support disabled. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 910f4713ef..567b859a47 100644 --- a/Makefile +++ b/Makefile @@ -1656,7 +1656,10 @@ git.o git.spec \ TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS)) GIT_OBJS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \ - git.o http.o http-walker.o remote-curl.o + git.o +ifndef NO_CURL + GIT_OBJS += http.o http-walker.o remote-curl.o +endif XDIFF_OBJS = xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \ xdiff/xmerge.o xdiff/xpatience.o OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS) From 57e8743d1a2a06c4141b2a231bfcc54e2b0c2ad6 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Sat, 8 May 2010 23:00:10 -0500 Subject: [PATCH 2/2] Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Junio C Hamano --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 567b859a47..0025b98b95 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