]> diplodocus.org Git - nmh/blobdiff - Makefile.am
projects / nmh / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Corrected comment: whom(1) does not use context_foil().
[nmh] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index a284150eda71554677b635b5ae8ff214f2bd1647..e7e4066a6968983dd5d452e62c68e9317989e7d7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,3 @@
-##
 ## Our Makefile.am template for Makefile.in (and, eventually, Makefile)
 ##
 ## Process this with automake to generate Makefile.in
 ## Our Makefile.am template for Makefile.in (and, eventually, Makefile)
 ##
 ## Process this with automake to generate Makefile.in
@@ -27,12 +26,6 @@ LDADD = sbr/libmh.a
 MHNSEARCHPATH = "$(PATH)"
 MHNSEARCHPROG = $(srcdir)/etc/mhn.find.sh
 
 MHNSEARCHPATH = "$(PATH)"
 MHNSEARCHPROG = $(srcdir)/etc/mhn.find.sh
 
-##
-## Install config files and back-end programs in our own subdirecctories.
-##
-nmhetcdir  = @sysconfdir@/nmh
-nmhlibexecdir = @libexecdir@/nmh
-
 ##
 ## nmh _does_ have a test suite!
 ##
 ##
 ## nmh _does_ have a test suite!
 ##
@@ -72,6 +65,7 @@ TESTS = \
     test/format/test-curses \
     test/format/test-dp \
     test/format/test-fmtdump \
     test/format/test-curses \
     test/format/test-dp \
     test/format/test-fmtdump \
+    test/format/test-fmttest \
     test/format/test-functions \
     test/format/test-localmbox \
     test/format/test-myhost \
     test/format/test-functions \
     test/format/test-localmbox \
     test/format/test-myhost \
@@ -112,6 +106,8 @@ TESTS = \
     test/mhshow/test-binary \
     test/mhshow/test-charset \
     test/mhshow/test-cte-binary \
     test/mhshow/test-binary \
     test/mhshow/test-charset \
     test/mhshow/test-cte-binary \
+    test/mhshow/test-exec \
+    test/mhshow/test-markers \
     test/mhshow/test-msg-buffer-boundaries \
     test/mhshow/test-qp \
     test/mhshow/test-subpart \
     test/mhshow/test-msg-buffer-boundaries \
     test/mhshow/test-qp \
     test/mhshow/test-subpart \
@@ -177,6 +173,7 @@ check_PROGRAMS = \
     test/getcanon \
     test/getcwidth \
     test/getfullname \
     test/getcanon \
     test/getcwidth \
     test/getfullname \
+    test/runpty \
     #
 
 ## So they can be built without builing the `check' target.
     #
 
 ## So they can be built without builing the `check' target.
@@ -191,7 +188,6 @@ AM_DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1 \
 
 ##
 ## Stuff that should be cleaned via "make clean"
 
 ##
 ## Stuff that should be cleaned via "make clean"
-## automake 1.12.6 on FreeBSD 9 needs the sbr/dtimep.c.
 ##
 CLEANFILES = \
     $(man_MANS) \
 ##
 CLEANFILES = \
     $(man_MANS) \
@@ -201,8 +197,7 @@ CLEANFILES = \
     etc/mhn.defaults \
     etc/mts.conf \
     man/man.sed \
     etc/mhn.defaults \
     etc/mts.conf \
     man/man.sed \
-    man/mh-chart.man \
-    sbr/dtimep.c \
+    man/mh-chart.man
     #
 
 clean-local:
     #
 
 clean-local:
@@ -292,6 +287,10 @@ bin_PROGRAMS = \
     uip/whom \
     #
 
     uip/whom \
     #
 
+noinst_PROGRAMS = \
+    uip/imaptest \
+    #
+
 bin_SCRIPTS = \
     etc/sendfiles \
     uip/mhmail \
 bin_SCRIPTS = \
     etc/sendfiles \
     uip/mhmail \
@@ -333,7 +332,7 @@ noinst_LIBRARIES = \
 noinst_HEADERS = \
     h/addrsbr.h \
     h/aliasbr.h \
 noinst_HEADERS = \
     h/addrsbr.h \
     h/aliasbr.h \
