summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-11-06 11:47:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-10 19:07:51 (GMT)
commitb0613ce0f9ef3fd111f8c75b84ddd12f9f04fc87 (patch)
tree9e16b5073782a6058380afc46d59479bea93baf8 /Makefile
parent6bab74e7fb89b7427e5ef24b48a07fe9450c40e7 (diff)
downloadgit-b0613ce0f9ef3fd111f8c75b84ddd12f9f04fc87.zip
git-b0613ce0f9ef3fd111f8c75b84ddd12f9f04fc87.tar.gz
git-b0613ce0f9ef3fd111f8c75b84ddd12f9f04fc87.tar.bz2
wrapper: give zlib wrappers their own translation unit
Programs using xmalloc() but not git_inflate() require -lz on the linker command line because git_inflate() is in the same translation unit as xmalloc(). Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 1f1ce04..a8ba336 100644
--- a/Makefile
+++ b/Makefile
@@ -662,6 +662,7 @@ LIB_OBJS += write_or_die.o
LIB_OBJS += ws.o
LIB_OBJS += wt-status.o
LIB_OBJS += xdiff-interface.o
+LIB_OBJS += zlib.o
BUILTIN_OBJS += builtin/add.o
BUILTIN_OBJS += builtin/annotate.o