From: Johannes Sixt Date: Mon, 8 Sep 2008 10:46:55 +0000 (+0200) Subject: Windows: git-shell can be compiled again X-Git-Tag: v1.6.1-rc1~259 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e705d757bde06c2e523fc5bbbbf62bbb7c2234e9;p=git.git Windows: git-shell can be compiled again The reason that git-shell was excluded from the Windows build was that our compatibility layer needed stuff that was removed when we tried to link less of the git library into git-shell. Since 4cfc24a (shell: do not play duplicated definition games to shrink the executable, 2008-08-19) the complete library is linked again, so we can build git-shell on Windows as well. (This fixes 'make install', which depends on that git-shell is always built.) Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- diff --git a/Makefile b/Makefile index deedcf1b8..f4c31c871 100644 --- a/Makefile +++ b/Makefile @@ -296,6 +296,7 @@ PROGRAMS += git-pack-redundant$X PROGRAMS += git-patch-id$X PROGRAMS += git-receive-pack$X PROGRAMS += git-send-pack$X +PROGRAMS += git-shell$X PROGRAMS += git-show-index$X PROGRAMS += git-unpack-file$X PROGRAMS += git-update-server-info$X @@ -837,7 +838,6 @@ 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