EXTRA_DIST must be unconditional

there should be a CLEANFILES when ENABLE_COVERAGE is false too


git-svn: trunk@3962
0.95
Török Edvin 17 years ago
parent db1a202ac3
commit 73464bf870
  1. 3
      unit_tests/Makefile.am
  2. 4
      unit_tests/Makefile.in

@ -19,13 +19,13 @@ check_clamscan.sh: $(top_builddir)/test/clam.exe
$(top_builddir)/test/clam.exe:
(cd $(top_builddir)/test && $(MAKE))
EXTRA_DIST=test-clamd.conf test-freshclam.conf
if ENABLE_COVERAGE
LCOV_OUTPUT = lcov.out
LCOV_HTML = lcov_html
LCOV_LCOV = @LCOV@
LCOV_GENHTML = @GENHTML@
CLEANFILES=lcov.out *.gcno *.gcda *.log /tmp/clamd-test.log
EXTRA_DIST=test-clamd.conf test-freshclam.conf
lcov: $(LCOV_HTML)
DIRECTORIES=--directory . --directory ../libclamav --directory ../clamd --directory ../freshclam --directory ../sigtool --directory ../clamscan --directory ../clamdscan
@ -48,6 +48,7 @@ lcov-clean:
lcov $(DIRECTORIES) --zerocounters
else
CLEANFILES=/tmp/clamd-test.log
lcov:
@echo "Coverage information gathering is not enabled in this build"
@echo "Use ./configure --enable-coverage to enable it"

@ -222,12 +222,13 @@ scripts = check_clamd.sh check_freshclam.sh check_sigtool.sh check_clamscan.sh
check_clamav_SOURCES = check_clamav.c check_jsnorm.c check_str.c checks.h $(top_builddir)/libclamav/clamav.h
check_clamav_CFLAGS = @CHECK_CFLAGS@
check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CHECK_LIBS@
EXTRA_DIST = test-clamd.conf test-freshclam.conf
@ENABLE_COVERAGE_TRUE@LCOV_OUTPUT = lcov.out
@ENABLE_COVERAGE_TRUE@LCOV_HTML = lcov_html
@ENABLE_COVERAGE_TRUE@LCOV_LCOV = @LCOV@
@ENABLE_COVERAGE_TRUE@LCOV_GENHTML = @GENHTML@
@ENABLE_COVERAGE_FALSE@CLEANFILES = /tmp/clamd-test.log
@ENABLE_COVERAGE_TRUE@CLEANFILES = lcov.out *.gcno *.gcda *.log /tmp/clamd-test.log
@ENABLE_COVERAGE_TRUE@EXTRA_DIST = test-clamd.conf test-freshclam.conf
@ENABLE_COVERAGE_TRUE@DIRECTORIES = --directory . --directory ../libclamav --directory ../clamd --directory ../freshclam --directory ../sigtool --directory ../clamscan --directory ../clamdscan
all: all-am
@ -681,7 +682,6 @@ $(top_builddir)/test/clam.exe:
@ENABLE_COVERAGE_TRUE@lcov-clean:
@ENABLE_COVERAGE_TRUE@ -$(RM) -r $(LCOV_HTML) $(LCOV_OUTPUT)
@ENABLE_COVERAGE_TRUE@ lcov $(DIRECTORIES) --zerocounters
@ENABLE_COVERAGE_FALSE@lcov:
@ENABLE_COVERAGE_FALSE@ @echo "Coverage information gathering is not enabled in this build"
@ENABLE_COVERAGE_FALSE@ @echo "Use ./configure --enable-coverage to enable it"

Loading…
Cancel
Save