projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix'
[git.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
a83c502
..
8ce27a6
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-199,7
+199,7
@@
LIB_H = \
tree-walk.h log-tree.h
DIFF_OBJS = \
tree-walk.h log-tree.h
DIFF_OBJS = \
- diff-lib.o diffcore-break.o diffcore-order.o \
+ diff
.o diff
-lib.o diffcore-break.o diffcore-order.o \
diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \
diffcore-delta.o log-tree.o
diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \
diffcore-delta.o log-tree.o
@@
-470,6
+470,8
@@
git$X: git.c common-cmds.h $(BUILTIN_OBJS) $(GITLIBS)
$(ALL_CFLAGS) -o $@ $(filter %.c,$^) \
$(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
$(ALL_CFLAGS) -o $@ $(filter %.c,$^) \
$(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
+builtin-help.o: common-cmds.h
+
$(BUILT_INS): git$X
rm -f $@ && ln git$X $@
$(BUILT_INS): git$X
rm -f $@ && ln git$X $@
@@
-573,12
+575,12
@@
$(patsubst git-%$X,%.o,$(PROGRAMS)): $(GITLIBS)
$(DIFF_OBJS): diffcore.h
$(LIB_FILE): $(LIB_OBJS)
$(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
$(XDIFF_LIB): $(XDIFF_OBJS)
XDIFF_OBJS=xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o
$(XDIFF_LIB): $(XDIFF_OBJS)
- $(AR) rcs $@ $(XDIFF_OBJS)
+
rm -f $@ &&
$(AR) rcs $@ $(XDIFF_OBJS)
doc:
doc: