summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-26 06:11:17 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-26 06:11:17 (GMT)
commit71459c193d04870076efa0a387c317390b53e3e2 (patch)
treedd2c781888ec22d24c1019fbfd6d293bc3af2261
parent36932eab772dc621e79d615fda425ecf87e6d74e (diff)
downloadgit-71459c193d04870076efa0a387c317390b53e3e2.zip
git-71459c193d04870076efa0a387c317390b53e3e2.tar.gz
git-71459c193d04870076efa0a387c317390b53e3e2.tar.bz2
Makefile: remove and create libgit.a from scratch.
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>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d9a3a82..809383c 100644
--- a/Makefile
+++ b/Makefile
@@ -575,7 +575,7 @@ $(patsubst git-%$X,%.o,$(PROGRAMS)): $(GITLIBS)
$(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