-SUBDIRS = intl m4 po lib-lib lib-mime lib-hash doc contrib lib $(IMAP_SUBDIR) $(POP_SUBDIR) $(NNTP_SUBDIR)
-
-bin_SCRIPTS = muttngbug fleang
-
-BUILT_SOURCES = keymap_defs.h version.h
-
-bin_PROGRAMS = muttng @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
-muttng_SOURCES = $(BUILT_SOURCES) \
- alias.c attach.c base64.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 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 parse.c pattern.c postpone.c \
- query.c \
- recvattach.c recvcmd.c rfc1524.c rfc3676.c \
- score.c send.c sendlib.c sidebar.c signal.c sort.c state.c status.c system.c \
- thread.c \
- url.c utf8.c \
- wcwidth.c
-
-muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(LIBPOP) $(LIBNNTP) \
- -Llib-lib -llib -Llib-mime -lmime -Llib-hash -lhash -Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
-
-muttng_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
- $(top_builddir)/lib-lib/liblib.a \
- $(top_builddir)/lib-mime/libmime.a \
- $(top_builddir)/lib-hash/libhash.a \
- $(top_builddir)/lib/libsane.a \
- $(LIBIMAPDEPS) $(LIBPOPDEPS) $(LIBNNTPDEPS) $(INTLDEPS)
+SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) apidoc contrib tools \
+ lib-mime lib-lib lib-mx lib-crypt lib-hash lib-sys lib-ui \
+ pop imap $(NNTP_SUBDIR)
+
+BUILT_SOURCES = keymap_defs.h version.h charset.gperf rctokens.gperf rcparser.c rcparser.h
+DISTCLEANFILES = $(BUILT_SOURCES)
+
+rcparser.c rcparser.h: rcparser.y
+ $(MAKE) -C tools lemon
+ $(top_builddir)/tools/lemon -s $<
+ touch rcparser.c rcparser.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 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@ \
+ -Llib-mime -lmime -Llib-crypt -lcrypt -Llib-mx -lmx \
+ -Limap -limap -Lpop -lpop $(LIBNNTP) \
+ -Llib-hash -lhash -Llib-sys -lsys -Llib-ui -lui -Llib-lib -llib \
+ $(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-ui/libui.a \
+ $(top_builddir)/lib-mx/libmx.a \
+ \
+ $(top_builddir)/pop/libpop.a \
+ $(top_builddir)/imap/libimap.a \
+ $(LIBNNTPDEPS) $(INTLDEPS)