move the last crypt-* things into lib-crypt, adapt configure.ac

[apps/madmutt.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 93aa896..565cb8a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,19 +10,16 @@ NNTP_INCLUDES = -I$(top_srcdir)/nntp
 endif
 
 SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) contrib \
-         lib-lib lib-mime lib-crypt lib-hash lib \
+         lib-lib lib-mime lib-crypt lib-hash lib-ui 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 \
+       charset.c compress.c commands.c complete.c \
+       compose.c copy.c editmsg.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 \
@@ -36,18 +33,20 @@ madmutt_SOURCES = $(BUILT_SOURCES) \
 madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
               -Limap -limap -Lpop -lpop $(LIBNNTP) \
               -Llib-lib -llib -Llib-mime -lmime -Llib-crypt -lcrypt -Llib-hash -lhash \
+              -Llib-ui -lui \
               -Llib -lsane $(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/libsane.a \
-                     \
-                     $(top_builddir)/pop/libpop.a  \
-                     $(top_builddir)/imap/libimap.a \
-                     $(LIBNNTPDEPS) $(INTLDEPS)
+                      $(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/libsane.a \
+                      \
+                      $(top_builddir)/pop/libpop.a  \
+                      $(top_builddir)/imap/libimap.a \
+                      $(LIBNNTPDEPS) $(INTLDEPS)
 
 makedoc_SOURCES = makedoc.c
 makedoc_LDADD = -Llib-lib -llib
@@ -59,15 +58,14 @@ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
        -DHAVE_CONFIG_H=1 -DPKGDOCDIR=\"$(docdir)\"
 
-INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(NNTP_INCLUDES) $(LIBGPGME_CFLAGS) -Iintl
+INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(NNTP_INCLUDES) $(GPGME_CFLAGS) -Iintl
 
 CPPFLAGS=@CPPFLAGS@ -I$(includedir)
 
 EXTRA_madmutt_SOURCES = \
        account.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
        mutt_tunnel.c resize.c dotlock.c remailer.c \
-       alias.h browser.h enter.h \
-       mbyte.h remailer.h url.h state.h \
+       alias.h browser.h mbyte.h remailer.h url.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 \
@@ -75,18 +73,16 @@ EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
        account.h alias.h attach.h recvattach.h handler.h thread.h \
        buffy.h charset.h compress.h copy.h \
        dotlock.h functions.def gen_defs \
-       enter.h recvattach.h handler.h thread.h \
+       recvattach.h handler.h thread.h \
        globals.h history.h init.h keymap.h mutt_crypt.h \
-       mime.h mutt.h mutt_curses.h mutt_menu.h \
+       mime.h mutt.h mutt_menu.h \
        mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
        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 madmuttrc.head madmuttrc \
        makedoc.c stamp-doc-rc README.SSL smime.h\
-       madmuttbug pgppacket.h depcomp BEWARE \
-       mkchangelog.sh cvslog2changelog.pl mutt_idna.h \
-       regex.c mutt_libesmtp.h crypt-gpgme.h
+       depcomp mutt_idna.h regex.c mutt_libesmtp.h
 
 madmutt_dotlock_SOURCES = dotlock.c
 madmutt_dotlock_LDADD = -Llib-lib -llib @LIBOBJS@
@@ -112,10 +108,6 @@ LDADD = @LIBOBJS@ @LIBINTL@
 
 OPS=@OPS@
 
-fleang:        muttbug.sh
-       cp muttbug.sh fleang
-       chmod +x fleang
-
 smime_keysng: $(srcdir)/smime_keys.pl
        cp $(srcdir)/smime_keys.pl smime_keysng
        chmod +x smime_keysng