From: Junio C Hamano <junkio@cox.net>
Date: Fri, 28 Jul 2006 05:02:45 +0000 (-0700)
Subject: Makefile: git-merge-recur depends on xdiff libraries.
X-Git-Tag: v1.4.3-rc1~174^2~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a060b803b49c04cd6e3b0d859f131349dab6b26f;p=git.git

Makefile: git-merge-recur depends on xdiff libraries.

Tighten dependencies to allow parallel build.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Makefile b/Makefile
index a749aa4f0..12ffd45ca 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)