mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-05 20:33:41 +00:00
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 <ramsay@ramsay1.demon.co.uk>
This commit is contained in:
parent
f019bd17a1
commit
19d13c65e1
4
Makefile
4
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
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user