Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Makefile: fix header dependency checker to allow NO_CURL builds
author
Jonathan Nieder
<jrnieder@gmail.com>
Sun, 9 May 2010 03:57:28 +0000
(22:57 -0500)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 9 May 2010 05:30:36 +0000
(22:30 -0700)
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>
Makefile
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
d599e04
)
diff --git
a/Makefile
b/Makefile
index 910f4713ef1491278500573bab2d00ee1925abb8..567b859a4765dc74bba69ed4922a5a06f59f020c 100644
(file)
--- 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)