Whoops, I need to make sure the buffer I pass to putcomp() is NULL-terminated.

[nmh] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0799555ce24efea6cfefbb7e488236f7cb57ed73..cd3c886c649233982b1ae6d777d647ade7b4655d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ ACLOCAL_AMFLAGS = -I m4
 ## LDADD is included in the program-specific LDADD since we want to add
 ## to this list of libraries, not replace it.
 ##
 ## LDADD is included in the program-specific LDADD since we want to add
 ## to this list of libraries, not replace it.
 ##

-LDADD = sbr/libmh.a
+LDADD = sbr/libmh.a sbr/libdtimep.a

 
 ##
 ## These are used to create the default mhn.defaults config file
 
 ##
 ## These are used to create the default mhn.defaults config file


@@ -35,6 +35,23 @@ auxexecdir = @libdir@
 ##
 CLEANFILES = config/version.c sbr/sigmsg.h etc/mts.conf etc/sendfiles \
             etc/mhn.defaults man/man.sed $(man_MANS)
 ##
 CLEANFILES = config/version.c sbr/sigmsg.h etc/mts.conf etc/sendfiles \
             etc/mhn.defaults man/man.sed $(man_MANS)

+clean-local:
+       @rm -rf RPM a.out.DSYM uip/a.out.DSYM
+
+##
+## Stuff that should be cleaned via "make maintainer-clean"
+##
+MAINTAINERCLEANFILES = cscope.files cscope.out
+
+##
+## And our own superclean, to get everything left by maintainer-clean.
+##
+SUPERCLEANFILES = ChangeLog Makefile.in aclocal.m4 compile config.guess \
+                 config.h.in config.h.in~ config.sub configure depcomp \
+                 install-sh missing ylwrap nmh-*.tar.gz
+superclean: maintainer-clean
+       @rm -f $(SUPERCLEANFILES)
+.PHONY: superclean

 
 ##
 ## Files that need to be built before everything else
 
 ##
 ## Files that need to be built before everything else


@@ -67,7 +84,7 @@ auxexec_PROGRAMS = uip/ap uip/conflict uip/dp uip/fmtdump uip/mhl uip/post \
 ## Internal libraries that we create as part of the build process
 ## but do not install
 ##
 ## Internal libraries that we create as part of the build process
 ## but do not install
 ##

-noinst_LIBRARIES = sbr/libmh.a mts/libmts.a
+noinst_LIBRARIES = sbr/libmh.a sbr/libdtimep.a mts/libmts.a

 
 ##
 ## These are all of our header files.  Right now we don't install any of
 
 ##
 ## These are all of our header files.  Right now we don't install any of


@@ -181,10 +198,8 @@ uip_forw_SOURCES = uip/forw.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
                   uip/annosbr.c uip/distsbr.c
 uip_forw_LDADD = $(LDADD) $(ICONVLIB)
 
                   uip/annosbr.c uip/distsbr.c
 uip_forw_LDADD = $(LDADD) $(ICONVLIB)
 

-uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/termsbr.c
-if POP_SUPPORT
-uip_inc_SOURCES += uip/popsbr.c
-endif
+uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/termsbr.c \
+                 uip/popsbr.c

 uip_inc_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(SASLLIB)
 
 uip_install_mh_SOURCES = uip/install-mh.c
 uip_inc_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(SASLLIB)
 
 uip_install_mh_SOURCES = uip/install-mh.c


@@ -222,10 +237,7 @@ uip_mhstore_SOURCES = uip/mhstore.c uip/mhparse.c uip/mhcachesbr.c \
                      uip/mhmisc.c uip/mhfree.c uip/termsbr.c uip/md5.c
 uip_mhstore_LDADD = $(LDADD) $(TERMLIB)
 
                      uip/mhmisc.c uip/mhfree.c uip/termsbr.c uip/md5.c
 uip_mhstore_LDADD = $(LDADD) $(TERMLIB)
 

-uip_msgchk_SOURCES = uip/msgchk.c
-if POP_SUPPORT
-uip_msgchk_SOURCES += uip/popsbr.c
-endif
+uip_msgchk_SOURCES = uip/msgchk.c uip/popsbr.c

 uip_msgchk_LDADD = $(LDADD) $(SASLLIB)
 
 uip_msh_SOURCES = uip/msh.c uip/mshcmds.c uip/vmhsbr.c uip/picksbr.c \
 uip_msgchk_LDADD = $(LDADD) $(SASLLIB)
 
 uip_msh_SOURCES = uip/msh.c uip/mshcmds.c uip/vmhsbr.c uip/picksbr.c \


@@ -360,7 +372,8 @@ install-exec-hook:
        fi
 
 install-data-hook:
        fi
 
 install-data-hook:

-       ln $(DESTDIR)/$(man5dir)/mh-profile.5 $(DESTDIR)/$(man5dir)/mh_profile.5
+       rm -f $(DESTDIR)$(man5dir)/mh_profile.5
+       ln $(DESTDIR)$(man5dir)/mh-profile.5 $(DESTDIR)$(man5dir)/mh_profile.5

 ##
 ## Make sure we remove those links at uninstall time
 ##
 ##
 ## Make sure we remove those links at uninstall time
 ##


