summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-01 00:23:46 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-01 00:23:46 (GMT)
commit8eef8e09cee1691faad2159ebdab7ca3b232d26b (patch)
tree9447a57c0f2815c07bbf6cf547866135ef2b1c1d
parent4c0fea0f1116a4c782696a3e4cf2db31a4aa8adc (diff)
downloadgit-8eef8e09cee1691faad2159ebdab7ca3b232d26b.zip
git-8eef8e09cee1691faad2159ebdab7ca3b232d26b.tar.gz
git-8eef8e09cee1691faad2159ebdab7ca3b232d26b.tar.bz2
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 <junkio@cox.net>
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index d78298a..c79d646 100644
--- a/Makefile
+++ b/Makefile
@@ -141,7 +141,7 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
$(patsubst %.py,%,$(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.
SIMPLE_PROGRAMS = \
git-get-tar-commit-id$X git-mailsplit$X \
git-stripspace$X git-daemon$X
@@ -454,9 +454,9 @@ all:
strip: $(PROGRAMS) git$X
$(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X
-git$X: git.c common-cmds.h $(LIB_FILE)
+git$X: git.c common-cmds.h $(GITLIBS)
$(CC) -DGIT_VERSION='"$(GIT_VERSION)"' \
- $(ALL_CFLAGS) -o $@ $(filter %.c,$^) $(LIB_FILE) \
+ $(ALL_CFLAGS) -o $@ $(filter %.c,$^) \
$(ALL_LDFLAGS) $(LIBS)
common-cmds.h: Documentation/git-*.txt
@@ -510,7 +510,7 @@ git$X git.spec \
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)
$(SIMPLE_PROGRAMS) : $(LIB_FILE)