Code

Makefile: git-merge-recur depends on xdiff libraries.
authorJunio C Hamano <junkio@cox.net>
Fri, 28 Jul 2006 05:02:45 +0000 (22:02 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 28 Jul 2006 05:02:45 +0000 (22:02 -0700)
Tighten dependencies to allow parallel build.

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

index a749aa4f0e0c955751b61ad1786302936758ea70..12ffd45ca9cd9eb70092b4c4637bdd7b616e5372 100644 (file)
--- 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)