-SUBDIRS = m4 po intl doc contrib lib $(IMAP_SUBDIR) $(POP_SUBDIR) $(NNTP_SUBDIR)
-
-bin_SCRIPTS = muttngbug fleang
-
-BUILT_SOURCES = keymap_defs.h patchlist.c version.h
-
-bin_PROGRAMS = muttng @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
-muttng_SOURCES = $(BUILT_SOURCES) \
- alias.c ascii.c attach.c \
- base64.c buffer.c browser.c buffy.c \
- charset.c color.c compress.c crypt.c cryptglue.c commands.c complete.c \
- compose.c copy.c curs_lib.c curs_main.c crypt-mod.c crypt-mod.h \
- date.c \
- edit.c editmsg.c enter.c \
- flags.c filter.c from.c \
- getdomain.c \
- handler.c hash.c hcache.c hdrline.c headers.c help.c history.c hook.c \
- init.c \
- keymap.c \
- lib.c list.c \
- main.c mbox.c mbyte.c md5c.c menu.c mh.c muttlib.c mutt_idna.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 rfc3676.c \
+SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) contrib \
+ lib-lib lib-mime lib-crypt lib-hash lib \
+ pop imap $(NNTP_SUBDIR)
+
+bin_SCRIPTS = madmuttbug fleang
+
+BUILT_SOURCES = keymap_defs.h version.h
+
+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 color.c compress.c commands.c complete.c \
+ compose.c copy.c curs_lib.c curs_main.c \
+ editmsg.c enter.c \
+ flags.c filter.c from.c getdomain.c \
+ handler.c hcache.c hdrline.c headers.c help.c history.c hook.c \
+ init.c keymap.c lib.c \
+ main.c mbox.c mbyte.c menu.c mh.c muttlib.c mutt_idna.c mx.c \
+ pager.c pattern.c postpone.c query.c \
+ recvattach.c recvcmd.c rfc1524.c rfc3676.c \