X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.am;h=a71cd55f8da0009c438436bc315054de697f5cfb;hp=45bfa784825a8f665fa992741518887a07298a96;hb=68a42bf9a3ce1a00e302112c01df22c3a29d24ac;hpb=8b7093aff990803877b20e86826f0693817cbcaf

diff --git a/Makefile.am b/Makefile.am
index 45bfa78..a71cd55 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,27 +23,36 @@ SUBDIRS = m4 po intl doc contrib lib $(IMAP_SUBDIR) $(POP_SUBDIR) $(NNTP_SUBDIR)
 
 bin_SCRIPTS = muttngbug fleang
 
-BUILT_SOURCES = keymap_defs.h patchlist.c
+BUILT_SOURCES = keymap_defs.h patchlist.c svnrev.h
 
 bin_PROGRAMS = muttng @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
 muttng_SOURCES = $(BUILT_SOURCES) \
-	addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
-	compress.c crypt.c cryptglue.c \
-	commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \
-	edit.c enter.c flags.c init.c filter.c from.c getdomain.c \
-	handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \
-	main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c \
-	postpone.c query.c recvattach.c recvcmd.c \
-	rfc822.c rfc1524.c rfc2047.c rfc2231.c \
-	score.c send.c sendlib.c signal.c sort.c \
-	status.c system.c thread.c charset.c history.c lib.c \
-	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
+	alias.c ascii.c attach.c \
+	base64.c buffer.c browser.c buffy.c \
+	charset.c color.c compress.c crypt.c cryptglue.c commands.c complete.c \
+	compose.c copy.c curs_lib.c curs_main.c crypt-mod.c crypt-mod.h \
+	date.c \
+	edit.c editmsg.c enter.c \
+	flags.c filter.c from.c \
+	getdomain.c \
+	handler.c hash.c hcache.c hdrline.c headers.c help.c history.c hook.c \
+	init.c \
+	keymap.c \
+	lib.c list.c \
+	main.c mbox.c mbyte.c md5c.c menu.c mh.c muttlib.c mutt_idna.c mx.c \
+	pager.c parse.c pattern.c postpone.c \
+	query.c \
+	recvattach.c recvcmd.c rfc822.c rfc1524.c rfc2047.c rfc2231.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 \
+	xterm.c
 
 muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(LIBPOP) $(LIBNNTP) \
 	-Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
 
-muttng_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(top_srcdir)/lib/libsane.a \
+muttng_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(top_builddir)/lib/libsane.a \
 	$(LIBIMAPDEPS) $(LIBPOPDEPS) $(LIBNNTPDEPS) $(INTLDEPS)
 
 makedoc_SOURCES = makedoc.c
@@ -67,28 +76,37 @@ INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(POP_INCLUDES) $(NNTP_INCLUDES) $
 
 CPPFLAGS=@CPPFLAGS@ -I$(includedir)
 
-
-EXTRA_muttng_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
+EXTRA_muttng_SOURCES = \
+	account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.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 \
+	alias.h \
+	buffer.h browser.h \
+	enter.h \
+	list.h \
+	mbyte.h remailer.h url.h state.h \
 	pgppacket.c mutt_idna.h mutt_libesmtp.c \
-	sidebar.h crypt-mod-pgp-classic.c crypt-mod-smime-classic.c
+	crypt-mod-pgp-classic.c crypt-mod-smime-classic.c \
+	sidebar.h state.h
 
 EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
-	configure acconfig.h account.h \
-	compress.h \
-	attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \
+	configure acconfig.h \
+	account.h alias.h attach.h recvattach.h handler.h thread.h \
+	buffer.h buffy.h \
+	charset.h compress.h copy.h crypthash.h \
+	dotlock.h functions.h gen_defs \
+	enter.h recvattach.h handler.h thread.h \
+	list.h \
 	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 protos.h reldate.h rfc1524.h rfc2047.h \
-	rfc2231.h rfc822.h sha1.h sort.h mime.types VERSION prepare \
-	_regex.h OPS.MIX README.SECURITY remailer.c remailer.h browser.h \
-	mbyte.h	lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttngrc.head Muttngrc \
+	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 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 \
 	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 \
+	mkchangelog.sh cvslog2changelog.pl mutt_idna.h \
 	snprintf.c regex.c mutt_libesmtp.h crypt-gpgme.h
 
 muttng_dotlock_SOURCES = mutt_dotlock.c
@@ -107,7 +125,7 @@ mutt_dotlock.c: dotlock.c
 	cp $(srcdir)/dotlock.c mutt_dotlock.c
 
 CLEANFILES = mutt_dotlock.c stamp-doc-rc makedoc \
-	keymap_alldefs.h keymap_defs.h patchlist.c
+	keymap_alldefs.h keymap_defs.h patchlist.c svnrev.h
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -133,13 +151,20 @@ keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/OP
 		$(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \
 			> keymap_alldefs.h
 
+svnrev.h:
+	if test -f "$(srcdir)/.svn/entries" ; then \
+	  echo "#define MUTTNG_SVNREV \"r`grep revision $(srcdir)/.svn/entries | sort -r | uniq | head -n 1 | cut -d '"' -f 2`\"" > svnrev.h ; \
+	else \
+	  echo "#define MUTTNG_SVNREV \"`date "+%Y%m%d"`\"" > svnrev.h ; \
+	fi
+
 reldate:
 	echo 'const char *ReleaseDate = "'`date +%Y-%m-%d`'";' > $(srcdir)/reldate.h
 
 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 ; \
@@ -147,7 +172,7 @@ install-exec-local:
 	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 ; exit 1 ; } \
+		{ echo "Can't fix muttng_dotlock's permissions!" >&2 ; } \
 	fi
 
 install-data-local: Muttngrc
@@ -157,7 +182,7 @@ install-data-local: Muttngrc
 	elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttngrc ] ; then \
 	 	mv $(DESTDIR)$(pkgdatadir)/../Muttngrc* $(DESTDIR)$(sysconfdir) ; \
 	elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttngrc ] ; then \
-		$(INSTALL) -m 644 $(srcdir)/Muttngrc $(DESTDIR)$(sysconfdir) ; \
+		$(INSTALL) -m 644 Muttngrc $(DESTDIR)$(sysconfdir) ; \
 	fi
 	-if [ ! -f $(DESTDIR)$(sysconfdir)/muttng-mime.types ]; then \
 		$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/muttng-mime.types; \