X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.am;h=6ee39c982ba163328abb020bf9d6b93b459f2aa1;hp=ed8d66718fc937b11e8a858ac3b2e6cdb9cb5edb;hb=8cf8034a805e70fb34b170e9ceefdf99a2797e60;hpb=dbacadf0ce81052365d7a43373ac7d4ac67ff91e

diff --git a/Makefile.am b/Makefile.am
index ed8d667..6ee39c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,20 +13,17 @@ SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) contrib \
 	  lib-mime lib-lib lib-crypt lib-hash lib-sys lib-ui lib \
 	  pop imap $(NNTP_SUBDIR)
 
-BUILT_SOURCES = keymap_defs.h version.h
+BUILT_SOURCES = keymap_defs.h version.h charset.gperf
+DISTCLEANFILES = $(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 compress.c commands.c complete.c  \
+	alias.c attach.c base64.c browser.c buffy.c charset.c compress.c commands.c \
 	compose.c copy.c editmsg.c init.c keymap.c lib.c \
-	flags.c filter.c from.c getdomain.c \
-	handler.c hcache.c hdrline.c headers.c help.c history.c hook.c \
-	main.c mbox.c mbyte.c mh.c muttlib.c mutt_idna.c mx.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 sort.c state.c status.c system.c \
-	thread.c url.c utf8.c wcwidth.c account.c
+	flags.c from.c handler.c hcache.c headers.c help.c hook.c \
+	main.c mbox.c mh.c muttlib.c mutt_idna.c mx.c \
+	pager.c pattern.c postpone.c recvattach.c recvcmd.c \
+	score.c send.c sendlib.c sort.c state.c thread.c account.c
 
 madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
 	       -Limap -limap -Lpop -lpop $(LIBNNTP) \
@@ -61,22 +58,18 @@ INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(NNTP_INCLUDES) $(GPGME_CFLAGS) -
 CPPFLAGS=@CPPFLAGS@ -I$(includedir)
 
 EXTRA_madmutt_SOURCES = \
-	account.c mutt_sasl.c resize.c dotlock.c remailer.c \
-	alias.h browser.h mbyte.h remailer.h url.h state.h \
-	mutt_idna.h mutt_libesmtp.c sidebar.h state.h
+	account.c mutt_sasl.c dotlock.c remailer.c \
+	alias.h browser.h remailer.h state.h \
+	mutt_idna.h mutt_libesmtp.c state.h
 
-EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
+EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.MIX TODO \
 	configure account.h alias.h attach.h recvattach.h handler.h thread.h \
-	buffy.h charset.h compress.h copy.h \
-	dotlock.h functions.def gen_defs \
-	recvattach.h handler.h thread.h \
-	globals.h history.h init.h keymap.h mutt_crypt.h \
-	mime.h mutt.h mutt_sasl.h mbox.h mh.h mx.h pager.h protos.h rfc1524.h \
-	rfc3676.h sort.h mime.types autogen.sh \
-	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\
-	depcomp mutt_idna.h mutt_libesmtp.h
+	buffy.h charset.h compress.h copy.h dotlock.h functions.def gen_defs \
+	recvattach.h handler.h thread.h globals.h init.h keymap.h \
+	mime.h mutt.h mutt_sasl.h mbox.h mh.h mx.h pager.h protos.h \
+	sort.h mime.types autogen.sh remailer.c remailer.h browser.h state.h \
+	lib.h extlib.c pgpewrap.c smime_keys.pl Madmuttrc.head Madmuttrc \
+	makedoc.c stamp-doc-rc README.SSL depcomp mutt_idna.h mutt_libesmtp.h
 
 madmutt_dotlock_SOURCES = dotlock.c
 madmutt_dotlock_LDADD = -Llib-lib -llib @LIBOBJS@
@@ -102,19 +95,20 @@ LDADD = @LIBOBJS@ @LIBINTL@
 
 OPS=@OPS@
 
+charset.gperf: charset.def
+	sh $< > $@
+
 smime_keysng: $(srcdir)/smime_keys.pl
 	cp $(srcdir)/smime_keys.pl smime_keysng
 	chmod +x smime_keysng
 
 Makefile: $(BUILT_SOURCES)
 
-keymap_defs.h: $(OPS) $(srcdir)/gen_defs
-	$(srcdir)/gen_defs $(OPS) > keymap_defs.h
+keymap_defs.h: $(OPS)
+	$(srcdir)/gen_defs $^ > keymap_defs.h
 
-keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME $(srcdir)/gen_defs
-	$(srcdir)/gen_defs $(srcdir)/OPS $(srcdir)/OPS.PGP \
-		$(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \
-			> keymap_alldefs.h
+keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.MIX
+	$(srcdir)/gen_defs $^ > keymap_alldefs.h
 
 version.h:
 	echo "#define MUTT_REVISION \"git\"" > version.h
@@ -165,3 +159,6 @@ stamp-doc-rc: $(srcdir)/init.h makedoc madmuttrc.head
 
 
 -include cflags.mk
+
+wc:
+	@sloccount $(wildcard *.h *.c) $(wildcard lib-*/) lib imap nntp pop | grep 'ansic[=:]'