Merge branch 'jl/daemon'
[gitweb.git] / Makefile
index fb2ade5afbe69f66918e95fd02f069f0bb4ef9d2..4a8cd22602828cd7ae5efb74a3798b7e641a1b04 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -256,7 +256,7 @@ LIB_OBJS = \
        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 \
@@ -302,8 +302,7 @@ BUILTIN_OBJS = \
        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