Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-27 04:08:22 +0400
committerJunio C Hamano <gitster@pobox.com>2008-08-27 04:08:22 +0400
commitc7f72248e3da96299d925aece0f00a46f5f86334 (patch)
treeed5a248dd1c9815517f435fb491b8c2e469e9795 /Makefile
parent0f7a8f2dba5aeb8ce8ab4a710a1d1310705f7f08 (diff)
parent1e7abc593d55bc436ccd98f6815d49b13511baa1 (diff)
Merge branch 'jc/no-slim-shell'
* jc/no-slim-shell: Revert "Build-in "git-shell""
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 7a6cbb6f03..4c627fde13 100644
--- a/Makefile
+++ b/Makefile
@@ -549,7 +549,6 @@ BUILTIN_OBJS += builtin-rev-parse.o
BUILTIN_OBJS += builtin-revert.o
BUILTIN_OBJS += builtin-rm.o
BUILTIN_OBJS += builtin-send-pack.o
-BUILTIN_OBJS += builtin-shell.o
BUILTIN_OBJS += builtin-shortlog.o
BUILTIN_OBJS += builtin-show-branch.o
BUILTIN_OBJS += builtin-show-ref.o
@@ -832,6 +831,7 @@ EXTLIBS += -lz
ifndef NO_POSIX_ONLY_PROGRAMS
PROGRAMS += git-daemon$X
PROGRAMS += git-imap-send$X
+ PROGRAMS += git-shell$X
endif
ifndef NO_OPENSSL
OPENSSL_LIBSSL = -lssl