-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
-
-bin_SCRIPTS = muttbug flea
-
-BUILT_SOURCES = keymap_defs.h patchlist.c
-
-bin_PROGRAMS = muttng @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
-muttng_SOURCES = $(BUILT_SOURCES) \
- addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
- compress.c crypt.c cryptglue.c \
- commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \
- edit.c enter.c flags.c init.c filter.c from.c getdomain.c \
- handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \
- main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c \
- postpone.c query.c recvattach.c recvcmd.c \
- rfc822.c rfc1524.c rfc2047.c rfc2231.c \
- score.c send.c sendlib.c signal.c sort.c \
- status.c system.c thread.c charset.c history.c lib.c \
- muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c \
- url.c ascii.c mutt_idna.c sidebar.c hcache.c
-
-muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
- $(INTLLIBS) $(LIBICONV)
-
-muttng_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAPDEPS) \
- $(INTLDEPS)
+SUBDIRS = tools intl m4 po $(XXXXXXXXXXXX_doc) apidoc contrib \
+ lib-lua lib-mime lib-lib lib-mx lib-crypt lib-hash lib-sys lib-ui \
+ pop imap $(NNTP_SUBDIR)
+
+BUILT_SOURCES = keymap_defs.h charset.gperf
+DISTCLEANFILES = $(BUILT_SOURCES)
+
+bin_PROGRAMS = madmutt madmutt_dotlock pgpringng pgpewrapng smime_keysng
+madmutt_SOURCES = $(BUILT_SOURCES) \
+ alias.c attach.c base64.c browser.c buffy.c charset.c commands.c \
+ compose.c copy.c editmsg.c init.c keymap.c lib.c \
+ flags.c from.c handler.c headers.c help.c hook.c \
+ main.c muttlib.c mutt_idna.c pager.c pattern.c postpone.c recvattach.c recvcmd.c \
+ score.c send.c sendlib.c sort.c state.c thread.c account.c remailer.c
+
+madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
+ $(top_builddir)/lib-mime/libmime.a \
+ $(top_builddir)/lib-crypt/libcrypt.a \
+ $(top_builddir)/lib-mx/libmx.a \
+ $(top_builddir)/imap/libimap.a \
+ $(top_builddir)/pop/libpop.a \
+ $(LIBNNTP) \
+ $(top_builddir)/lib-hash/libhash.a \
+ $(top_builddir)/lib-sys/libsys.a \
+ $(top_builddir)/lib-ui/libui.a \
+ $(top_builddir)/lib-lua/liblua.a \
+ $(top_builddir)/lib-lib/liblib.a \
+ $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
+
+madmutt_DEPENDENCIES = \
+ \
+ @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
+ $(top_builddir)/lib-lib/liblib.a \
+ $(top_builddir)/lib-mime/libmime.a \
+ $(top_builddir)/lib-crypt/libcrypt.a \
+ $(top_builddir)/lib-hash/libhash.a \
+ $(top_builddir)/lib-sys/libsys.a \
+ $(top_builddir)/lib-ui/libui.a \
+ $(top_builddir)/lib-lua/liblua.a \
+ $(top_builddir)/lib-mx/libmx.a \
+ \
+ $(top_builddir)/pop/libpop.a \
+ $(top_builddir)/imap/libimap.a \
+ $(LIBNNTPDEPS) $(INTLDEPS)