aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-09-24 16:58:34 -0700
committerJunio C Hamano <junkio@cox.net>2006-09-24 16:58:34 -0700
commit043c04107c5e55224b4517a43c5c40ba18a617d0 (patch)
treeefa69cae20af524616223e03db0f24f144a5aca5 /Makefile
parented1795fcc5f2aa3f105630429bcbed49c50053fa (diff)
parent49ba83fb67d9e447b86953965ce5f949c6a93b81 (diff)
downloadgit-043c04107c5e55224b4517a43c5c40ba18a617d0.tar.gz
git-043c04107c5e55224b4517a43c5c40ba18a617d0.tar.xz
Merge branch 'jl/daemon'
* jl/daemon: Add virtualization support to git-daemon
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 739d7e3cc..4a8cd2260 100644
--- a/Makefile
+++ b/Makefile
@@ -246,7 +246,9 @@ DIFF_OBJS = \
LIB_OBJS = \
blob.o commit.o connect.o csum-file.o cache-tree.o base85.o \
- date.o diff-delta.o entry.o exec_cmd.o ident.o lockfile.o \
+ date.o diff-delta.o entry.o exec_cmd.o ident.o \
+ interpolate.o \
+ lockfile.o \
object.o pack-check.o patch-delta.o path.o pkt-line.o sideband.o \
quote.o read-cache.o refs.o run-command.o dir.o object-refs.o \
server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \