aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2006-12-18 16:06:50 -0500
committerJunio C Hamano <junkio@cox.net>2006-12-18 15:30:17 -0800
commit57b73150c4f1dbc26474a0031f433fb34db1c13f (patch)
tree382bc838eda09dc65fd78b9bf0853a9a47ca630b /Makefile
parente1bb1d31ea7b5a2a3f20508e5643e8fc9ee5f0fd (diff)
downloadgit-57b73150c4f1dbc26474a0031f433fb34db1c13f.tar.gz
git-57b73150c4f1dbc26474a0031f433fb34db1c13f.tar.xz
make patch_delta() error cases a bit more verbose
It is especially important to distinguish between a malloc() failure from all the other cases. An out of memory condition is much less worrisome than a compatibility/corruption problem. Also make test-delta compilable again. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 05cfe45b1..8919dabc7 100644
--- a/Makefile
+++ b/Makefile
@@ -796,8 +796,8 @@ test: all
test-date$X: test-date.c date.o ctype.o
$(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) $^
+test-delta$X: test-delta.o diff-delta.o patch-delta.o $(GITLIBS)
+ $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
test-dump-cache-tree$X: dump-cache-tree.o $(GITLIBS)
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)