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>
Junio C Hamano committed
Mar 31, 2006 at 16:23 UTC
8eef8e09cee1691faad2159ebdab7ca3b232d26b
1 file changed
+4
-4
Makefile
+4
-4
@@ -141,7 +141,7 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
141
$(patsubst %.py,%,$(SCRIPT_PYTHON)) \
142
git-cherry-pick git-show git-status
143
144
-# The ones that do not have to link with lcrypto nor lz.
144
+# The ones that do not have to link with lcrypto, lz nor xdiff.
145
SIMPLE_PROGRAMS = \
146
git-get-tar-commit-id$X git-mailsplit$X \
147
git-stripspace$X git-daemon$X
@@ -454,9 +454,9 @@ all:
454
strip: $(PROGRAMS) git$X
455
$(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X
456
457
-git$X: git.c common-cmds.h $(LIB_FILE)
457
+git$X: git.c common-cmds.h $(GITLIBS)
458
$(CC) -DGIT_VERSION='"$(GIT_VERSION)"' \
459
- $(ALL_CFLAGS) -o $@ $(filter %.c,$^) $(LIB_FILE) \
459
+ $(ALL_CFLAGS) -o $@ $(filter %.c,$^) \
460
$(ALL_LDFLAGS) $(LIBS)
461
462
common-cmds.h: Documentation/git-*.txt
@@ -510,7 +510,7 @@ git$X git.spec \
510
exec_cmd.o: exec_cmd.c
511
$(CC) -o $*.o -c $(ALL_CFLAGS) '-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' $<
512
513
-git-%$X: %.o $(LIB_FILE)
513
+git-%$X: %.o $(GITLIBS)
514
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
515
516
$(SIMPLE_PROGRAMS) : $(LIB_FILE)