X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6fc2909634fb431c65ecfa8b6db4f6519f99b389..f2ac699d39bce1406ba54ff6cf9046c954361411:/Makefile.am?ds=sidebyside

diff --git a/Makefile.am b/Makefile.am
index 91b53efe..fc1bceb8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,6 +82,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 \
@@ -100,6 +101,7 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	test/rcv/test-rcvtty test/refile/test-refile test/repl/test-convert \
 	test/repl/test-if-str test/repl/test-trailing-newline \
 	test/repl/test-multicomp test/repl/test-repl \
+	test/scan/test-header-parsing \
 	test/scan/test-scan test/scan/test-scan-multibyte \
 	test/sequences/test-flist test/sequences/test-mark \
 	test/sequences/test-out-of-range \
@@ -110,10 +112,17 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	test/whatnow/test-ls test/whom/test-whom \
 	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
@@ -126,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:
@@ -149,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
@@ -178,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
@@ -504,14 +500,11 @@ test_fakesmtp_SOURCES = test/fakesmtp.c test/server.c
 test_fakesmtp_LDADD = $(POSTLINK)
 
 test_fakehttp_SOURCES = test/fakehttp.c test/server.c
-test_fakehttp_LDADD = $(POSTLINK)
+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
 ##
@@ -522,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),' \
@@ -537,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) > $@
 
@@ -632,6 +621,8 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \
 		      config/config.c config/version.c \
 		      thirdparty/jsmn/jsmn.c
 
+sbr_libmh_a_LIBADD = $(LIBOBJS)
+
 ##
 ## Because these files use the definitions in the libmh rule below,
 ## they need to be rebuilt if the Makefile changes.
@@ -734,9 +725,6 @@ rpm: dist
 ## 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
 	@echo rebuilding with AM_CFLAGS=--coverage . . .
 	@(make clean  &&  make AM_CFLAGS=--coverage) > /dev/null  && \
 	  make check AM_CFLAGS=--coverage