-    h/crawl_folders.h \
+    h/done.h \
     h/dropsbr.h \
     h/fmt_compile.h \
     h/fmt_scan.h \
     h/dropsbr.h \
     h/fmt_compile.h \
     h/fmt_scan.h \
@@ -348,22 +347,130 @@ noinst_HEADERS = \
     h/netsec.h \
     h/nmh.h \
     h/oauth.h \
     h/netsec.h \
     h/nmh.h \
     h/oauth.h \
-    h/picksbr.h \
-    h/popsbr.h \
     h/prototypes.h \
     h/prototypes.h \
-    h/rcvmail.h \
-    h/scansbr.h \
     h/signals.h \
     h/tws.h \
     h/utils.h \
     mts/smtp/smtp.h \
     h/signals.h \
     h/tws.h \
     h/utils.h \
     mts/smtp/smtp.h \
+    sbr/ambigsw.h \
+    sbr/arglist.h \
+    sbr/atooi.h \
+    sbr/base64.h \
+    sbr/brkstring.h \
+    sbr/check_charset.h \
+    sbr/client.h \
+    sbr/closefds.h \
+    sbr/concat.h \
+    sbr/context_del.h \
+    sbr/context_find.h \
+    sbr/context_foil.h \
+    sbr/context_read.h \
+    sbr/context_replace.h \
+    sbr/context_save.h \
+    sbr/copyip.h \
+    sbr/cpydata.h \
+    sbr/cpydgst.h \
+    sbr/crawl_folders.h \
+    sbr/credentials.h \
     sbr/ctype-checked.h \
     sbr/ctype-checked.h \
+    sbr/datetime.h \
+    sbr/discard.h \
+    sbr/dtime.h \
+    sbr/encode_rfc2047.h \
+    sbr/error.h \
+    sbr/escape_addresses.h \
+    sbr/ext_hook.h \
+    sbr/fdcompare.h \
+    sbr/fmt_addr.h \
+    sbr/fmt_new.h \
+    sbr/fmt_rfc2047.h \
+    sbr/folder_addmsg.h \
+    sbr/folder_delmsgs.h \
+    sbr/folder_free.h \
+    sbr/folder_pack.h \
+    sbr/folder_read.h \
+    sbr/folder_realloc.h \
+    sbr/getarguments.h \
+    sbr/getcpy.h \
+    sbr/geteditor.h \
+    sbr/getfolder.h \
+    sbr/getpass.h \
+    sbr/lock_file.h \
+    sbr/m_atoi.h \
+    sbr/m_backup.h \
+    sbr/m_convert.h \
+    sbr/m_draft.h \
+    sbr/m_getfld.h \
+    sbr/m_gmprot.h \
+    sbr/m_maildir.h \
+    sbr/m_mktemp.h \
+    sbr/m_name.h \
+    sbr/m_popen.h \
+    sbr/m_rand.h \
+    sbr/makedir.h \
+    sbr/message_id.h \
+    sbr/mime_type.h \
+    sbr/path.h \
+    sbr/pidstatus.h \
+    sbr/print_help.h \
+    sbr/print_sw.h \
+    sbr/print_version.h \
+    sbr/push.h \
+    sbr/r1bindex.h \
+    sbr/read_line.h \
+    sbr/read_switch.h \
+    sbr/read_switch_multiword.h \
+    sbr/read_switch_multiword_via_readline.h \
+    sbr/read_yes_or_no_if_tty.h \
+    sbr/readconfig.h \
+    sbr/refile.h \
+    sbr/remdir.h \
+    sbr/ruserpass.h \
+    sbr/seq_add.h \
+    sbr/seq_bits.h \
+    sbr/seq_del.h \
+    sbr/seq_getnum.h \
+    sbr/seq_list.h \
+    sbr/seq_nameok.h \
+    sbr/seq_print.h \
+    sbr/seq_read.h \
+    sbr/seq_save.h \
+    sbr/seq_setcur.h \
+    sbr/seq_setprev.h \
+    sbr/seq_setunseen.h \
+    sbr/showfile.h \
+    sbr/smatch.h \
+    sbr/snprintb.h \
+    sbr/ssequal.h \
+    sbr/strindex.h \
+    sbr/terminal.h \
+    sbr/trimcpy.h \
+    sbr/unquote.h \
+    sbr/uprf.h \
+    sbr/vector.h \
+    sbr/vfgets.h \
     thirdparty/jsmn/jsmn.h \
     thirdparty/jsmn/jsmn.h \
+    uip/annosbr.h \
+    uip/distsbr.h \
+    uip/forwsbr.h \
+    uip/mhfree.h \
+    uip/mhlsbr.h \
+    uip/mhmisc.h \
+    uip/mhoutsbr.h \
+    uip/mhshowsbr.h \
+    uip/picksbr.h \
+    uip/popsbr.h \
+    uip/replsbr.h \
+    uip/scansbr.h \
+    uip/sendsbr.h \
+    uip/whatnowproc.h \
+    uip/whatnowsbr.h \
     #
 
 ##
 ## Extra files we need to install in various places
 ##
     #
 
 ##
 ## Extra files we need to install in various places
 ##
+dist_nmhetc_SCRIPTS = etc/rmmproc.messageid
 dist_nmhetc_DATA = \
     etc/MailAliases \
     etc/components \
 dist_nmhetc_DATA = \
     etc/MailAliases \
     etc/components \
@@ -384,7 +491,6 @@ dist_nmhetc_DATA = \
     etc/rcvdistcomps.outbox \
     etc/replcomps \
     etc/replgroupcomps \
     etc/rcvdistcomps.outbox \
     etc/replcomps \
     etc/replgroupcomps \
-    etc/rmmproc.messageid \
     etc/scan.MMDDYY \
     etc/scan.YYYYMMDD \
     etc/scan.curses \
     etc/scan.MMDDYY \
     etc/scan.YYYYMMDD \
     etc/scan.curses \
@@ -440,7 +546,6 @@ docs_contribdir = $(docdir)/contrib
 dist_docs_contrib_SCRIPTS = \
     docs/contrib/localpostproc \
     docs/contrib/ml \
 dist_docs_contrib_SCRIPTS = \
     docs/contrib/localpostproc \
     docs/contrib/ml \
-    docs/contrib/replaliases \
     docs/contrib/replyfilter \
     docs/contrib/vpick \
     #
     docs/contrib/replyfilter \
     docs/contrib/vpick \
     #
@@ -678,6 +783,9 @@ 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_forw_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
                   uip/annosbr.c uip/distsbr.c uip/forwsbr.c
 uip_forw_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
+uip_imaptest_SOURCES = uip/imaptest.c
+uip_imaptest_LDADD = $(LDADD) $(SASLLIB) $(CURLLIB) $(TLSLIB) $(POSTLINK)
+
 uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/popsbr.c
 uip_inc_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(SASLLIB) $(CURLLIB) \
                $(TLSLIB) $(POSTLINK)
 uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/popsbr.c
 uip_inc_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(SASLLIB) $(CURLLIB) \
                $(TLSLIB) $(POSTLINK)
@@ -844,6 +952,9 @@ test_fakehttp_LDADD = $(LDADD) $(POSTLINK)
 test_getcwidth_SOURCES = test/getcwidth.c
 test_getcwidth_LDADD = $(POSTLINK)
 
 test_getcwidth_SOURCES = test/getcwidth.c
 test_getcwidth_LDADD = $(POSTLINK)
 
+test_runpty_SOURCES = test/runpty.c
+test_runpty_LDADD = $(POSTLINK)
+
 ##
 ## Our rebuild rules for files that aren't built via the normal mechanisms
 ##
 ##
 ## Our rebuild rules for files that aren't built via the normal mechanisms
 ##
@@ -855,7 +966,6 @@ config/version.c: Makefile $(srcdir)/config/version.sh
        env srcdir="$(srcdir)" sh $(srcdir)/config/version.sh $(VERSION) > ./config/version.c
 
 etc/bash_completion_nmh: $(srcdir)/etc/bash_completion_nmh-gen
        env srcdir="$(srcdir)" sh $(srcdir)/config/version.sh $(VERSION) > ./config/version.c
 
 etc/bash_completion_nmh: $(srcdir)/etc/bash_completion_nmh-gen
-       $(MKDIR_P) $(@D) # FIXME: A better way?
        $(srcdir)/etc/bash_completion_nmh-gen > $@
 
 etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
        $(srcdir)/etc/bash_completion_nmh-gen > $@
 
 etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
@@ -868,7 +978,6 @@ etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
                                < $(srcdir)/etc/mts.conf.in > $@
 
 etc/mhn.defaults: $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPROG)
                                < $(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) > $@
 
        @rm -f $@
        $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPATH) $(MHNSEARCHPROG) > $@
 
@@ -990,7 +1099,6 @@ sbr_libmh_a_SOURCES = \
     sbr/mime_type.c \
     sbr/mts.c \
     sbr/netsec.c \
     sbr/mime_type.c \
     sbr/mts.c \
     sbr/netsec.c \
-    sbr/norm_charmap.c \
     sbr/oauth.c \
     sbr/oauth_prof.c \
     sbr/path.c \
     sbr/oauth.c \
     sbr/oauth_prof.c \
     sbr/path.c \
@@ -1000,7 +1108,6 @@ sbr_libmh_a_SOURCES = \
     sbr/print_sw.c \
     sbr/print_version.c \
     sbr/push.c \
     sbr/print_sw.c \
     sbr/print_version.c \
     sbr/push.c \
-    sbr/putenv.c \
     sbr/r1bindex.c \
     sbr/read_line.c \
     sbr/read_switch.c \
     sbr/r1bindex.c \
     sbr/read_line.c \
     sbr/read_switch.c \
@@ -1041,6 +1148,11 @@ sbr_libmh_a_SOURCES = \
 
 sbr_libmh_a_LIBADD = $(LIBOBJS)
 
 
 sbr_libmh_a_LIBADD = $(LIBOBJS)
 
+##
+## Need explicit dependency so that YACC is run before LEX.
+##
+sbr/icalendar.c: sbr/icalparse.c
+
 ##
 ## Because these files use the definitions in the libmh rule below,
 ## they need to be rebuilt if the Makefile changes.
 ##
 ## Because these files use the definitions in the libmh rule below,
 ## they need to be rebuilt if the Makefile changes.
@@ -1048,7 +1160,7 @@ sbr_libmh_a_LIBADD = $(LIBOBJS)
 
 config/sbr_libmh_a-config.$(OBJEXT) sbr/sbr_libmh_a-mts.$(OBJEXT): Makefile
 
 
 config/sbr_libmh_a-config.$(OBJEXT) sbr/sbr_libmh_a-mts.$(OBJEXT): Makefile
 
-sbr_libmh_a_CPPFLAGS = ${AM_CPPFLAGS} -I./sbr \
+sbr_libmh_a_CPPFLAGS = ${AM_CPPFLAGS} \
                -DNMHBINDIR='"$(bindir)"' \
                -DNMHLIBEXECDIR='"$(nmhlibexecdir)"' \
                -DNMHETCDIR='"@nmhetcdirinst@$(nmhetcdir)"' \
                -DNMHBINDIR='"$(bindir)"' \
                -DNMHLIBEXECDIR='"$(nmhlibexecdir)"' \
                -DNMHETCDIR='"@nmhetcdirinst@$(nmhetcdir)"' \
@@ -1127,7 +1239,7 @@ ChangeLog:
 ## Our RPM build target
 ##
 rpm: dist
 ## Our RPM build target
 ##
 rpm: dist
-       @test -d $(rpmdir)/SOURCES || $(MKDIR_P) $(rpmdir)/SOURCES
+       @$(MKDIR_P) $(rpmdir)/SOURCES
        @mv -f $(DIST_ARCHIVES) $(rpmdir)/SOURCES
        @cp -p VERSION $(rpmdir)/SOURCES
        @rpmbuild --define '_topdir $(rpmdir)' \
        @mv -f $(DIST_ARCHIVES) $(rpmdir)/SOURCES
        @cp -p VERSION $(rpmdir)/SOURCES
        @rpmbuild --define '_topdir $(rpmdir)' \
Fork of https://git.savannah.nongnu.org/cgit/nmh.git