diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-13 18:21:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-13 18:21:17 (GMT) |
| commit | 57af58e888165db623925f25e290f1b9472fd5c9 (patch) | |
| tree | 5c715e3abfefd0ca78b1936973c7344c53fea942 /Makefile | |
| parent | 40e9b27dec28692464f43d1c213d465fed8994ba (diff) | |
| parent | 57e8743d1a2a06c4141b2a231bfcc54e2b0c2ad6 (diff) | |
| download | git-57af58e888165db623925f25e290f1b9472fd5c9.zip git-57af58e888165db623925f25e290f1b9472fd5c9.tar.gz git-57af58e888165db623925f25e290f1b9472fd5c9.tar.bz2 | |
Merge branch 'jn/make-header-dependency'
* jn/make-header-dependency:
Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES
Makefile: fix header dependency checker to allow NO_CURL builds
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1077,6 +1077,7 @@ endif -include config.mak ifdef CHECK_HEADER_DEPENDENCIES +COMPUTE_HEADER_DEPENDENCIES = USE_COMPUTED_HEADER_DEPENDENCIES = endif @@ -1669,7 +1670,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) |