X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.am;h=8fae87c6d3a721ab4c21f4ce93dd9c13e053f275;hp=65dfb28469b4af5e6e78284f84be0037063bf5a2;hb=03ecb7c70bd09a8302212ed3e7f94f9a7b14d099;hpb=f404a0ca916be07049af51a3022baaaaab94def6

diff --git a/Makefile.am b/Makefile.am
index 65dfb28..8fae87c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,14 +2,24 @@
 ## Use aclocal -I m4; automake --foreign
 
 AUTOMAKE_OPTIONS = foreign
-EXTRA_PROGRAMS = muttng_dotlock pgpring makedoc
+EXTRA_PROGRAMS = muttng_dotlock pgpringng pgpewrapng makedoc
 
 if BUILD_IMAP
 IMAP_SUBDIR = imap
 IMAP_INCLUDES = -I$(top_srcdir)/imap
 endif
 
-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
+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 = m4 po intl doc contrib lib $(IMAP_SUBDIR) $(POP_SUBDIR) $(NNTP_SUBDIR)
 
 bin_SCRIPTS = muttngbug fleang
 
@@ -30,11 +40,11 @@ muttng_SOURCES = $(BUILT_SOURCES) \
 	muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c md5c.c \
 	url.c ascii.c mutt_idna.c sidebar.c hcache.c crypt-mod.c crypt-mod.h
 
-muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
-	$(INTLLIBS) $(LIBICONV)
+muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(LIBPOP) $(LIBNNTP) \
+	-Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
 
-muttng_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAPDEPS) \
-	$(INTLDEPS)
+muttng_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(top_builddir)/lib/libsane.a \
+	$(LIBIMAPDEPS) $(LIBPOPDEPS) $(LIBNNTPDEPS) $(INTLDEPS)
 
 makedoc_SOURCES = makedoc.c
 makedoc_LDADD =
@@ -53,16 +63,16 @@ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
 	-DHAVE_CONFIG_H=1
 
-INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(LIBGPGME_CFLAGS) -Iintl
+INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(POP_INCLUDES) $(NNTP_INCLUDES) $(LIBGPGME_CFLAGS) -Iintl
 
 CPPFLAGS=@CPPFLAGS@ -I$(includedir)
 
 
 EXTRA_muttng_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
-	mutt_tunnel.c pop.c pop_auth.c pop_lib.c smime.c pgp.c pgpinvoke.c pgpkey.c \
+	mutt_tunnel.c smime.c pgp.c pgpinvoke.c pgpkey.c \
 	pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
 	browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c \
-	pgppacket.c mutt_idna.h nntp.c newsrc.c mutt_libesmtp.c \
+	pgppacket.c mutt_idna.h mutt_libesmtp.c \
 	sidebar.h crypt-mod-pgp-classic.c crypt-mod-smime-classic.c
 
 EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
@@ -70,25 +80,28 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
 	compress.h \
 	attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \
 	globals.h hash.h history.h init.h keymap.h mutt_crypt.h \
-	mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \
-	mutt_regex.h mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
-	mx.h pager.h pgp.h pop.h protos.h reldate.h rfc1524.h rfc2047.h \
+	mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \
+	mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
+	mbox.h mh.h mx.h pager.h pgp.h protos.h reldate.h rfc1524.h rfc2047.h \
 	rfc2231.h rfc822.h sha1.h sort.h mime.types VERSION prepare \
-	nntp.h ChangeLog.nntp \
-	_regex.h OPS.MIX README.SECURITY remailer.c remailer.h browser.h \
+	_regex.h OPS.MIX remailer.c remailer.h browser.h \
 	mbyte.h	lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttngrc.head Muttngrc \
 	makedoc.c stamp-doc-rc README.SSL smime.h\
 	muttngbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh	\
 	ChangeLog.old mkchangelog.sh cvslog2changelog.pl mutt_idna.h \
-	snprintf.c regex.c mutt_libesmtp.h
+	snprintf.c regex.c mutt_libesmtp.h crypt-gpgme.h
 
 muttng_dotlock_SOURCES = mutt_dotlock.c
 muttng_dotlock_LDADD = @LIBOBJS@
 muttng_dotlock_DEPENDENCIES = @LIBOBJS@
 
-pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5c.c pgppacket.c ascii.c
-pgpring_LDADD = @LIBOBJS@ $(INTLLIBS) 
-pgpring_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
+pgpringng_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5c.c pgppacket.c ascii.c
+pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) -Llib -lsane
+pgpringng_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
+
+pgpewrapng_SOURCES = pgpewrap.c
+pgpewrapng_LDADD = 
+pgpewrapng_DEPENDENCIES = 
 
 mutt_dotlock.c: dotlock.c
 	cp $(srcdir)/dotlock.c mutt_dotlock.c
@@ -106,9 +119,9 @@ fleang:	muttbug.sh
 	cp muttbug.sh fleang
 	chmod +x fleang
 
-smime_keys: $(srcdir)/smime_keys.pl
-	cp $(srcdir)/smime_keys.pl smime_keys
-	chmod +x smime_keys
+smime_keysng: $(srcdir)/smime_keys.pl
+	cp $(srcdir)/smime_keys.pl smime_keysng
+	chmod +x smime_keysng
 
 Makefile: $(BUILT_SOURCES)
 
@@ -126,7 +139,7 @@ reldate:
 patchlist.c: $(srcdir)/PATCHES $(srcdir)/patchlist.sh
 	$(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c
 
-install-exec-local:
+install-exec-hook:
 	if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/muttng_dotlock ; then	\
 		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
 		ln -sf $(DESTDIR)$(bindir)/muttng_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
@@ -146,8 +159,8 @@ install-data-local: Muttngrc
 	elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttngrc ] ; then \
 		$(INSTALL) -m 644 $(srcdir)/Muttngrc $(DESTDIR)$(sysconfdir) ; \
 	fi
-	-if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
-		$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
+	-if [ ! -f $(DESTDIR)$(sysconfdir)/muttng-mime.types ]; then \
+		$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/muttng-mime.types; \
 	fi