mem_calloc -> p_new

[apps/madmutt.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 161763b..d0c2bba 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,11 +19,11 @@ NNTP_SUBDIR = nntp
 NNTP_INCLUDES = -I$(top_srcdir)/nntp
 endif
 
-SUBDIRS = m4 po intl doc contrib lib $(IMAP_SUBDIR) $(POP_SUBDIR) $(NNTP_SUBDIR)
+SUBDIRS = m4 po lib-lib intl doc contrib lib $(IMAP_SUBDIR) $(POP_SUBDIR) $(NNTP_SUBDIR)
 
 bin_SCRIPTS = muttngbug fleang
 
-BUILT_SOURCES = keymap_defs.h patchlist.c version.h
+BUILT_SOURCES = keymap_defs.h version.h
 
 bin_PROGRAMS = muttng @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
 muttng_SOURCES = $(BUILT_SOURCES) \
@@ -50,9 +50,11 @@ muttng_SOURCES = $(BUILT_SOURCES) \
        xterm.c
 
 muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(LIBPOP) $(LIBNNTP) \
-       -Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
+       -Llib-lib -llib -Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
 
-muttng_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(top_builddir)/lib/libsane.a \
+muttng_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
+                     $(top_builddir)/lib-lib/liblib.a \
+                     $(top_builddir)/lib/libsane.a \
        $(LIBIMAPDEPS) $(LIBPOPDEPS) $(LIBNNTPDEPS) $(INTLDEPS)
 
 makedoc_SOURCES = makedoc.c
@@ -102,11 +104,11 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
        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 \
-       sha1.h sort.h mime.types VERSION autogen.sh \
+       sha1.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 ascii.h BEWARE PATCHES patchlist.sh       \
+       muttngbug pgppacket.h depcomp ascii.h BEWARE \
        mkchangelog.sh cvslog2changelog.pl mutt_idna.h \
        snprintf.c regex.c mutt_libesmtp.h crypt-gpgme.h
 
@@ -115,7 +117,7 @@ muttng_dotlock_LDADD = @LIBOBJS@
 muttng_dotlock_DEPENDENCIES = @LIBOBJS@
 
 pgpringng_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5c.c pgppacket.c ascii.c
-pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) -Llib -lsane
+pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) -Llib-lib -llib -Llib -lsane
 pgpringng_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS)
 
 pgpewrapng_SOURCES = pgpewrap.c
@@ -126,7 +128,7 @@ mutt_dotlock.c: dotlock.c
        cp $(srcdir)/dotlock.c mutt_dotlock.c
 
 CLEANFILES = mutt_dotlock.c stamp-doc-rc makedoc \
-       keymap_alldefs.h keymap_defs.h patchlist.c version.h
+       keymap_alldefs.h keymap_defs.h version.h
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -152,15 +154,12 @@ keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/OP
                $(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \
                        > keymap_alldefs.h
 
-version.h: $(srcdir)/VERSION.svn
-       echo "#define MUTT_REVISION \"`cat $(srcdir)/VERSION.svn`\"" > version.h
+version.h: Makefile.am
+       echo "#define MUTT_REVISION \"git\"" > version.h
 
 reldate:
        echo 'const char *ReleaseDate = "'`date +%Y-%m-%d`'";' > $(srcdir)/reldate.h
 
-patchlist.c: $(srcdir)/PATCHES $(srcdir)/patchlist.sh
-       $(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c
-
 install-exec-hook:
        if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/muttng_dotlock ; then        \
                rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;                \
@@ -186,31 +185,6 @@ install-data-local: Muttngrc
        fi
 
 
-# Don't make this one ChangeLog - it's intended to be
-# used manually.
-
-pclean:
-       cat /dev/null > $(top_srcdir)/PATCHES
-
-check-security:
-       (cd $(top_srcdir) && ./check_sec.sh)
-
-commit-real:
-       (cd $(top_srcdir) && cvs commit)
-
-commit-changelog:
-       (cd $(top_srcdir) && cvs commit -m "# changelog commit" ChangeLog)
-
-commit: pclean check-security commit-real changelog commit-changelog
-
-changelog:
-       (cd $(top_srcdir); \
-       cvs update ChangeLog; \
-       sh ./mkchangelog.sh | fmt -c | cat  - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog; \
-       $${VISUAL:-vi} ChangeLog)
-
-ChangeLog: changelog
-
 # kluge around automake problems.
 
 dist-hook:
@@ -231,5 +205,4 @@ stamp-doc-rc: $(srcdir)/init.h makedoc Muttngrc.head
        touch stamp-doc-rc
 
 
-.PHONY: commit pclean check-security commit-real commit-changelog
-.PHONY: changelog ChangeLog
+-include cflags.mk