merge crypt back into $top_builddir :)

[apps/madmutt.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c6ab853..2e155df 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ NNTP_SUBDIR = nntp
 endif
 
 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 \
+         lib-lua lib-mime lib-lib lib-mx lib-hash lib-sys lib-ui \
          pop imap $(NNTP_SUBDIR)
 
 BUILT_SOURCES = keymap_defs.h charset.gperf
@@ -18,14 +18,13 @@ DISTCLEANFILES = $(BUILT_SOURCES)
 bin_PROGRAMS = madmutt madmutt_dotlock 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 \
+       compose.c copy.c crypt.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 \
@@ -42,7 +41,6 @@ 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 \
@@ -74,7 +72,7 @@ EXTRA_madmutt_SOURCES = \
 
 EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS TODO \
        configure account.h alias.h attach.h recvattach.h handler.h thread.h \
-       buffy.h charset.h copy.h dotlock.h functions.def gen_defs \
+       buffy.h charset.h copy.h crypt.c dotlock.h functions.def gen_defs \
        recvattach.h handler.h thread.h globals.h init.h keymap.h \
        mime.h mutt.h mutt_sasl.h pager.h protos.h \
        sort.h mime.types autogen.sh remailer.c remailer.h browser.h state.h \