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

diff --git a/Makefile.am b/Makefile.am
index a0cf9fe..0c900a5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,52 +2,50 @@
 ## Use aclocal -I m4; automake --foreign
 
 AUTOMAKE_OPTIONS = foreign
-EXTRA_PROGRAMS = muttng_dotlock pgpringng pgpewrapng makedoc
+EXTRA_PROGRAMS = madmutt_dotlock pgpringng pgpewrapng makedoc
 
 if BUILD_NNTP
 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 = muttngbug fleang
-
 BUILT_SOURCES = keymap_defs.h version.h
 
-bin_PROGRAMS = muttng muttng_dotlock pgpringng pgpewrapng smime_keysng
-muttng_SOURCES = $(BUILT_SOURCES) \
+bin_PROGRAMS = madmutt madmutt_dotlock pgpringng pgpewrapng smime_keysng
+madmutt_SOURCES = $(BUILT_SOURCES) \
 	alias.c attach.c base64.c browser.c buffy.c \
 	charset.c color.c compress.c commands.c complete.c \
 	compose.c copy.c curs_lib.c curs_main.c \
-	date.c edit.c editmsg.c enter.c \
+	editmsg.c enter.c \
 	flags.c filter.c from.c getdomain.c \
 	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 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 \
 	account.c mutt_socket.c mutt_tunnel.c
 
-muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
+madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
 	       -Limap -limap -Lpop -lpop $(LIBNNTP) \
 	       -Llib-lib -llib -Llib-mime -lmime -Llib-crypt -lcrypt -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-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)
+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)
 
 makedoc_SOURCES = makedoc.c
 makedoc_LDADD = -Llib-lib -llib
@@ -59,11 +57,11 @@ 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)
 
-EXTRA_muttng_SOURCES = \
+EXTRA_madmutt_SOURCES = \
 	account.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
 	mutt_tunnel.c resize.c dotlock.c remailer.c \
 	alias.h browser.h enter.h \
@@ -82,15 +80,13 @@ EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
 	mbox.h mh.h mx.h pager.h protos.h rfc1524.h \
 	rfc3676.h sort.h mime.types autogen.sh \
 	_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 Muttngrc.head Muttngrc \
+	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\
-	muttngbug 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
 
-muttng_dotlock_SOURCES = dotlock.c
-muttng_dotlock_LDADD = -Llib-lib -llib @LIBOBJS@
-muttng_dotlock_DEPENDENCIES = @LIBOBJS@ $(top_builddir)/lib-lib/liblib.a
+madmutt_dotlock_SOURCES = dotlock.c
+madmutt_dotlock_LDADD = -Llib-lib -llib @LIBOBJS@
+madmutt_dotlock_DEPENDENCIES = @LIBOBJS@ $(top_builddir)/lib-lib/liblib.a
 
 pgpringng_SOURCES = pgppubring.c lib.c extlib.c
 pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) \
@@ -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
@@ -134,27 +126,27 @@ version.h:
 	echo "#define MUTT_REVISION \"git\"" > version.h
 
 install-exec-hook:
-	if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/muttng_dotlock ; then	\
+	if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/madmutt_dotlock ; then	\
 		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
-		ln -sf $(DESTDIR)$(bindir)/muttng_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
+		ln -sf $(DESTDIR)$(bindir)/madmutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
 	fi
-	if test -f $(DESTDIR)$(bindir)/muttng_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
-		chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/muttng_dotlock && \
-		chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/muttng_dotlock || \
-		{ echo "Can't fix muttng_dotlock's permissions!" >&2 ; } \
+	if test -f $(DESTDIR)$(bindir)/madmutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
+		chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/madmutt_dotlock && \
+		chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/madmutt_dotlock || \
+		{ echo "Can't fix madmutt_dotlock's permissions!" >&2 ; } \
 	fi
 
-install-data-local: Muttngrc
+install-data-local: madmuttrc
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
-	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttngrc ] ; then \
-		mv $(DESTDIR)$(pkgdatadir)/Muttngrc* $(DESTDIR)$(sysconfdir) ; \
-	elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttngrc ] ; then \
-	 	mv $(DESTDIR)$(pkgdatadir)/../Muttngrc* $(DESTDIR)$(sysconfdir) ; \
-	elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttngrc ] ; then \
-		$(INSTALL) -m 644 Muttngrc $(DESTDIR)$(sysconfdir) ; \
+	-if [ -f $(DESTDIR)$(pkgdatadir)/madmuttrc ] ; then \
+		mv $(DESTDIR)$(pkgdatadir)/madmuttrc* $(DESTDIR)$(sysconfdir) ; \
+	elif [ -f $(DESTDIR)$(pkgdatadir)/../madmuttrc ] ; then \
+	 	mv $(DESTDIR)$(pkgdatadir)/../madmuttrc* $(DESTDIR)$(sysconfdir) ; \
+	elif [ ! -f $(DESTDIR)$(sysconfdir)/madmuttrc ] ; then \
+		$(INSTALL) -m 644 madmuttrc $(DESTDIR)$(sysconfdir) ; \
 	fi
-	-if [ ! -f $(DESTDIR)$(sysconfdir)/muttng-mime.types ]; then \
-		$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/muttng-mime.types; \
+	-if [ ! -f $(DESTDIR)$(sysconfdir)/madmutt-mime.types ]; then \
+		$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/madmutt-mime.types; \
 	fi
 
 
@@ -169,12 +161,12 @@ mutt-dist:
 update-doc: stamp-doc-rc
 	(cd doc && $(MAKE) update-doc)
 
-Muttngrc: stamp-doc-rc
+madmuttrc: stamp-doc-rc
 
-stamp-doc-rc: $(srcdir)/init.h makedoc Muttngrc.head
-	-rm -f Muttngrc stamp-doc-rc
+stamp-doc-rc: $(srcdir)/init.h makedoc madmuttrc.head
+	-rm -f madmuttrc stamp-doc-rc
 	$(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \
-		$(srcdir)/init.h | ./makedoc -c | cat Muttngrc.head - > Muttngrc
+		$(srcdir)/init.h | ./makedoc -c | cat madmuttrc.head - > madmuttrc
 	touch stamp-doc-rc