summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-27 22:02:45 -0700
committerJunio C Hamano <junkio@cox.net>2006-07-27 22:02:45 -0700
commita060b803b49c04cd6e3b0d859f131349dab6b26f (patch)
tree63d970d053900051a49592d86316f051bbabc607 /Makefile
parent3058e9339f05379462b7e14d832d091cc3d9b2b9 (diff)
downloadgit-a060b803b49c04cd6e3b0d859f131349dab6b26f.tar.gz
Makefile: git-merge-recur depends on xdiff libraries.
Tighten dependencies to allow parallel build. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a749aa4f0e..12ffd45ca9 100644
--- a/Makefile
+++ b/Makefile
@@ -617,7 +617,7 @@ git-http-push$X: revision.o http.o http-push.o $(GITLIBS)
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
merge-recursive.o path-list.o: path-list.h
-git-merge-recur$X: merge-recursive.o path-list.o $(LIB_FILE)
+git-merge-recur$X: merge-recursive.o path-list.o $(GITLIBS)
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
$(LIBS)