X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.am;h=8bc28642a5d76aeb46f8a0c903080aa6ad7d87e2;hp=c3a287f92f410baec98415d55c8d28f72761cef9;hb=6ebff74ad242d4c56fb7762965b19cee14fd2daa;hpb=a8808601c98c76ec8344c8e4ba5a607d72c2805e diff --git a/Makefile.am b/Makefile.am index c3a287f..8bc2864 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,52 +2,44 @@ ## 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 \ - lib-lib lib-mime lib-crypt lib-hash lib \ +SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) contrib \ + lib-mime lib-lib lib-mx lib-crypt lib-hash lib-sys lib-ui \ 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) \ - 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 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 \ - 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@ \ +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 commands.c \ + compose.c copy.c editmsg.c init.c keymap.c lib.c \ + flags.c from.c handler.c headers.c help.c hook.c \ + main.c muttlib.c mutt_idna.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@ \ + -Llib-lib -llib -Llib-mime -lmime -Llib-crypt -lcrypt -Llib-mx -lmx \ -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) + -Llib-hash -lhash -Llib-sys -lsys -Llib-ui -lui \ + $(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-ui/libui.a \ + $(top_builddir)/lib-mx/libmx.a \ + \ + $(top_builddir)/pop/libpop.a \ + $(top_builddir)/imap/libimap.a \ + $(LIBNNTPDEPS) $(INTLDEPS) makedoc_SOURCES = makedoc.c makedoc_LDADD = -Llib-lib -llib @@ -59,42 +51,31 @@ 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$(top_srcdir) $(GPGME_CFLAGS) -Iintl CPPFLAGS=@CPPFLAGS@ -I$(includedir) -EXTRA_muttng_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 Muttngrc.head Muttngrc \ - 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 - -muttng_dotlock_SOURCES = dotlock.c -muttng_dotlock_LDADD = -Llib-lib -llib @LIBOBJS@ -muttng_dotlock_DEPENDENCIES = @LIBOBJS@ $(top_builddir)/lib-lib/liblib.a +EXTRA_madmutt_SOURCES = \ + 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 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 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@ +madmutt_dotlock_DEPENDENCIES = @LIBOBJS@ $(top_builddir)/lib-lib/liblib.a pgpringng_SOURCES = pgppubring.c lib.c extlib.c pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) \ - -Llib-lib -llib -Llib-hash -lhash -Llib-crypt -lcrypt -Llib -lsane + -Llib-lib -llib -Llib-hash -lhash -Llib-crypt -lcrypt pgpringng_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS) \ $(top_builddir)/lib-lib/liblib.a \ $(top_builddir)/lib-hash/libhash.a @@ -112,9 +93,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,39 +102,37 @@ 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 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,13 +147,16 @@ 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 -include cflags.mk + +wc: + @sloccount $(wildcard *.h *.c) $(wildcard lib-*/) lib imap nntp pop | grep 'ansic[=:]'