reorganize code a lot: create a lib-crypt with everything smime or gpg

[apps/madmutt.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fbb9ded..a0cf9fe 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ NNTP_INCLUDES = -I$(top_srcdir)/nntp
 endif
 
 SUBDIRS = intl m4 po doc contrib \
-         lib-lib lib-mime lib-hash lib \
+         lib-lib lib-mime lib-crypt lib-hash lib \
          pop imap $(NNTP_SUBDIR)
 
 bin_SCRIPTS = muttngbug fleang
@@ -20,8 +20,8 @@ BUILT_SOURCES = keymap_defs.h version.h
 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 \
+       charset.c color.c compress.c commands.c complete.c \
+       compose.c copy.c curs_lib.c curs_main.c \
        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 \
@@ -31,19 +31,17 @@ muttng_SOURCES = $(BUILT_SOURCES) \
        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 \
-       account.c mutt_socket.c mutt_tunnel.c \
-       pgp.c pgpinvoke.c pgpkey.c pgplib.c gnupgparse.c pgpmicalg.c pgppacket.c \
-       crypt-mod-pgp-classic.c smime.c crypt-mod-smime-classic.c
-
+       account.c mutt_socket.c mutt_tunnel.c
 
 muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
               -Limap -limap -Lpop -lpop $(LIBNNTP) \
-              -Llib-lib -llib -Llib-mime -lmime -Llib-hash -lhash \
+              -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 \
                      \
@@ -67,8 +65,7 @@ CPPFLAGS=@CPPFLAGS@ -I$(includedir)
 
 EXTRA_muttng_SOURCES = \
        account.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
-       mutt_tunnel.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 \
        mutt_idna.h mutt_libesmtp.c sidebar.h state.h
@@ -82,9 +79,8 @@ EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
        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\
@@ -96,9 +92,9 @@ muttng_dotlock_SOURCES = dotlock.c
 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