always build imap as well.

[apps/madmutt.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9322a59..fbb9ded 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,17 +4,14 @@
 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_NNTP
 NNTP_SUBDIR = nntp
 NNTP_INCLUDES = -I$(top_srcdir)/nntp
 endif
 
-SUBDIRS = intl m4 po lib-lib lib-mime lib-hash doc contrib lib pop $(IMAP_SUBDIR) $(NNTP_SUBDIR)
+SUBDIRS = intl m4 po doc contrib \
+         lib-lib lib-mime lib-hash lib \
+         pop imap $(NNTP_SUBDIR)
 
 bin_SCRIPTS = muttngbug fleang
 
@@ -39,16 +36,20 @@ muttng_SOURCES = $(BUILT_SOURCES) \
        crypt-mod-pgp-classic.c smime.c crypt-mod-smime-classic.c
 
 
-muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) -Lpop -lpop $(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-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 \
+                     \
                      $(top_builddir)/pop/libpop.a  \
-       $(LIBIMAPDEPS) $(LIBNNTPDEPS) $(INTLDEPS)
+                     $(top_builddir)/imap/libimap.a \
+                     $(LIBNNTPDEPS) $(INTLDEPS)
 
 makedoc_SOURCES = makedoc.c
 makedoc_LDADD = -Llib-lib -llib