X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Makefile;h=ecb4e64435b674d97d643bf04d896b26a2b505b2;hb=54f4cd9e8c7992f70d16efac3c6fc0a18ac0b156;hp=cd0f6481721f9ec47bdc2c0da93936fdfe806a2c;hpb=47f16e8b110d84bacb586a1b7183ee4bb781c980;p=thirdparty%2Fgit.git diff --git a/Makefile b/Makefile index cd0f648172..ecb4e64435 100644 --- a/Makefile +++ b/Makefile @@ -1262,11 +1262,15 @@ else BLK_SHA1 = 1 OPENSSL_LIBSSL = endif +ifdef NO_OPENSSL + LIB_4_CRYPTO = +else ifdef NEEDS_SSL_WITH_CRYPTO LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto -lssl else LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto endif +endif ifdef NEEDS_LIBICONV ifdef ICONVDIR BASIC_CFLAGS += -I$(ICONVDIR)/include @@ -1879,7 +1883,7 @@ builtin/tar-tree.o archive-tar.o: tar.h builtin/pack-objects.o: thread-utils.h connect.o transport.o http-backend.o: url.h http-fetch.o http-walker.o remote-curl.o transport.o walker.o: walker.h -http.o http-walker.o http-push.o http-fetch.o remote-curl.o: http.h +http.o http-walker.o http-push.o http-fetch.o remote-curl.o: http.h url.h xdiff-interface.o $(XDIFF_OBJS): \ xdiff/xinclude.h xdiff/xmacros.h xdiff/xdiff.h xdiff/xtypes.h \