Use good m_ functions, because it smell like a flower, version 2.
[apps/madmutt.git] / Makefile.am
index fae6d91..bb631e9 100644 (file)
@@ -6,35 +6,28 @@ EXTRA_PROGRAMS = madmutt_dotlock pgpringng pgpewrapng makedoc
 
 if BUILD_NNTP
 NNTP_SUBDIR = nntp
-NNTP_INCLUDES = -I$(top_srcdir)/nntp
 endif
 
 SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) contrib \
-         lib-lib lib-mime lib-crypt lib-hash lib-ui lib \
+         lib-mime lib-lib lib-mx lib-crypt lib-hash lib-sys lib-ui \
          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 \
-       compose.c copy.c editmsg.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 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 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 remailer.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-ui -lui \
-              -Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
+              -Llib-hash -lhash -Llib-sys -lsys -Llib-ui -lui \
+              $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
 
 madmutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
                       $(top_builddir)/lib-lib/liblib.a \
@@ -42,7 +35,7 @@ madmutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
                       $(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)/lib-mx/libmx.a \
                       \
                       $(top_builddir)/pop/libpop.a  \
                       $(top_builddir)/imap/libimap.a \
@@ -58,29 +51,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) $(GPGME_CFLAGS) -Iintl
+INCLUDES=-I$(top_srcdir) $(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 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 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 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 \
-       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 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@
@@ -88,7 +75,7 @@ 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
@@ -97,28 +84,21 @@ pgpewrapng_SOURCES = pgpewrap.c
 pgpewrapng_LDADD = 
 pgpewrapng_DEPENDENCIES = 
 
-CLEANFILES = stamp-doc-rc makedoc \
-       keymap_alldefs.h keymap_defs.h version.h
+CLEANFILES = stamp-doc-rc makedoc keymap_defs.h version.h Madmuttrc
 
 ACLOCAL_AMFLAGS = -I m4
 
 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_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_defs.h: OPS
+       $(srcdir)/gen_defs $^ > keymap_defs.h
 
 version.h:
        echo "#define MUTT_REVISION \"git\"" > version.h
@@ -134,38 +114,33 @@ install-exec-hook:
                { echo "Can't fix madmutt_dotlock's permissions!" >&2 ; } \
        fi
 
-install-data-local: madmuttrc
+install-data-local: Madmuttrc
        $(srcdir)/mkinstalldirs $(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) ; \
+       -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)/madmutt-mime.types ]; then \
                $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/madmutt-mime.types; \
        fi
 
 
-# kluge around automake problems.
-
-dist-hook:
-       -for file in $(BUILT_SOURCES) ; do rm -f $(distdir)/$$file ; done
-
-mutt-dist:
-       (cd $(srcdir) && ./build-release )
-
 update-doc: stamp-doc-rc
        (cd doc && $(MAKE) update-doc)
 
-madmuttrc: stamp-doc-rc
+Madmuttrc: stamp-doc-rc
 
-stamp-doc-rc: $(srcdir)/init.h makedoc madmuttrc.head
-       -rm -f madmuttrc 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 madmuttrc.head - > madmuttrc
-       touch stamp-doc-rc
+               $(srcdir)/init.h | ./makedoc -c | cat Madmuttrc.head - > Madmuttrc
+       touch $@
 
 
 -include cflags.mk
+
+wc:
+       @sloccount $(wildcard *.h *.c) $(wildcard lib-*/) lib imap nntp pop | grep 'ansic[=:]'