X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.am;h=f849c941204c4b42aa247a4448659a60da5ed068;hp=019fa53b32cfbd0eb07695f77952dca2ee1123e7;hb=338946f4597bd0f4bc2510a4fef1527f2d526c23;hpb=666a29207bb781f47ec85f6a3c3cdeb554b30c21

diff --git a/Makefile.am b/Makefile.am
index 019fa53..f849c94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,14 +23,14 @@ 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 version.h
 
 bin_PROGRAMS = muttng @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
 muttng_SOURCES = $(BUILT_SOURCES) \
 	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 \
+	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 \
@@ -38,12 +38,12 @@ muttng_SOURCES = $(BUILT_SOURCES) \
 	handler.c hash.c hcache.c hdrline.c headers.c help.c history.c hook.c \
 	init.c \
 	keymap.c \
-	lib.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 status.c system.c \
+	recvattach.c recvcmd.c rfc822.c rfc1524.c rfc2047.c rfc2231.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 \
@@ -82,22 +82,28 @@ EXTRA_muttng_SOURCES = \
 	pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
 	alias.h \
 	buffer.h browser.h \
-	mbyte.h remailer.h url.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 alias.h attach.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 \
 	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 \
+	rfc2231.h rfc822.h rfc3676.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	\
@@ -120,7 +126,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 version.h
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -146,6 +152,10 @@ 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
 
+version.h: $(srcdir)/VERSION.svn
+	echo "#undef MUTT_VERSION" > version.h
+	echo "#define MUTT_VERSION \"`cat $(srcdir)/VERSION.in`-r`cat $(srcdir)/VERSION.svn`\"" >> version.h
+
 reldate:
 	echo 'const char *ReleaseDate = "'`date +%Y-%m-%d`'";' > $(srcdir)/reldate.h
 
@@ -160,7 +170,7 @@ install-exec-hook:
 	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