move rfc822.c as well

[apps/madmutt.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d07b188..0ba9066 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ NNTP_SUBDIR = nntp
 NNTP_INCLUDES = -I$(top_srcdir)/nntp
 endif
 
-SUBDIRS = intl m4 po lib-lib lib-hash doc contrib lib $(IMAP_SUBDIR) $(POP_SUBDIR) $(NNTP_SUBDIR)
+SUBDIRS = intl m4 po lib-lib lib-mime lib-hash doc contrib lib $(IMAP_SUBDIR) $(POP_SUBDIR) $(NNTP_SUBDIR)
 
 bin_SCRIPTS = muttngbug fleang
 
@@ -37,30 +37,25 @@ muttng_SOURCES = $(BUILT_SOURCES) \
        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 rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
+       recvattach.c recvcmd.c rfc1524.c rfc2047.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
 
 muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(LIBPOP) $(LIBNNTP) \
-       -Llib-lib -llib -Llib-hash -lhash -Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
+       -Llib-lib -llib -Llib-mime -lmime -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-hash/libhash.a \
                      $(top_builddir)/lib/libsane.a \
        $(LIBIMAPDEPS) $(LIBPOPDEPS) $(LIBNNTPDEPS) $(INTLDEPS)
 
 makedoc_SOURCES = makedoc.c
-makedoc_LDADD =
-makedoc_DEPENDENCIES = 
-
-# $(makedoc_OBJECTS): $(makedoc_SOURCES)
-#      $(HOST_CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -c $<
-
-# makedoc: $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES)
-#      @rm -rf makedoc
-#      $(HOST_CC) $(AM_CFLAGS) $(LDFLAGS) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) -o makedoc
+makedoc_LDADD = -Llib-lib -llib
+makedoc_DEPENDENCIES = $(top_builddir)/lib-lib/liblib.a
 
 CPP=@CPP@
 
@@ -86,13 +81,13 @@ 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.h gen_defs \
+       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 \
-       mapping.h mime.h mutt.h mutt_curses.h mutt_menu.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 rfc3676.h \
+       mbox.h mh.h mx.h pager.h pgp.h protos.h rfc1524.h rfc2047.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 \
@@ -102,12 +97,15 @@ EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
        regex.c mutt_libesmtp.h crypt-gpgme.h
 
 muttng_dotlock_SOURCES = dotlock.c
-muttng_dotlock_LDADD = @LIBOBJS@
-muttng_dotlock_DEPENDENCIES = @LIBOBJS@
+muttng_dotlock_LDADD = -Llib-lib -llib @LIBOBJS@
+muttng_dotlock_DEPENDENCIES = @LIBOBJS@ $(top_builddir)/lib-lib/liblib.a
 
 pgpringng_SOURCES = pgppubring.c pgplib.c lib.c extlib.c pgppacket.c
-pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) -Llib-lib -llib -Llib-hash -lhash -Llib -lsane
-pgpringng_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
+pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) \
+                 -Llib-lib -llib -Llib-hash -lhash -Llib -lsane
+pgpringng_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS) \
+                        $(top_builddir)/lib-lib/liblib.a \
+                        $(top_builddir)/lib-hash/libhash.a
 
 pgpewrapng_SOURCES = pgpewrap.c
 pgpewrapng_LDADD = 
@@ -143,9 +141,6 @@ keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/OP
 version.h: Makefile.am
        echo "#define MUTT_REVISION \"git\"" > version.h
 
-reldate:
-       echo 'const char *ReleaseDate = "'`date +%Y-%m-%d`'";' > $(srcdir)/reldate.h
-
 install-exec-hook:
        if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/muttng_dotlock ; then        \
                rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;                \