X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=Makefile.am;h=fbb9ded2a1fb8e5df81af4e481a1595e50ce8a64;hb=b8c71f93b0296f815a6538182343ba67e88c0012;hp=9c3ba5d4c9ada7726735fb843d4afd21d788b6b8;hpb=3c3c535e5ed1d651c6024b5acf670e217af473f7;p=apps%2Fmadmutt.git

diff --git a/Makefile.am b/Makefile.am
index 9c3ba5d..fbb9ded 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,28 +4,20 @@
 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
 
 BUILT_SOURCES = keymap_defs.h version.h
 
-bin_PROGRAMS = muttng muttng_dotlock @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
+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 \
@@ -35,23 +27,29 @@ muttng_SOURCES = $(BUILT_SOURCES) \
 	handler.c hcache.c hdrline.c headers.c help.c history.c hook.c \
 	init.c keymap.c lib.c \
 	main.c mbox.c mbyte.c menu.c mh.c muttlib.c mutt_idna.c mx.c \
-	pager.c parse.c pattern.c postpone.c \
-	query.c \
+	pager.c parse.c pattern.c postpone.c query.c \
 	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
+	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
@@ -63,19 +61,17 @@ 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)
 
 EXTRA_muttng_SOURCES = \
 	account.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
-	mutt_tunnel.c smime.c pgp.c pgpinvoke.c pgpkey.c \
+	mutt_tunnel.c pgp.c pgpinvoke.c pgpkey.c \
 	pgplib.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
 	alias.h browser.h enter.h \
 	mbyte.h remailer.h url.h state.h \
-	pgppacket.c mutt_idna.h mutt_libesmtp.c \
-	crypt-mod-pgp-classic.c crypt-mod-smime-classic.c \
-	sidebar.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 \
 	configure acconfig.h \