proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-08 10:53:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Makefile(s): Don't include the OpenSSL crypto library in the link

Browse Source 
Also, fully purge the NO_OPENSSL build variable.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
This commit is contained in:
Ramsay Jones 2010-04-27 17:00:30 +01:00
parent f019bd17a1
commit 19d13c65e1
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -149,7 +149,7 @@ $(GIT_LIB): $(OBJS)
$(TEST_OBJ) $(TEST_EXE) $(TEST_RUN) $(TEST_VAL): $(GIT_LIB) $(TEST_OBJ) $(TEST_EXE) $(TEST_RUN) $(TEST_VAL): $(GIT_LIB)
@$(MAKE) -C tests --no-print-directory \ @$(MAKE) -C tests --no-print-directory \
OS=$(OS) NO_OPENSSL=$(NO_OPENSSL) $(@F) OS=$(OS) $(@F)
libgit2.pc: libgit2.pc.in libgit2.pc: libgit2.pc.in
sed -e 's#@prefix@#$(prefix)#' -e 's#@libdir@#$(libdir)#' $< > $@ sed -e 's#@prefix@#$(prefix)#' -e 's#@libdir@#$(libdir)#' $< > $@
@ -181,7 +181,7 @@ COV_CFLAGS = $(CFLAGS) -O0 -ftest-coverage -fprofile-arcs
cov-build: cov-build:
$(MAKE) CFLAGS="$(COV_CFLAGS)" all $(MAKE) CFLAGS="$(COV_CFLAGS)" all
$(MAKE) TEST_COVERAGE=1 NO_OPENSSL=$(NO_OPENSSL) test $(MAKE) TEST_COVERAGE=1 test
cov-report: cov-report:
@echo "--- untested files:" | tee untested @echo "--- untested files:" | tee untested

4
tests/Makefile
View File

@ -59,10 +59,6 @@ ifdef TEST_COVERAGE
EXTRA_LIBS += -O0 -lgcov EXTRA_LIBS += -O0 -lgcov
endif endif
ifndef NO_OPENSSL
EXTRA_LIBS += $(CRYPTO_LIB)
endif
BASIC_CFLAGS := -I../src BASIC_CFLAGS := -I../src
ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS) ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS)