Bring this up to best practices.

[nmh] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 974d9ee2039aaf3acbd1792e93a450547a518ec6..7e93a12a2c1825416ca023f0fa9a150bcd31c7d3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,6 +76,7 @@ TESTS = test/ali/test-ali test/anno/test-anno \
        test/repl/test-multicomp test/repl/test-repl \
        test/scan/test-scan test/scan/test-scan-multibyte \
        test/sequences/test-flist test/sequences/test-mark \
+       test/sequences/test-out-of-range \
        test/slocal/test-slocal \
        test/whatnow/test-attach-detach test/whatnow/test-cd \
        test/whatnow/test-ls test/whom/test-whom \
@@ -120,8 +121,8 @@ BUILT_SOURCES = sbr/sigmsg.h
 ## the latter do not have $(EXEEXT) added on the end.
 ##
 bin_PROGRAMS = uip/ali uip/anno uip/burst uip/comp uip/dist uip/flist \
-              uip/folder uip/forw uip/inc uip/install-mh uip/mark \
-              uip/mhbuild uip/mhlist uip/mhn uip/mhparam \
+              uip/fmttest uip/folder uip/forw uip/inc uip/install-mh \
+              uip/mark uip/mhbuild uip/mhlist uip/mhn uip/mhparam \
               uip/mhpath uip/mhshow uip/mhstore uip/msgchk uip/msh uip/new \
               uip/packf uip/pick uip/prompter uip/refile uip/repl uip/rmf \
               uip/rmm uip/scan uip/send uip/show uip/sortm uip/whatnow \
@@ -196,7 +197,7 @@ dist_contrib_DATA = docs/contrib/replyfilter docs/contrib/build_nmh \
 ##
 man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \
           man/conflict.8 man/dist.1 man/dp.8 man/flist.1 man/flists.1 \
-          man/fmtdump.8 man/fnext.1 man/folder.1 man/folders.1 \
+          man/fmtdump.8 man/fmttest.1 man/fnext.1 man/folder.1 man/folders.1 \
           man/forw.1 man/fprev.1 man/inc.1 man/install-mh.1 man/mark.1 \
           man/mh-alias.5 man/mh-chart.7 man/mh-draft.5 man/mh-format.5 \
           man/mh-mail.5 man/mh-profile.5 man/mh_profile.5 man/mh-sequence.5 \
@@ -215,9 +216,9 @@ man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \
 ##
 man_SRCS = man/ali.man man/anno.man man/ap.man man/burst.man man/comp.man \
           man/conflict.man man/dist.man man/dp.man man/flist.man \
-          man/flists.man man/fmtdump.man man/fnext.man man/folder.man \
-          man/folders.man man/forw.man man/fprev.man man/inc.man \
-          man/install-mh.man man/mark.man man/mh-alias.man \
+          man/flists.man man/fmtdump.man man/fmttest.man man/fnext.man \
+          man/folder.man man/folders.man man/forw.man man/fprev.man
+          man/inc.man man/install-mh.man man/mark.man man/mh-alias.man \
           man/mh-chart-gen.sh man/mh-draft.man man/mh-format.man \
           man/mh-mail.man man/mh-profile.man man/mh_profile.man \
           man/mh-sequence.man man/mh-tailor.man man/mhbuild.man man/mhl.man \
@@ -367,6 +368,9 @@ uip_dp_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
 uip_fmtdump_SOURCES = uip/fmtdump.c
 uip_fmtdump_LDADD = $(LDADD) $(ICONVLIB)
 
+uip_fmttest_SOURCES = uip/fmttest.c uip/termsbr.c
+uip_fmttest_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+
 uip_mhl_SOURCES = uip/mhl.c uip/mhlsbr.c uip/termsbr.c
 uip_mhl_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
 
@@ -471,7 +475,8 @@ uninstall-hook:
 ##
 ## Our rules to build our internal libraries (libmh.a, libmts.a)
 ##
-sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/base64.c \
+sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \
+                     sbr/base64.c \
                      sbr/brkstring.c sbr/check_charset.c sbr/client.c \
                      sbr/closefds.c sbr/concat.c sbr/context_del.c \
                      sbr/context_find.c sbr/context_foil.c sbr/context_read.c \
@@ -484,7 +489,8 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/base64.c \
                      sbr/folder_free.c sbr/folder_pack.c \
                      sbr/folder_read.c sbr/folder_realloc.c sbr/gans.c \
                      sbr/getans.c sbr/getanswer.c sbr/getarguments.c \
-                     sbr/getcpy.c sbr/getfolder.c sbr/getpass.c \
+                     sbr/getcpy.c sbr/geteditor.c sbr/getfolder.c \
+                     sbr/getpass.c \
                      sbr/fmt_addr.c sbr/fmt_compile.c sbr/fmt_new.c \
                      sbr/fmt_rfc2047.c sbr/fmt_scan.c sbr/lock_file.c \
                      sbr/m_atoi.c sbr/m_backup.c sbr/m_convert.c \
@@ -510,9 +516,7 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/base64.c \
 sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \
                -DMAILSPOOL='"$(mailspool)"' \
                -DSENDMAILPATH='"$(sendmailpath)"' -DNMHBINDIR='"$(bindir)"' \
-               -DNMHLIBDIR='"$(libdir)"' \
-               -DDEFAULT_EDITOR='"$(editorpath)"' \
-               -DDEFAULT_PAGER='"$(pagerpath)"'
+               -DNMHLIBDIR='"$(libdir)"'
 
 sbr_libdtimep_a_SOURCES = sbr/dtimep.l
 sbr_libdtimep_a_CFLAGS = $(sbr_libmh_a_CPPFLAGS) \
@@ -541,8 +545,6 @@ man/man.sed: Makefile
        @echo 's,%mandir%,$(mandir),g' >> $@
        @echo 's,%mailspool%,$(mailspool),g' >> $@
        @echo 's,%sendmailpath%,$(sendmailpath),g' >> $@
-       @echo 's,%default_editor%,$(editorpath),g' >> $@
-       @echo 's,%default_pager%,$(pagerpath),g' >> $@
        @echo 's,%manext1%,$(manext1),g' >> $@
        @echo 's,%manext5%,$(manext5),g' >> $@
        @echo 's,%manext7%,$(manext7),g' >> $@