X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/4d6435dbde12837bdf4b4d594e0440392df4b9d3..30c889422a04c903350797f9c192bb6fb075f68e:/Makefile.am diff --git a/Makefile.am b/Makefile.am index beff7db6..f1868ec0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,6 +55,7 @@ TESTS = test/ali/test-ali test/anno/test-anno \ test/bad-input/test-header \ test/burst/test-burst test/burst/test-burst-mime \ test/comp/test-comp-format test/dist/test-dist \ + test/folder/test-coverage \ test/folder/test-create test/folder/test-nocreate \ test/folder/test-packf test/folder/test-recurse \ test/folder/test-sortm test/folder/test-total \ @@ -82,6 +83,7 @@ TESTS = test/ali/test-ali test/anno/test-anno \ test/mhlist/test-mhlist test/mhlist/test-ext-params \ test/mhmail/test-mhmail \ test/mhparam/test-mhparam test/mhpath/test-mhpath \ + test/mhshow/test-binary \ test/mhshow/test-charset test/mhshow/test-textcharset \ test/mhshow/test-cte-binary test/mhshow/test-qp \ test/mhshow/test-subpart test/mhshow/test-msg-buffer-boundaries \ @@ -112,13 +114,15 @@ TESTS = test/ali/test-ali test/anno/test-anno \ test/cleanup ## The "cleanup" test should always be last. XFAIL_TESTS = \ - test/scan/test-header-parsing \ # check_SCRIPTS = test/common.sh check_PROGRAMS = test/getfullname test/getcanon test/fakepop test/fakesmtp \ test/getcwidth test/fakehttp +## So they can be built without builing the `check' target. +check-programs: $(check_PROGRAMS) + ## The location of installed nmhetcdir is, for all purposes except ## distcheck, $nmhetcdir. For distcheck, prepend $MH_INST_DIR (from ## test/common.sh.in), which is based on $MH_TEST_DIR (from @@ -131,7 +135,6 @@ AM_DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1 \ ## automake 1.12.6 on FreeBSD 9 needs the sbr/dtimep.c. ## CLEANFILES = config/version.c sbr/sigmsg.h sbr/dtimep.c etc/mts.conf \ - etc/gen-ctype-checked sbr/ctype-checked.[hc] \ etc/mhn.defaults man/man.sed man/mh-chart.man $(man_MANS) \ *.plist clean-local: @@ -154,11 +157,6 @@ superclean: maintainer-clean @rm -f $(SUPERCLEANFILES) .PHONY: superclean -## -## Files that need to be built before everything else -## -BUILT_SOURCES = sbr/ctype-checked.c - ## ## This is a list of all programs that get installed in the "bin" directory ## Note that primary difference between "PROGRAMS" and "SCRIPTS" is that @@ -183,13 +181,6 @@ nmhlibexec_PROGRAMS = uip/ap uip/dp uip/fmtdump uip/mhl uip/mkstemp \ nmhlibexec_SCRIPTS = uip/spost -## -## Programs that MAY need to get built at some point; we need to list them -## here if they don't appear in any other primary so Automake knows about -## them and can properly record dependency information. -## -EXTRA_PROGRAMS = etc/gen-ctype-checked - ## ## Internal libraries that we create as part of the build process ## but do not install @@ -245,7 +236,7 @@ dist_doc_DATA = COPYRIGHT INSTALL NEWS README VERSION \ ## Contribs that get installed in docdir/contrib/ ## docs_contribdir = $(docdir)/contrib -dist_docs_contrib_SCRIPTS = docs/contrib/replyfilter docs/contrib/build_nmh \ +dist_docs_contrib_SCRIPTS = docs/contrib/replyfilter \ docs/contrib/localpostproc docs/contrib/ml \ docs/contrib/vpick docs/contrib/replaliases dist_docs_contrib_DATA = docs/contrib/replaliases @@ -295,7 +286,7 @@ man_SRCS = man/MH.man man/ali.man man/anno.man man/ap.man man/burst.man \ ## Files we need to include in the distribution which aren't found by ## Automake using the automatic rules ## -EXTRA_DIST = autogen.sh config/version.sh sbr/icalparse.h \ +EXTRA_DIST = autogen.sh build_nmh config/version.sh sbr/icalparse.h \ etc/mts.conf.in etc/mhn.defaults.sh etc/sendfiles \ $(MHNSEARCHPROG) DATE MACHINES \ docs/ChangeLog_MH-3_to_MH-6.6 \ @@ -514,9 +505,6 @@ test_fakehttp_LDADD = $(LDADD) $(POSTLINK) test_getcwidth_SOURCES = test/getcwidth.c test_getcwidth_LDADD = $(POSTLINK) -etc_gen_ctype_checked_SOURCES = etc/gen-ctype-checked.c -etc_gen_ctype_checked_LDADD = $(POSTLINK) - ## ## Our rebuild rules for files that aren't built via the normal mechanisms ## @@ -527,11 +515,6 @@ etc_gen_ctype_checked_LDADD = $(POSTLINK) config/version.c: Makefile $(srcdir)/config/version.sh env srcdir="$(srcdir)" sh $(srcdir)/config/version.sh $(VERSION) > ./config/version.c -sbr/ctype-checked.h: etc/gen-ctype-checked - etc/gen-ctype-checked - -sbr/ctype-checked.c: etc/gen-ctype-checked sbr/ctype-checked.h - etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile @rm -f $@ $(SED) -e 's,%mts%,$(MTS),' \ @@ -542,6 +525,7 @@ etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile < $(srcdir)/etc/mts.conf.in > $@ etc/mhn.defaults: $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPROG) + $(MKDIR_P) $(@D) # FIXME: A better way? @rm -f $@ $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPATH) $(MHNSEARCHPROG) > $@ @@ -619,7 +603,7 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \ sbr/makedir.c sbr/md5.c sbr/message_id.c \ sbr/mime_type.c sbr/mts.c sbr/netsec.c \ sbr/norm_charmap.c sbr/path.c \ - sbr/peekc.c sbr/pidwait.c sbr/pidstatus.c \ + sbr/pidwait.c sbr/pidstatus.c \ sbr/print_help.c sbr/print_sw.c sbr/print_version.c \ sbr/push.c sbr/putenv.c sbr/refile.c sbr/remdir.c \ sbr/r1bindex.c sbr/readconfig.c sbr/ruserpass.c \ @@ -740,16 +724,17 @@ rpm: dist ## These targets are not integrated into the other automake ## targets because they will be used so infrequently, if at all. ## -gcov: - @if ./config.status --config | grep -e --enable-debug >/dev/null; then \ - echo For best results with gcov, configure without --enable-debug; \ - fi +gcov: gcov-rebuild gcov-run gcov-process gcov-report +gcov-rebuild: @echo rebuilding with AM_CFLAGS=--coverage . . . - @(make clean && make AM_CFLAGS=--coverage) > /dev/null && \ - make check AM_CFLAGS=--coverage + @(make clean && make AM_CFLAGS=--coverage) > /dev/null +gcov-run: + make check AM_CFLAGS=--coverage +gcov-process: @for i in `find . -name '*.gcda'`; do \ - gcov -p -o `echo $$i | $(SED) 's%\\(.*\\)/%\\1 %'`; \ + gcov -pro `echo $$i | $(SED) 's%\\(.*\\)/%\\1 %'`; \ done +gcov-report: @for i in `find . -name '*.gcno'`; do \ if test -f `echo $$i | sed 's%\.gcno%.gcda%'`; then :; else \ echo untested: $$i; \ @@ -759,7 +744,8 @@ gcov-mostlyclean: @find . -name '*.gcno' -o -name '*.gcda' | xargs rm gcov-clean: gcov-mostlyclean @find . -name '*.gcov' | xargs rm -.PHONY: gcov gcov-mostlyclean gcov-clean +.PHONY: gcov gcov-rebuild gcov-run gcov-process gcov-report \ + gcov-mostlyclean gcov-clean ##