git-svn: trunk@3962
Török Edvin authored on 2008/07/16 20:44:32... | ... |
@@ -19,13 +19,13 @@ check_clamscan.sh: $(top_builddir)/test/clam.exe |
19 | 19 |
$(top_builddir)/test/clam.exe: |
20 | 20 |
(cd $(top_builddir)/test && $(MAKE)) |
21 | 21 |
|
22 |
+EXTRA_DIST=test-clamd.conf test-freshclam.conf |
|
22 | 23 |
if ENABLE_COVERAGE |
23 | 24 |
LCOV_OUTPUT = lcov.out |
24 | 25 |
LCOV_HTML = lcov_html |
25 | 26 |
LCOV_LCOV = @LCOV@ |
26 | 27 |
LCOV_GENHTML = @GENHTML@ |
27 | 28 |
CLEANFILES=lcov.out *.gcno *.gcda *.log /tmp/clamd-test.log |
28 |
-EXTRA_DIST=test-clamd.conf test-freshclam.conf |
|
29 | 29 |
lcov: $(LCOV_HTML) |
30 | 30 |
|
31 | 31 |
DIRECTORIES=--directory . --directory ../libclamav --directory ../clamd --directory ../freshclam --directory ../sigtool --directory ../clamscan --directory ../clamdscan |
... | ... |
@@ -48,6 +48,7 @@ lcov-clean: |
48 | 48 |
lcov $(DIRECTORIES) --zerocounters |
49 | 49 |
else |
50 | 50 |
|
51 |
+CLEANFILES=/tmp/clamd-test.log |
|
51 | 52 |
lcov: |
52 | 53 |
@echo "Coverage information gathering is not enabled in this build" |
53 | 54 |
@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 |
222 | 222 |
check_clamav_SOURCES = check_clamav.c check_jsnorm.c check_str.c checks.h $(top_builddir)/libclamav/clamav.h |
223 | 223 |
check_clamav_CFLAGS = @CHECK_CFLAGS@ |
224 | 224 |
check_clamav_LDADD = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ @CHECK_LIBS@ |
225 |
+EXTRA_DIST = test-clamd.conf test-freshclam.conf |
|
225 | 226 |
@ENABLE_COVERAGE_TRUE@LCOV_OUTPUT = lcov.out |
226 | 227 |
@ENABLE_COVERAGE_TRUE@LCOV_HTML = lcov_html |
227 | 228 |
@ENABLE_COVERAGE_TRUE@LCOV_LCOV = @LCOV@ |
228 | 229 |
@ENABLE_COVERAGE_TRUE@LCOV_GENHTML = @GENHTML@ |
230 |
+@ENABLE_COVERAGE_FALSE@CLEANFILES = /tmp/clamd-test.log |
|
229 | 231 |
@ENABLE_COVERAGE_TRUE@CLEANFILES = lcov.out *.gcno *.gcda *.log /tmp/clamd-test.log |
230 |
-@ENABLE_COVERAGE_TRUE@EXTRA_DIST = test-clamd.conf test-freshclam.conf |
|
231 | 232 |
@ENABLE_COVERAGE_TRUE@DIRECTORIES = --directory . --directory ../libclamav --directory ../clamd --directory ../freshclam --directory ../sigtool --directory ../clamscan --directory ../clamdscan |
232 | 233 |
all: all-am |
233 | 234 |
|
... | ... |
@@ -681,7 +682,6 @@ $(top_builddir)/test/clam.exe: |
681 | 681 |
@ENABLE_COVERAGE_TRUE@lcov-clean: |
682 | 682 |
@ENABLE_COVERAGE_TRUE@ -$(RM) -r $(LCOV_HTML) $(LCOV_OUTPUT) |
683 | 683 |
@ENABLE_COVERAGE_TRUE@ lcov $(DIRECTORIES) --zerocounters |
684 |
- |
|
685 | 684 |
@ENABLE_COVERAGE_FALSE@lcov: |
686 | 685 |
@ENABLE_COVERAGE_FALSE@ @echo "Coverage information gathering is not enabled in this build" |
687 | 686 |
@ENABLE_COVERAGE_FALSE@ @echo "Use ./configure --enable-coverage to enable it" |