Fixed test-attach-detach to work with any umask, and without readline.

[nmh] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4ed415d8905c90ba604b84c98dd1570af9941962..6dc801794f8b144becb6cd76e46b36e37b5ab6e8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,6 +51,7 @@ TESTS = test/ali/test-ali test/anno/test-anno \
        test/folder/test-create test/folder/test-packf \
        test/folder/test-recurse test/folder/test-sortm \
        test/folder/test-total \
+       test/format/test-curses \
        test/format/test-dp test/format/test-fmtdump \
        test/format/test-localmbox test/format/test-myname \
        test/format/test-myhost test/format/test-mymbox \
@@ -99,8 +100,9 @@ DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1
 
 ##
 ## Stuff that should be cleaned via "make clean"
+## automake 1.12.6 on FreeBSD 9 needs the sbr/dtimep.c.
 ##
-CLEANFILES = config/version.c sbr/sigmsg.h etc/mts.conf \
+CLEANFILES = config/version.c sbr/sigmsg.h sbr/dtimep.c etc/mts.conf \
             etc/gen-ctype-checked sbr/ctype-checked.h sbr/ctype-checked.c \
             etc/mhn.defaults man/man.sed man/mh-chart.man $(man_MANS)
 clean-local:
@@ -286,11 +288,11 @@ uip_burst_SOURCES = uip/burst.c uip/mhparse.c uip/mhmisc.c uip/mhfree.c \
 uip_burst_LDADD = $(LDADD) $(POSTLINK)
 
 uip_comp_SOURCES = uip/comp.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
-                  uip/annosbr.c uip/distsbr.c
+                  uip/attach.c uip/annosbr.c uip/distsbr.c
 uip_comp_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(READLINELIB) $(POSTLINK)
 
 uip_dist_SOURCES = uip/dist.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
-                  uip/annosbr.c uip/distsbr.c uip/forwsbr.c
+                  uip/attach.c uip/annosbr.c uip/distsbr.c uip/forwsbr.c
 uip_dist_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(READLINELIB) $(POSTLINK)
 
 uip_flist_SOURCES = uip/flist.c
@@ -300,7 +302,7 @@ uip_folder_SOURCES = uip/folder.c
 uip_folder_LDADD = $(LDADD) $(POSTLINK)
 
 uip_forw_SOURCES = uip/forw.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
-                  uip/annosbr.c uip/distsbr.c uip/forwsbr.c
+                  uip/attach.c uip/annosbr.c uip/distsbr.c uip/forwsbr.c
 uip_forw_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(READLINELIB) $(POSTLINK)
 
 uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/popsbr.c
@@ -314,7 +316,7 @@ uip_mark_LDADD = $(LDADD) $(POSTLINK)
 
 uip_mhbuild_SOURCES = uip/mhbuild.c uip/mhbuildsbr.c uip/mhcachesbr.c \
                      uip/mhlistsbr.c uip/mhoutsbr.c uip/mhmisc.c  \
-                     uip/mhfree.c uip/mhparse.c uip/md5.c
+                     uip/mhfree.c uip/mhparse.c uip/md5.c uip/attach.c
 uip_mhbuild_LDADD = $(LDADD) $(TERMLIB) $(POSTLINK)
 
 uip_mhfixmsg_SOURCES = uip/mhfixmsg.c uip/mhparse.c uip/mhcachesbr.c \
@@ -369,8 +371,8 @@ uip_prompter_LDADD = $(LDADD) $(POSTLINK)
 uip_refile_SOURCES = uip/refile.c
 uip_refile_LDADD = $(LDADD) $(POSTLINK)
 
-uip_repl_SOURCES = uip/repl.c uip/replsbr.c uip/whatnowproc.c \
-                  uip/whatnowsbr.c uip/sendsbr.c uip/annosbr.c uip/distsbr.c
+uip_repl_SOURCES = uip/repl.c uip/replsbr.c uip/whatnowproc.c uip/whatnowsbr.c \
+                  uip/sendsbr.c uip/attach.c uip/annosbr.c uip/distsbr.c
 uip_repl_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(READLINELIB) $(POSTLINK)
 
 uip_rmf_SOURCES = uip/rmf.c
@@ -382,7 +384,8 @@ uip_rmm_LDADD = $(LDADD) $(POSTLINK)
 uip_scan_SOURCES = uip/scan.c uip/scansbr.c
 uip_scan_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
-uip_send_SOURCES = uip/send.c uip/sendsbr.c uip/annosbr.c uip/distsbr.c
+uip_send_SOURCES = uip/send.c uip/sendsbr.c uip/attach.c uip/annosbr.c \
+                  uip/distsbr.c
 uip_send_LDADD = $(LDADD) $(POSTLINK)
 
 uip_show_SOURCES = uip/show.c uip/mhlsbr.c
@@ -392,7 +395,7 @@ uip_sortm_SOURCES = uip/sortm.c
 uip_sortm_LDADD = $(LDADD) $(POSTLINK)
 
 uip_whatnow_SOURCES = uip/whatnow.c uip/whatnowsbr.c uip/sendsbr.c \
-                     uip/annosbr.c uip/distsbr.c
+                     uip/attach.c uip/annosbr.c uip/distsbr.c
 uip_whatnow_LDADD = $(LDADD) $(READLINELIB) $(POSTLINK)
 
 uip_whom_SOURCES = uip/whom.c uip/distsbr.c
@@ -444,7 +447,7 @@ uip_slocal_SOURCES = uip/slocal.c uip/aliasbr.c uip/dropsbr.c
 uip_slocal_LDADD = $(LDADD) $(NDBM_LIBS) $(POSTLINK)
 
 uip_viamail_SOURCES = uip/viamail.c uip/mhmisc.c uip/mhoutsbr.c uip/sendsbr.c \
-                     uip/annosbr.c uip/distsbr.c
+                     uip/attach.c uip/annosbr.c uip/distsbr.c
 uip_viamail_LDADD = $(LDADD) $(POSTLINK)
 
 test_getfullname_SOURCES = test/getfullname.c
@@ -468,8 +471,12 @@ etc_gen_ctype_checked_LDADD = $(POSTLINK)
 ##
 ## Our rebuild rules for files that aren't built via the normal mechanisms
 ##
+
+## Hard-code the config/version.c target, instead of using $@, so this
+## rule works for the distcheck target with Solaris (System V) make.
+## distcheck uses VPATH, causes that make to prepend the VPATH to $@.
 config/version.c: Makefile
-       sh $(srcdir)/config/version.sh $(VERSION) > $@
+       sh $(srcdir)/config/version.sh $(VERSION) > ./config/version.c
 
 sbr/sigmsg.h: $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H)
        $(AWK) -f $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H) > $@