Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'np/delta' into next
author
Junio C Hamano
<junkio@cox.net>
Sat, 29 Apr 2006 05:42:41 +0000
(22:42 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Sat, 29 Apr 2006 05:42:41 +0000
(22:42 -0700)
* np/delta:
replace adler32 with Rabin's polynomial in diff-delta
1
2
Makefile
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
1d19b32
3dc5a9e
)
diff --cc
Makefile
index 4416af9bb05c710cf6577540f6f1edc94c93604b,38c980bfb6841847ce14cedae3012d155e243218..576067fafbd9fab97fa555ef7272d88e6a580892
---
1
/
Makefile
---
2
/
Makefile
+++ b/
Makefile
@@@
-609,11
-609,8
+609,11
@@@
test-date$X: test-date.c date.o ctype.
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) test-date.c date.o ctype.o
test-delta$X: test-delta.c diff-delta.o patch-delta.o
- $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^
-lz
+ $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^
+test-dump-cache-tree$X: dump-cache-tree.o $(GITLIBS)
+ $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
+
check:
for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done