summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-01-27 10:45:52 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-01-27 10:45:52 -0800
commit69b024dc0376a6da39fadbbcc0b459304c993e41 (patch)
tree05f404a7b8b7b3f8dd4332297da82403e1121514
parentMerge branch 'sb/repack-in-c' (diff)
parentMakefile: remove redundant object in git-http{fetch,push} (diff)
downloadtgif-69b024dc0376a6da39fadbbcc0b459304c993e41.tar.xz
Merge branch 'jk/revision-o-is-in-libgit-a'
* jk/revision-o-is-in-libgit-a: Makefile: remove redundant object in git-http{fetch,push}
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 99b2b8931a..dddaf4f287 100644
--- a/Makefile
+++ b/Makefile
@@ -2050,10 +2050,10 @@ git-imap-send$X: imap-send.o GIT-LDFLAGS $(GITLIBS)
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
$(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL) $(LIB_4_CRYPTO)
-git-http-fetch$X: revision.o http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS)
+git-http-fetch$X: http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS)
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
$(LIBS) $(CURL_LIBCURL)
-git-http-push$X: revision.o http.o http-push.o GIT-LDFLAGS $(GITLIBS)
+git-http-push$X: http.o http-push.o GIT-LDFLAGS $(GITLIBS)
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)