@@ -384,7 +397,7 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/brkstring.c \
                      sbr/context_replace.c sbr/context_save.c \
                      sbr/copy.c sbr/copyip.c sbr/cpydata.c \
                      sbr/cpydgst.c sbr/crawl_folders.c sbr/discard.c \
                      sbr/context_replace.c sbr/context_save.c \
                      sbr/copy.c sbr/copyip.c sbr/cpydata.c \
                      sbr/cpydgst.c sbr/crawl_folders.c sbr/discard.c \

-                     sbr/done.c sbr/dtime.c sbr/dtimep.l \
+                     sbr/done.c sbr/dtime.c \

                      sbr/error.c  sbr/ext_hook.c sbr/fdcompare.c \
                      sbr/folder_addmsg.c sbr/folder_delmsgs.c \
                      sbr/folder_free.c sbr/folder_pack.c \
                      sbr/error.c  sbr/ext_hook.c sbr/fdcompare.c \
                      sbr/folder_addmsg.c sbr/folder_delmsgs.c \
                      sbr/folder_free.c sbr/folder_pack.c \


@@ -418,6 +431,9 @@ sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \
                -DDEFAULT_EDITOR='"$(default_editor)"' \
                -DDEFAULT_PAGER='"$(default_pager)"'
 
                -DDEFAULT_EDITOR='"$(default_editor)"' \
                -DDEFAULT_PAGER='"$(default_pager)"'
 

+sbr_libdtimep_a_SOURCES = sbr/dtimep.l
+sbr_libdtimep_a_CFLAGS = $(sbr_libmh_a_CPPFLAGS) $(DISABLE_UNUSED_MACROS_WARNING)
+

 mts_libmts_a_SOURCES = mts/smtp/hosts.c mts/smtp/smtp.c
 
 ##
 mts_libmts_a_SOURCES = mts/smtp/hosts.c mts/smtp/smtp.c
 
 ##


@@ -446,11 +462,6 @@ man/man.sed: Makefile
        echo 's,%manext1%,$(manext1),g' >> $@
        echo 's,%manext5%,$(manext5),g' >> $@
        echo 's,%manext8%,$(manext8),g' >> $@
        echo 's,%manext1%,$(manext1),g' >> $@
        echo 's,%manext5%,$(manext5),g' >> $@
        echo 's,%manext8%,$(manext8),g' >> $@

-if POP_SUPPORT
-       echo '/^%nmhbeginpop%/d;/^%nmhendpop%/d' >> $@
-else
-       echo '/^%nmhbeginpop%/,/^%nmhendpop%/d' >> $@
-endif

        echo '/%components%/r $(top_srcdir)/etc/components' >> $@
        echo ' s,%components%,,g' >> $@
        echo '/%distcomps%/r $(top_srcdir)/etc/distcomps' >> $@
        echo '/%components%/r $(top_srcdir)/etc/components' >> $@
        echo ' s,%components%,,g' >> $@
        echo '/%distcomps%/r $(top_srcdir)/etc/distcomps' >> $@


@@ -473,11 +484,20 @@ endif
 .man.$(manext8):
        $(SED) -f man/man.sed $< > $@
 
 .man.$(manext8):
        $(SED) -f man/man.sed $< > $@
 

+## Don't include commit hashes in ChangeLog.
+ChangeLog:
+       @[ -d .git ]  &&  git --no-pager log --abbrev-commit | \
+           egrep -v '^commit [0-9a-f]+$$' > $@  ||  true
+## Make ChangeLog phony so it will always get regenerated.  But don't
+## fail if we don't have a git repository in order to allow
+## regeneration of distribution archive or RPM.
+.PHONY: ChangeLog
+

 ##
 ## Our RPM build target
 ##
 
 ##
 ## Our RPM build target
 ##
 

-rpm: $(DIST_ARCHIVES)
+rpm: dist

        @test -d $(rpmdir)/SOURCES || $(MKDIR_P) $(rpmdir)/SOURCES
        @test -d $(rpmdir)/SPECS || $(MKDIR_P) $(rpmdir)/SPECS
        @mv -f $(DIST_ARCHIVES) $(rpmdir)/SOURCES
        @test -d $(rpmdir)/SOURCES || $(MKDIR_P) $(rpmdir)/SOURCES
        @test -d $(rpmdir)/SPECS || $(MKDIR_P) $(rpmdir)/SPECS
        @mv -f $(DIST_ARCHIVES) $(rpmdir)/SOURCES


@@ -486,3 +506,12 @@ rpm: $(DIST_ARCHIVES)
        @rpmbuild --define '_topdir $(rpmdir)' \
          --define '_tmppath %{_topdir}/TMP' \
          -ba $(rpmdir)/SPECS/nmh.spec
        @rpmbuild --define '_topdir $(rpmdir)' \
          --define '_tmppath %{_topdir}/TMP' \
          -ba $(rpmdir)/SPECS/nmh.spec

+.PHONY: rpm
+
+##
+## A target to build information needed by cscope
+##
+
+cscope:
+       echo "-I $(srcdir)/h -I $(srcdir)/sbr -I $(srcdir)/uip -I $(srcdir)/mts/smtp" > cscope.files
+       find $(srcdir) \( -name \*.c -o -name \*.l \) -print | grep -v dtimep.c >> cscope.files