Merge branch 'jl/daemon'
authorJunio C Hamano <junkio@cox.net>
Sun, 24 Sep 2006 23:58:34 +0000 (16:58 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 24 Sep 2006 23:58:34 +0000 (16:58 -0700)
* jl/daemon:
Add virtualization support to git-daemon

1  2 
Makefile
diff --combined Makefile
index 739d7e3ccb12a1564bcfb4d48d9560d2f6a2d350,fb2ade5afbe69f66918e95fd02f069f0bb4ef9d2..4a8cd22602828cd7ae5efb74a3798b7e641a1b04
+++ b/Makefile
@@@ -246,7 -246,9 +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 \
        fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \
        write_or_die.o trace.o list-objects.o \
        alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \
 -      color.o wt-status.o
 +      color.o wt-status.o archive-zip.o
  
  BUILTIN_OBJS = \
        builtin-add.o \
        builtin-upload-archive.o \
        builtin-upload-tar.o \
        builtin-verify-pack.o \
 -      builtin-write-tree.o \
 -      builtin-zip-tree.o
 +      builtin-write-tree.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz