AUTOMAKE_OPTIONS = foreign
EXTRA_PROGRAMS = muttng_dotlock pgpringng pgpewrapng makedoc
-if BUILD_IMAP
-IMAP_SUBDIR = imap
-IMAP_INCLUDES = -I$(top_srcdir)/imap
-endif
-
-if BUILD_POP
-POP_SUBDIR = pop
-POP_INCLUDES = -I$(top_srcdir)/pop
-endif
-
if BUILD_NNTP
NNTP_SUBDIR = nntp
NNTP_INCLUDES = -I$(top_srcdir)/nntp
endif
-SUBDIRS = intl m4 po lib-lib lib-mime lib-hash doc contrib lib $(IMAP_SUBDIR) $(POP_SUBDIR) $(NNTP_SUBDIR)
+SUBDIRS = intl m4 po doc contrib \
+ lib-lib lib-mime lib-crypt lib-hash lib \
+ pop imap $(NNTP_SUBDIR)
bin_SCRIPTS = muttngbug fleang
BUILT_SOURCES = keymap_defs.h version.h
-bin_PROGRAMS = muttng muttng_dotlock pgpringng pgpewrapng @SMIMEAUX_TARGET@
+bin_PROGRAMS = muttng muttng_dotlock pgpringng pgpewrapng smime_keysng
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 \
+ 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 parse.c pattern.c postpone.c query.c \
+ pager.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 \
- \
- pgp.c pgpinvoke.c pgpkey.c pgplib.c gnupgparse.c pgpmicalg.c pgppacket.c \
- crypt-mod-pgp-classic.c
-
+ account.c mutt_socket.c mutt_tunnel.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_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
+ -Limap -limap -Lpop -lpop $(LIBNNTP) \
+ -Llib-lib -llib -Llib-mime -lmime -Llib-crypt -lcrypt -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-crypt/libcrypt.a \
$(top_builddir)/lib-hash/libhash.a \
$(top_builddir)/lib/libsane.a \
- $(LIBIMAPDEPS) $(LIBPOPDEPS) $(LIBNNTPDEPS) $(INTLDEPS)
+ \
+ $(top_builddir)/pop/libpop.a \
+ $(top_builddir)/imap/libimap.a \
+ $(LIBNNTPDEPS) $(INTLDEPS)
makedoc_SOURCES = makedoc.c
makedoc_LDADD = -Llib-lib -llib
-DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
-DHAVE_CONFIG_H=1 -DPKGDOCDIR=\"$(docdir)\"
-INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(POP_INCLUDES) $(NNTP_INCLUDES) $(LIBGPGME_CFLAGS) -Iintl
+INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(NNTP_INCLUDES) $(LIBGPGME_CFLAGS) -Iintl
CPPFLAGS=@CPPFLAGS@ -I$(includedir)
EXTRA_muttng_SOURCES = \
account.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
- mutt_tunnel.c smime.c pgp.c pgpinvoke.c pgpkey.c \
- pgplib.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
+ mutt_tunnel.c resize.c dotlock.c remailer.c \
alias.h browser.h enter.h \
mbyte.h remailer.h url.h state.h \
- pgppacket.c mutt_idna.h mutt_libesmtp.c \
- crypt-mod-pgp-classic.c crypt-mod-smime-classic.c \
- sidebar.h state.h
+ mutt_idna.h mutt_libesmtp.c sidebar.h state.h
EXTRA_DIST = config.rpath COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
configure acconfig.h \
globals.h history.h init.h keymap.h mutt_crypt.h \
mime.h mutt.h mutt_curses.h mutt_menu.h \
mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
- mbox.h mh.h mx.h pager.h pgp.h protos.h rfc1524.h \
- rfc3676.h \
- sort.h mime.types autogen.sh \
+ mbox.h mh.h mx.h pager.h protos.h rfc1524.h \
+ rfc3676.h sort.h mime.types autogen.sh \
_regex.h OPS.MIX remailer.c remailer.h browser.h state.h \
mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttngrc.head Muttngrc \
makedoc.c stamp-doc-rc README.SSL smime.h\
muttng_dotlock_LDADD = -Llib-lib -llib @LIBOBJS@
muttng_dotlock_DEPENDENCIES = @LIBOBJS@ $(top_builddir)/lib-lib/liblib.a
-pgpringng_SOURCES = pgppubring.c pgplib.c lib.c extlib.c pgppacket.c
+pgpringng_SOURCES = pgppubring.c lib.c extlib.c
pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) \
- -Llib-lib -llib -Llib-hash -lhash -Llib -lsane
+ -Llib-lib -llib -Llib-hash -lhash -Llib-crypt -lcrypt -Llib -lsane
pgpringng_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS) \
$(top_builddir)/lib-lib/liblib.a \
$(top_builddir)/lib-hash/libhash.a