diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-24 13:24:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-24 13:24:49 -0800 |
| commit | c6caede7fd6bc428b4d2e53f6bb5c1e1a9bcb24c (patch) | |
| tree | 47c0591c521e0d369b0d284298104c8d8377c954 /Makefile | |
| parent | 89ba4e7c7f71712133d1d3137f811b99ea43dd31 (diff) | |
| parent | 16529f2e5630d3d155e4dff0ebd3c7c5daa882f9 (diff) | |
| download | git-c6caede7fd6bc428b4d2e53f6bb5c1e1a9bcb24c.tar.gz | |
Merge branch 'maint'
* maint:
imap-send: link against libcrypto for HMAC and others
git-send-email.perl: Deduplicate "to:" and "cc:" entries with names
mingw: do not set errno to 0 on success
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1936,7 +1936,7 @@ git-%$X: %.o $(GITLIBS) git-imap-send$X: imap-send.o $(GITLIBS) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ - $(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL) + $(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL) $(LIB_4_CRYPTO) git-http-fetch$X: revision.o http.o http-walker.o http-fetch.o $(GITLIBS) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ |