summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-03 00:53:13 -0700
committerJunio C Hamano <junkio@cox.net>2006-07-03 00:58:34 -0700
commit8fced61cbc32f0c4b81a3dcecfeb40b7d96339ce (patch)
tree12d8803ba2731748d58661aadfa40a6244dc621e
parent35c636ec487d0d5c38e0ce8d3d7bc7ca42c6e5c1 (diff)
downloadgit-8fced61cbc32f0c4b81a3dcecfeb40b7d96339ce.tar.gz
Makefile: tighten git-http-{fetch,push} dependencies
Although our "git-%$X:" implicit target had dependency on $(GITLIBS) which included xdiff/lib.a, git-http-{fetch,push} had their own building rules and with an obsolete dependency on $(LIB_FILES). Update the rules to depend on $(GITLIBS), to make parallel build work correctly. Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index cde619c498..76abcc473b 100644
--- a/Makefile
+++ b/Makefile
@@ -587,11 +587,11 @@ git-ssh-push$X: rsh.o
git-imap-send$X: imap-send.o $(LIB_FILE)
http.o http-fetch.o http-push.o: http.h
-git-http-fetch$X: fetch.o http.o http-fetch.o $(LIB_FILE)
+git-http-fetch$X: fetch.o http.o http-fetch.o $(GITLIBS)
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
-git-http-push$X: revision.o http.o http-push.o $(LIB_FILE)
+git-http-push$X: revision.o http.o http-push.o $(GITLIBS)
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)