X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8884d1baae25b585efbb3c34515a2d1a198ba847..643c6553f171fa5b04a017da16f9283467497355:/Makefile.am diff --git a/Makefile.am b/Makefile.am index 1e159feb..bdcca089 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,6 +65,8 @@ TESTS = test/ali/test-ali test/anno/test-anno \ test/install-mh/test-install-mh \ test/locking/test-datalocking test/locking/test-spoollocking \ test/manpages/test-manpages \ + test/mhbuild/test-attach \ + test/mhbuild/test-cte \ test/mhbuild/test-forw test/mhbuild/test-header-encode \ test/mhbuild/test-utf8-body \ test/mhfixmsg/test-mhfixmsg \ @@ -100,8 +102,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: @@ -265,6 +268,7 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in \ test/README test/fakesendmail $(TESTS) test/inc/deb359167.mbox \ test/inc/fromline.txt test/inc/msgheader.txt test/inc/filler.txt \ test/inc/md5sums test/mhmail/attachment.txt \ + test/mhbuild/tiny.jpg \ test/post/test-post-common.sh test/valgrind.supp uip/mhmail \ SPECS/nmh.spec SPECS/build-nmh-cygwin $(man_SRCS) @@ -287,12 +291,12 @@ 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/attach.c uip/annosbr.c uip/distsbr.c -uip_comp_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(READLINELIB) $(POSTLINK) + uip/annosbr.c uip/distsbr.c +uip_comp_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_dist_SOURCES = uip/dist.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \ - uip/attach.c uip/annosbr.c uip/distsbr.c uip/forwsbr.c -uip_dist_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(READLINELIB) $(POSTLINK) + uip/annosbr.c uip/distsbr.c uip/forwsbr.c +uip_dist_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_flist_SOURCES = uip/flist.c uip_flist_LDADD = $(LDADD) $(POSTLINK) @@ -301,8 +305,8 @@ 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/attach.c uip/annosbr.c uip/distsbr.c uip/forwsbr.c -uip_forw_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(READLINELIB) $(POSTLINK) + uip/annosbr.c uip/distsbr.c uip/forwsbr.c +uip_forw_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/popsbr.c uip_inc_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(SASLLIB) $(POSTLINK) @@ -321,7 +325,7 @@ uip_mhbuild_LDADD = $(LDADD) $(TERMLIB) $(POSTLINK) uip_mhfixmsg_SOURCES = uip/mhfixmsg.c uip/mhparse.c uip/mhcachesbr.c \ uip/mhoutsbr.c uip/mhmisc.c uip/mhfree.c \ uip/mhshowsbr.c uip/mhlistsbr.c uip/md5.c -uip_mhfixmsg_LDADD = $(LDADD) $(ICONVLIB) $(TERMLIB) $(POSTLINK) +uip_mhfixmsg_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_mhlist_SOURCES = uip/mhlist.c uip/mhparse.c uip/mhcachesbr.c \ uip/mhlistsbr.c uip/mhmisc.c uip/mhfree.c uip/md5.c @@ -371,8 +375,8 @@ 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/attach.c uip/annosbr.c uip/distsbr.c -uip_repl_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(READLINELIB) $(POSTLINK) + uip/sendsbr.c uip/annosbr.c uip/distsbr.c +uip_repl_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK) uip_rmf_SOURCES = uip/rmf.c uip_rmf_LDADD = $(LDADD) $(POSTLINK) @@ -383,7 +387,7 @@ 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/attach.c uip/annosbr.c \ +uip_send_SOURCES = uip/send.c uip/sendsbr.c uip/annosbr.c \ uip/distsbr.c uip_send_LDADD = $(LDADD) $(POSTLINK) @@ -394,8 +398,8 @@ uip_sortm_SOURCES = uip/sortm.c uip_sortm_LDADD = $(LDADD) $(POSTLINK) uip_whatnow_SOURCES = uip/whatnow.c uip/whatnowsbr.c uip/sendsbr.c \ - uip/attach.c uip/annosbr.c uip/distsbr.c -uip_whatnow_LDADD = $(LDADD) $(READLINELIB) $(POSTLINK) + uip/annosbr.c uip/distsbr.c +uip_whatnow_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(POSTLINK) uip_whom_SOURCES = uip/whom.c uip/distsbr.c uip_whom_LDADD = $(LDADD) $(POSTLINK) @@ -446,7 +450,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/attach.c uip/annosbr.c uip/distsbr.c + uip/annosbr.c uip/distsbr.c uip_viamail_LDADD = $(LDADD) $(POSTLINK) test_getfullname_SOURCES = test/getfullname.c @@ -470,8 +474,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) > $@ @@ -562,7 +570,7 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \ sbr/m_atoi.c sbr/m_backup.c sbr/m_convert.c \ sbr/m_draft.c sbr/m_getfld.c sbr/m_gmprot.c \ sbr/m_maildir.c sbr/m_name.c sbr/m_rand.c \ - sbr/makedir.c sbr/message_id.c sbr/mts.c \ + sbr/makedir.c sbr/message_id.c sbr/mime_type.c sbr/mts.c \ sbr/norm_charmap.c sbr/path.c \ sbr/peekc.c sbr/pidwait.c sbr/pidstatus.c \ sbr/print_help.c sbr/print_sw.c sbr/print_version.c \