Junio C Hamano  committed 8eef8e0

Makefile: many programs now depend on xdiff/lib.a having been built.

The dependency was not properly updated when we added this
library, breaking parallel build with $(MAKE) -j.

Signed-off-by: Junio C Hamano <>

  • Participants
  • Parent commits 4c0fea0
  • Branches master

Comments (0)

Files changed (1)

 	  $(patsubst,%,$(SCRIPT_PYTHON)) \
 	  git-cherry-pick git-show git-status
-# The ones that do not have to link with lcrypto nor lz.
+# The ones that do not have to link with lcrypto, lz nor xdiff.
 	git-get-tar-commit-id$X git-mailsplit$X \
 	git-stripspace$X git-daemon$X
 strip: $(PROGRAMS) git$X
-git$X: git.c common-cmds.h $(LIB_FILE)
+git$X: git.c common-cmds.h $(GITLIBS)
-		$(ALL_CFLAGS) -o $@ $(filter %.c,$^) $(LIB_FILE) \
+		$(ALL_CFLAGS) -o $@ $(filter %.c,$^) \
 common-cmds.h: Documentation/git-*.txt
 exec_cmd.o: exec_cmd.c
 	$(CC) -o $*.o -c $(ALL_CFLAGS) '-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' $<
-git-%$X: %.o $(LIB_FILE)
+git-%$X: %.o $(GITLIBS)
 	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)