From 19d13c65e11f45c3be6666c6c4c9732c6f4ab40a Mon Sep 17 00:00:00 2001 From: Ramsay Jones Date: Tue, 27 Apr 2010 17:00:30 +0100 Subject: [PATCH] Makefile(s): Don't include the OpenSSL crypto library in the link Also, fully purge the NO_OPENSSL build variable. Signed-off-by: Ramsay Jones --- Makefile | 4 ++-- tests/Makefile | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index ba6f870d2..9aa923b26 100644 --- a/Makefile +++ b/Makefile @@ -149,7 +149,7 @@ $(GIT_LIB): $(OBJS) $(TEST_OBJ) $(TEST_EXE) $(TEST_RUN) $(TEST_VAL): $(GIT_LIB) @$(MAKE) -C tests --no-print-directory \ - OS=$(OS) NO_OPENSSL=$(NO_OPENSSL) $(@F) + OS=$(OS) $(@F) libgit2.pc: libgit2.pc.in sed -e 's#@prefix@#$(prefix)#' -e 's#@libdir@#$(libdir)#' $< > $@ @@ -181,7 +181,7 @@ COV_CFLAGS = $(CFLAGS) -O0 -ftest-coverage -fprofile-arcs cov-build: $(MAKE) CFLAGS="$(COV_CFLAGS)" all - $(MAKE) TEST_COVERAGE=1 NO_OPENSSL=$(NO_OPENSSL) test + $(MAKE) TEST_COVERAGE=1 test cov-report: @echo "--- untested files:" | tee untested diff --git a/tests/Makefile b/tests/Makefile index c059510ad..6a5c2bc91 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -59,10 +59,6 @@ ifdef TEST_COVERAGE EXTRA_LIBS += -O0 -lgcov endif -ifndef NO_OPENSSL - EXTRA_LIBS += $(CRYPTO_LIB) -endif - BASIC_CFLAGS := -I../src ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS)