always build imap as well.

[apps/madmutt.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bde3f54..fbb9ded 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,22 +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_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-hash lib \
+         pop imap $(NNTP_SUBDIR)
 
 bin_SCRIPTS = muttngbug fleang
 
@@ -39,20 +31,25 @@ 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
 
 
-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-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 \
-       $(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
@@ -64,7 +61,7 @@ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
        -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)