From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun, 9 May 2010 03:57:28 +0000 (-0500)
Subject: Makefile: fix header dependency checker to allow NO_CURL builds
X-Git-Tag: v1.7.2-rc0~82^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e3925b1222b0adac00b957132526b5b25f341702;p=git.git

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 <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Makefile b/Makefile
index 910f4713e..567b859a4 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)