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
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
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\
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
$(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
touch stamp-doc-rc
+-include cflags.mk