aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2008-01-14 17:36:34 +0100
committerJunio C Hamano <gitster@pobox.com>2008-01-18 12:33:50 -0800
commit181256442ec1b09d0095e009922e109aa0a4af5e (patch)
tree3595e843066fd41843269af5722c3e2c47e510a6 /Makefile
parent472ca780773ac75fa6af881117ce5360957fae2d (diff)
downloadgit-181256442ec1b09d0095e009922e109aa0a4af5e.tar.gz
git-181256442ec1b09d0095e009922e109aa0a4af5e.tar.xz
Move sha1_file_to_archive into libgit
When the specfile (export-subst) attribute was introduced, it added a dependency from archive-{tar|zip}.c to builtin-archive.c. This broke the support for archive-operations in libgit.a since builtin-archive.o doesn't belong in libgit.a. This patch moves the functions required by libgit.a from builtin-archive.c to the new file archive.c (which becomes part of libgit.a). Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 13aa24f91..5aac0c0c8 100644
--- a/Makefile
+++ b/Makefile
@@ -318,7 +318,7 @@ LIB_OBJS = \
alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \
color.o wt-status.o archive-zip.o archive-tar.o shallow.o utf8.o \
convert.o attr.o decorate.o progress.o mailmap.o symlinks.o remote.o \
- transport.o bundle.o walker.o parse-options.o ws.o
+ transport.o bundle.o walker.o parse-options.o ws.o archive.o
BUILTIN_OBJS = \
builtin-add.o \