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>
Jonathan Nieder committed
May 8, 2010 at 22:57 UTC
e3925b1222b0adac00b957132526b5b25f341702
1 file changed
+4
-1
Makefile
+4
-1
@@ -1656,7 +1656,10 @@ git.o git.spec \
1656
1657
TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS))
1658
GIT_OBJS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \
1659
- git.o http.o http-walker.o remote-curl.o
1659
+ git.o
1660
+ifndef NO_CURL
1661
+ GIT_OBJS += http.o http-walker.o remote-curl.o
1662
+endif
1663
XDIFF_OBJS = xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \
1664
xdiff/xmerge.o xdiff/xpatience.o
1665
OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS)