msgchk.c: Remove UUCP tests; unused since `#ifdef MF'.

[nmh] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index da0d2881c797091f211ee96f733912c0f17d4628..3b0f4e789df5845f4753b3b790798a6c009d0d5e 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


@@ -177,6 +176,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.


@@ -292,6 +292,10 @@ bin_PROGRAMS = \
     uip/whom \
     #
 
     uip/whom \
     #
 

+noinst_PROGRAMS = \
+    uip/imaptest \
+    #
+

 bin_SCRIPTS = \
     etc/sendfiles \
     uip/mhmail \
 bin_SCRIPTS = \
     etc/sendfiles \
     uip/mhmail \


@@ -334,6 +338,7 @@ noinst_HEADERS = \
     h/addrsbr.h \
     h/aliasbr.h \
     h/crawl_folders.h \
     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 \


@@ -357,8 +362,24 @@ noinst_HEADERS = \
     h/tws.h \
     h/utils.h \
     mts/smtp/smtp.h \
     h/tws.h \
     h/utils.h \
     mts/smtp/smtp.h \

+    sbr/base64.h \

     sbr/ctype-checked.h \
     sbr/ctype-checked.h \

+    sbr/lock_file.h \
+    sbr/m_maildir.h \
+    sbr/m_mktemp.h \
+    sbr/m_popen.h \
+    sbr/m_rand.h \
+    sbr/makedir.h \
+    sbr/message_id.h \
+    sbr/mime_type.h \
+    sbr/read_line.h \
+    sbr/terminal.h \
+    sbr/unquote.h \

     thirdparty/jsmn/jsmn.h \
     thirdparty/jsmn/jsmn.h \

+    uip/mhfree.h \
+    uip/mhmisc.h \
+    uip/mhoutsbr.h \
+    uip/mhshowsbr.h \

     #
 
 ##
     #
 
 ##


@@ -678,6 +699,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 +868,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 +882,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 +894,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 +1015,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 \


@@ -1131,7 +1155,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)' \