X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.am;h=0c900a59821ba18fd1aab2c48f61d85765b14f49;hp=7a71e987e8d5a3c93904d468c75469a697899fe6;hb=801673291bea7eb323063711349a820f6ea34bff;hpb=ab4e61871dafd1556fcbff220f01efd817beb3d0

diff --git a/Makefile.am b/Makefile.am
index 7a71e98..0c900a5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,12 +9,10 @@ NNTP_SUBDIR = nntp
 NNTP_INCLUDES = -I$(top_srcdir)/nntp
 endif
 
-SUBDIRS = intl m4 po doc contrib \
+SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) contrib \
 	  lib-lib lib-mime lib-crypt lib-hash 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
@@ -39,15 +37,15 @@ madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
 	       -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/libsane.a \
+		       \
+		       $(top_builddir)/pop/libpop.a  \
+		       $(top_builddir)/imap/libimap.a \
+		       $(LIBNNTPDEPS) $(INTLDEPS)
 
 makedoc_SOURCES = makedoc.c
 makedoc_LDADD = -Llib-lib -llib
@@ -59,7 +57,7 @@ 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)
 
@@ -84,9 +82,7 @@ EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
 	_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 crypt-gpgme.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