diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-05-08 22:57:28 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-08 22:30:36 -0700 |
| commit | e3925b1222b0adac00b957132526b5b25f341702 (patch) | |
| tree | b02b6161b32fc2602e1a266302c26339f3d512d6 /Makefile | |
| parent | d599e0484f8ebac8cc50e9557a4c3d246826843d (diff) | |
| download | git-e3925b1222b0adac00b957132526b5b25f341702.tar.gz | |
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>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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) |