X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=Makefile.in;h=d0746d7ca8fddf9e71db1e9978b21a96ed82f6b1;hp=70b58a113ff31502d390a8718c280a4d46a643c2;hb=9ad7a458e335c2738f54335f64902604287b547f;hpb=3d937534e7b1ee723f86594b5e4c64c95158a933 diff --git a/Makefile.in b/Makefile.in index 70b58a1..d0746d7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -75,6 +75,8 @@ GENCAT = @GENCAT@ GLIBC21 = @GLIBC21@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GPGME_CONFIG = @GPGME_CONFIG@ +HAVE_LIB = @HAVE_LIB@ INSTOBJEXT = @INSTOBJEXT@ INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ @@ -82,9 +84,16 @@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ ISPELL = @ISPELL@ KRB5CFGPATH = @KRB5CFGPATH@ +LIB = @LIB@ +LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ +LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ +LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ +LIBGPGME_CFLAGS = @LIBGPGME_CFLAGS@ +LIBGPGME_LIBS = @LIBGPGME_LIBS@ LIBICONV = @LIBICONV@ LIBIMAP = @LIBIMAP@ LIBIMAPDEPS = @LIBIMAPDEPS@ +LTLIB = @LTLIB@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -97,6 +106,9 @@ POSUB = @POSUB@ RANLIB = @RANLIB@ SDB = @SDB@ SENDMAIL = @SENDMAIL@ +SGML2HTML_CMD = @SGML2HTML_CMD@ +SGML2PS_CMD = @SGML2PS_CMD@ +SGML2TXT_CMD = @SGML2TXT_CMD@ SMIMEAUX_TARGET = @SMIMEAUX_TARGET@ SUBVERSION = @SUBVERSION@ U = @U@ @@ -107,7 +119,7 @@ docdir = @docdir@ mutt_libesmtp_config_path = @mutt_libesmtp_config_path@ AUTOMAKE_OPTIONS = foreign -EXTRA_PROGRAMS = muttng_dotlock pgpring makedoc +EXTRA_PROGRAMS = muttng_dotlock pgpringng pgpewrapng makedoc @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap @@ -144,23 +156,27 @@ CPP = @CPP@ DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" -DHAVE_CONFIG_H=1 -INCLUDES = -I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl +INCLUDES = -I. -I$(top_srcdir) $(IMAP_INCLUDES) $(LIBGPGME_CFLAGS) -Iintl CPPFLAGS = @CPPFLAGS@ -I$(includedir) EXTRA_muttng_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c mutt_tunnel.c pop.c pop_auth.c pop_lib.c smime.c pgp.c pgpinvoke.c pgpkey.c pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c pgppacket.c mutt_idna.h nntp.c newsrc.c mutt_libesmtp.c sidebar.h crypt-mod-pgp-classic.c crypt-mod-smime-classic.c -EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO configure acconfig.h account.h compress.h attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs globals.h hash.h history.h init.h keymap.h mutt_crypt.h mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h mutt_regex.h mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h mx.h pager.h pgp.h pop.h protos.h reldate.h rfc1524.h rfc2047.h rfc2231.h rfc822.h sha1.h sort.h mime.types VERSION prepare nntp.h ChangeLog.nntp _regex.h OPS.MIX README.SECURITY remailer.c remailer.h browser.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 ChangeLog.old mkchangelog.sh cvslog2changelog.pl mutt_idna.h snprintf.c regex.c mutt_libesmtp.h +EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO configure acconfig.h account.h compress.h attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs globals.h hash.h history.h init.h keymap.h mutt_crypt.h mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h mutt_regex.h mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h mx.h pager.h pgp.h pop.h protos.h reldate.h rfc1524.h rfc2047.h rfc2231.h rfc822.h sha1.h sort.h mime.types VERSION prepare nntp.h ChangeLog.nntp _regex.h OPS.MIX README.SECURITY remailer.c remailer.h browser.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 ChangeLog.old mkchangelog.sh cvslog2changelog.pl mutt_idna.h snprintf.c regex.c mutt_libesmtp.h crypt-gpgme.h muttng_dotlock_SOURCES = mutt_dotlock.c muttng_dotlock_LDADD = @LIBOBJS@ muttng_dotlock_DEPENDENCIES = @LIBOBJS@ -pgpring_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5c.c pgppacket.c ascii.c -pgpring_LDADD = @LIBOBJS@ $(INTLLIBS) -pgpring_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS) +pgpringng_SOURCES = pgppubring.c pgplib.c lib.c extlib.c sha1.c md5c.c pgppacket.c ascii.c +pgpringng_LDADD = @LIBOBJS@ $(INTLLIBS) +pgpringng_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS) + +pgpewrapng_SOURCES = pgpewrap.c +pgpewrapng_LDADD = +pgpewrapng_DEPENDENCIES = CLEANFILES = mutt_dotlock.c stamp-doc-rc makedoc keymap_alldefs.h keymap_defs.h patchlist.c @@ -180,9 +196,11 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ muttng_dotlock_OBJECTS = mutt_dotlock.o muttng_dotlock_LDFLAGS = -pgpring_OBJECTS = pgppubring.o pgplib.o lib.o extlib.o sha1.o md5c.o \ +pgpringng_OBJECTS = pgppubring.o pgplib.o lib.o extlib.o sha1.o md5c.o \ pgppacket.o ascii.o -pgpring_LDFLAGS = +pgpringng_LDFLAGS = +pgpewrapng_OBJECTS = pgpewrap.o +pgpewrapng_LDFLAGS = makedoc_OBJECTS = makedoc.o makedoc_LDFLAGS = muttng_OBJECTS = patchlist.o addrbook.o alias.o attach.o base64.o \ @@ -213,8 +231,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP_ENV = --best DIST_SUBDIRS = m4 po intl doc contrib imap -SOURCES = $(muttng_dotlock_SOURCES) $(pgpring_SOURCES) $(makedoc_SOURCES) $(muttng_SOURCES) $(EXTRA_muttng_SOURCES) -OBJECTS = $(muttng_dotlock_OBJECTS) $(pgpring_OBJECTS) $(makedoc_OBJECTS) $(muttng_OBJECTS) +SOURCES = $(muttng_dotlock_SOURCES) $(pgpringng_SOURCES) $(pgpewrapng_SOURCES) $(makedoc_SOURCES) $(muttng_SOURCES) $(EXTRA_muttng_SOURCES) +OBJECTS = $(muttng_dotlock_OBJECTS) $(pgpringng_OBJECTS) $(pgpewrapng_OBJECTS) $(makedoc_OBJECTS) $(muttng_OBJECTS) all: all-redirect .SUFFIXES: @@ -228,7 +246,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(ACLOCAL_M4): configure.in m4/codeset.m4 m4/curslib.m4 m4/funcdecl.m4 \ m4/gettext.m4 m4/glibc21.m4 m4/gssapi.m4 m4/iconv.m4 \ - m4/lcmessage.m4 m4/libesmtp.m4 m4/progtest.m4 + m4/lcmessage.m4 m4/libesmtp.m4 m4/libgnutls.m4 \ + m4/progtest.m4 m4/types.m4 cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES) @@ -316,9 +335,13 @@ muttng_dotlock: $(muttng_dotlock_OBJECTS) $(muttng_dotlock_DEPENDENCIES) @rm -f muttng_dotlock $(LINK) $(muttng_dotlock_LDFLAGS) $(muttng_dotlock_OBJECTS) $(muttng_dotlock_LDADD) $(LIBS) -pgpring: $(pgpring_OBJECTS) $(pgpring_DEPENDENCIES) - @rm -f pgpring - $(LINK) $(pgpring_LDFLAGS) $(pgpring_OBJECTS) $(pgpring_LDADD) $(LIBS) +pgpringng: $(pgpringng_OBJECTS) $(pgpringng_DEPENDENCIES) + @rm -f pgpringng + $(LINK) $(pgpringng_LDFLAGS) $(pgpringng_OBJECTS) $(pgpringng_LDADD) $(LIBS) + +pgpewrapng: $(pgpewrapng_OBJECTS) $(pgpewrapng_DEPENDENCIES) + @rm -f pgpewrapng + $(LINK) $(pgpewrapng_LDFLAGS) $(pgpewrapng_OBJECTS) $(pgpewrapng_LDADD) $(LIBS) makedoc: $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES) @rm -f makedoc @@ -590,9 +613,9 @@ fleang: muttbug.sh cp muttbug.sh fleang chmod +x fleang -smime_keys: $(srcdir)/smime_keys.pl - cp $(srcdir)/smime_keys.pl smime_keys - chmod +x smime_keys +smime_keysng: $(srcdir)/smime_keys.pl + cp $(srcdir)/smime_keys.pl smime_keysng + chmod +x smime_keysng Makefile: $(BUILT_SOURCES) @@ -630,8 +653,8 @@ install-data-local: Muttngrc elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttngrc ] ; then \ $(INSTALL) -m 644 $(srcdir)/Muttngrc $(DESTDIR)$(sysconfdir) ; \ fi - -if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \ - $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \ + -if [ ! -f $(DESTDIR)$(sysconfdir)/muttng-mime.types ]; then \ + $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/muttng-mime.types; \ fi # Don't make this one ChangeLog - it's intended to be