summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 36932ea)
raw | patch | inline | side by side (parent: 36932ea)
author | Junio C Hamano <junkio@cox.net> | |
Wed, 26 Apr 2006 06:11:17 +0000 (23:11 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Wed, 26 Apr 2006 06:11:17 +0000 (23:11 -0700) |
Foolishly I renamed diff.o around which caused an old diff.o
taken out of libgit.a and got linked into resulting binary and
exhibited mysterious breakage for many people. This borrows
from the kernel Makefile (scripts/Makefile.build) to first remove
the target and then recreate.
Signed-off-by: Junio C Hamano <junkio@cox.net>
taken out of libgit.a and got linked into resulting binary and
exhibited mysterious breakage for many people. This borrows
from the kernel Makefile (scripts/Makefile.build) to first remove
the target and then recreate.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Makefile | patch | blob | history |
diff --git a/Makefile b/Makefile
index d9a3a82fe2afa2bb477d65f082b6348ed678e955..809383c51b6512d9c33773ba9d35278b8d1ccdf4 100644 (file)
--- a/Makefile
+++ b/Makefile
$(DIFF_OBJS): diffcore.h
$(LIB_FILE): $(LIB_OBJS)
- $(AR) rcs $@ $(LIB_OBJS)
+ rm -f $@ && $(AR) rcs $@ $(LIB_OBJS)
XDIFF_OBJS=xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o