X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/f3d2f47d97e4660b78e7a1c89abbfe0e6bfaf97d..e0e0c1e0fce54f31e8b126d78a0b364208f7d36f:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7e4395e7..3952da6a 100644
--- 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 = sbr/libmh.a sbr/libdtimep.a
+LDADD = sbr/libmh.a
 
 ##
 ## These are used to create the default mhn.defaults config file
@@ -45,7 +45,7 @@ TESTS_ENVIRONMENT = MH_OBJ_DIR="@abs_builddir@" \
 ##
 TESTS = test/ali/test-ali test/anno/test-anno \
 	test/bad-input/test-header \
-	test/burst/test-burst \
+	test/burst/test-burst test/burst/test-burst-mime \
 	test/comp/test-comp-format test/dist/test-dist \
 	test/folder/test-create test/folder/test-packf \
 	test/folder/test-recurse test/folder/test-sortm \
@@ -93,6 +93,7 @@ DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1
 ## Stuff that should be cleaned via "make clean"
 ##
 CLEANFILES = config/version.c sbr/sigmsg.h 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:
 	@rm -rf RPM a.out.dSYM uip/a.out.dSYM
@@ -116,7 +117,7 @@ superclean: maintainer-clean
 ##
 ## Files that need to be built before everything else
 ##
-BUILT_SOURCES = sbr/sigmsg.h
+BUILT_SOURCES = sbr/sigmsg.h sbr/ctype-checked.c
 
 ##
 ## This is a list of all programs that get installed in the "bin" directory
@@ -142,11 +143,18 @@ auxexec_PROGRAMS = uip/ap uip/conflict uip/dp uip/fmtdump uip/mhl uip/post \
 
 auxexec_SCRIPTS = uip/spost
 
+##
+## Programs that MAY need to get built at some point; we need to list them
+## here if they don't appear in any other primary so Automake knows about
+## them and can properly record dependency information.
+##
+EXTRA_PROGRAMS = etc/gen-ctype-checked
+
 ##
 ## Internal libraries that we create as part of the build process
 ## but do not install
 ##
-noinst_LIBRARIES = sbr/libmh.a sbr/libdtimep.a mts/libmts.a
+noinst_LIBRARIES = sbr/libmh.a mts/libmts.a
 
 ##
 ## These are all of our header files.  Right now we don't install any of
@@ -157,7 +165,7 @@ noinst_HEADERS = h/addrsbr.h h/aliasbr.h h/crawl_folders.h h/dropsbr.h \
 		 h/mh.h h/mhcachesbr.h h/mhparse.h h/mime.h h/msh.h \
 		 h/mts.h h/nmh.h h/picksbr.h h/popsbr.h h/prototypes.h \
 		 h/rcvmail.h h/scansbr.h h/signals.h h/tws.h h/utils.h \
-		 h/vmhsbr.h mts/smtp/smtp.h
+		 h/vmhsbr.h mts/smtp/smtp.h sbr/ctype-checked.h
 
 ##
 ## Extra files we need to install in various places
@@ -259,7 +267,8 @@ uip_ali_SOURCES = uip/ali.c uip/aliasbr.c
 
 uip_anno_SOURCES = uip/anno.c uip/annosbr.c
 
-uip_burst_SOURCES = uip/burst.c
+uip_burst_SOURCES = uip/burst.c uip/mhparse.c uip/mhmisc.c uip/mhfree.c \
+		    uip/mhcachesbr.c uip/md5.c
 
 uip_comp_SOURCES = uip/comp.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
 		   uip/annosbr.c uip/distsbr.c
@@ -413,6 +422,9 @@ test_fakesmtp_LDADD =
 test_getcwidth_SOURCES = test/getcwidth.c
 test_getcwidth_LDADD =
 
+etc_gen_ctype_checked_SOURCES = etc/gen-ctype-checked.c
+etc_gen_ctype_checked_LDADD =
+
 ##
 ## Our rebuild rules for files that aren't built via the normal mechanisms
 ##
@@ -422,6 +434,11 @@ config/version.c: Makefile
 sbr/sigmsg.h: $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H)
 	$(AWK) -f $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H) > $@
 
+sbr/ctype-checked.h: etc/gen-ctype-checked
+	etc/gen-ctype-checked
+
+sbr/ctype-checked.c: etc/gen-ctype-checked sbr/ctype-checked.h
+
 etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
 	@rm -f $@
 	$(SED) -e 's,%mts%,$(MTS),' \
@@ -486,7 +503,8 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.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/escape_addresses.c \
+		      sbr/done.c sbr/dtimep.l sbr/dtime.c \
+		      sbr/escape_addresses.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 \
@@ -512,7 +530,7 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \
 		      sbr/showfile.c sbr/signals.c sbr/smatch.c \
 		      sbr/snprintb.c sbr/ssequal.c sbr/strcasecmp.c \
 		      sbr/strindex.c sbr/trimcpy.c sbr/uprf.c sbr/vfgets.c \
-		      sbr/fmt_def.c sbr/mf.c sbr/utils.c \
+		      sbr/fmt_def.c sbr/mf.c sbr/utils.c sbr/ctype-checked.c \
 		      sbr/m_mktemp.c sbr/getansreadline.c config/config.c \
 		      config/version.c
 
@@ -521,10 +539,6 @@ sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \
 		-DSENDMAILPATH='"$(sendmailpath)"' -DNMHBINDIR='"$(bindir)"' \
 		-DNMHLIBDIR='"$(libdir)"'
 
-sbr_libdtimep_a_SOURCES = sbr/dtimep.l
-sbr_libdtimep_a_CFLAGS = $(sbr_libmh_a_CPPFLAGS) \
-			 $(DISABLE_SIGN_COMPARE_WARNING)
-
 mts_libmts_a_SOURCES = mts/smtp/smtp.c
 
 ##