X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.am;h=6ee39c982ba163328abb020bf9d6b93b459f2aa1;hp=93aa89628e194e726684651912e0a8415b981f1f;hb=8cf8034a805e70fb34b170e9ceefdf99a2797e60;hpb=096b7d36c872305692c0916be4d39699265959ee diff --git a/Makefile.am b/Makefile.am index 93aa896..6ee39c9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,44 +10,38 @@ NNTP_INCLUDES = -I$(top_srcdir)/nntp endif SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) contrib \ - lib-lib lib-mime lib-crypt lib-hash lib \ + lib-mime lib-lib lib-crypt lib-hash lib-sys lib-ui lib \ pop imap $(NNTP_SUBDIR) -bin_SCRIPTS = madmuttbug fleang - -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 color.c compress.c commands.c complete.c \ - compose.c copy.c curs_lib.c curs_main.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 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 + 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 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) \ -Llib-lib -llib -Llib-mime -lmime -Llib-crypt -lcrypt -Llib-hash -lhash \ + -Llib-sys -lsys -Llib-ui -lui \ -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-ui/libui.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,34 +53,23 @@ 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_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 \ - mbyte.h remailer.h url.h state.h \ - mutt_idna.h mutt_libesmtp.c sidebar.h state.h - -EXTRA_DIST = config.rpath COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \ - configure acconfig.h \ - 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 \ - enter.h recvattach.h handler.h thread.h \ - globals.h history.h init.h keymap.h mutt_crypt.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 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 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 + 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.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 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@ @@ -112,9 +95,8 @@ LDADD = @LIBOBJS@ @LIBINTL@ OPS=@OPS@ -fleang: muttbug.sh - cp muttbug.sh fleang - chmod +x fleang +charset.gperf: charset.def + sh $< > $@ smime_keysng: $(srcdir)/smime_keys.pl cp $(srcdir)/smime_keys.pl smime_keysng @@ -122,13 +104,11 @@ smime_keysng: $(srcdir)/smime_keys.pl 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 @@ -179,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[=:]'