[PATCH 1/2] Makefile: fix header dependency checker to allow NO_CURL builds
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- May 9, 2010, 03:57 UTC
- Message-ID
- <20100509035728.GA8198@progeny.tock>
- In-Reply-To
- <20100509035536.GA8118@progeny.tock>
Do not expect to find http-related dependency fragments after a build with HTTP support disabled.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- Makefile | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile index 910f471..567b859 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)
-- 1.7.1