X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=Makefile.am;h=5e72668a7a801fd25878679d573934dac5576619;hb=f16d8d23439b5569f0c2e1af22494708b507f277;hp=86317da2e5dfe7c0a9a290770e9a2ce58f5853ff;hpb=6c551be325cd508fb61d0537475de37a10e0a48f;p=~andy%2Ffetchmail diff --git a/Makefile.am b/Makefile.am index 86317da2..5e72668a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Makefile for fetchmail SUBDIRS= . po -AUTOMAKE_OPTIONS= 1.8 foreign no-dist-gzip dist-bzip2 +AUTOMAKE_OPTIONS= 1.11 foreign no-dist-gzip dist-xz color-tests AM_CPPFLAGS= -I$(srcdir)/libesmtp ACLOCAL_AMFLAGS= -I m4 -I m4-local @@ -16,15 +16,14 @@ dist_man1_MANS= fetchmail.man pys= fetchmailconf.py pym= fetchmailconf.man -if HAVE_PYTHON +if HAVE_LIBPWMD +CFLAGS += @libpwmd_CFLAGS@ +LDFLAGS += @libpwmd_LIBS@ +endif + nodist_bin_SCRIPTS= fetchmailconf python_PYTHON= $(pys) dist_man1_MANS+= $(pym) -EXTRA_DIST= -else -noinst_PYTHON= $(pys) -EXTRA_DIST= $(pym) -endif CLEANFILES= $(nodist_bin_SCRIPTS) @@ -38,7 +37,11 @@ libfm_a_SOURCES= xmalloc.c base64.c rfc822.c report.c rfc2047e.c \ smbencrypt.h smbdes.c smbencrypt.c smbmd4.c smbutil.c \ libesmtp/gethostbyname.h libesmtp/gethostbyname.c \ smbtypes.h fm_getaddrinfo.c tls.c rfc822valid.c \ - xmalloc.h sdump.h sdump.c + xmalloc.h sdump.h sdump.c x509_name_match.c \ + fm_strl.h md5c.c +if NTLM_ENABLE +libfm_a_SOURCES += ntlmsubr.c +endif libfm_a_LIBADD= $(EXTRAOBJ) libfm_a_DEPENDENCIES= $(EXTRAOBJ) LDADD = libfm.a @LIBINTL@ $(LIBOBJS) @@ -46,34 +49,21 @@ DEPENDENCIES= libfm.a $(LIBOBJS) check_PROGRAMS= -TESTS= t.smoke t.validate-xhtml +TESTS= t.smoke t.validate-xhtml10 t.validate-xhtml t.x509_name_match TESTS_ENVIRONMENT= srcdir="$(srcdir)" LC_ALL=C TZ=UTC SHELL="$(SHELL)" $(SHELL) -if NEED_TRIO -noinst_LIBRARIES+= libtrio.a -libtrio_a_SOURCES= trio/triostr.c trio/trio.c trio/trionan.c \ - trio/trio.h trio/triop.h trio/triodef.h \ - trio/trionan.h trio/triostr.h -check_PROGRAMS+= regression -regression_SOURCES= trio/regression.c -LDADD+= libtrio.a -lm -TESTS+= t.regression -endif - fetchmail_SOURCES= fetchmail.h getopt.h \ - i18n.h kerberos.h fm_md5.h mx.h netrc.h smtp.h \ + gettext.h kerberos.h fm_md5.h netrc.h smtp.h \ socket.h tunable.h \ socket.c getpass.c \ fetchmail.c env.c idle.c options.c daemon.c \ driver.c transact.c sink.c smtp.c \ - idlist.c uid.c mxget.c md5ify.c cram.c gssapi.c \ + idlist.c uid.c md5ify.c cram.c gssapi.c \ opie.c interface.c netrc.c \ - unmime.c conf.c checkalias.c \ + unmime.c conf.c checkalias.c uid_db.h uid_db.c\ lock.h lock.c \ - rcfile_l.l rcfile_y.y ucs/norm_charmap.c -if POP2_ENABLE -fetchmail_SOURCES += pop2.c -endif + rcfile_l.l rcfile_y.y \ + ucs/norm_charmap.c ucs/norm_charmap.h if POP3_ENABLE fetchmail_SOURCES += pop3.c endif @@ -86,9 +76,6 @@ endif if ODMR_ENABLE fetchmail_SOURCES += odmr.c endif -if KERBEROS_V4_ENABLE -fetchmail_SOURCES += kerberos.c -endif if RPA_ENABLE fetchmail_SOURCES += rpa.c endif @@ -99,7 +86,8 @@ if NEED_GETADDRINFO fetchmail_SOURCES += libesmtp/getaddrinfo.h libesmtp/getaddrinfo.c endif -check_PROGRAMS += rfc822 unmime netrc rfc2047e mxget rfc822valid +check_PROGRAMS += rfc822 unmime netrc rfc2047e rfc822valid \ + x509_name_match rfc2047e_CFLAGS= -DTEST @@ -107,15 +95,14 @@ rfc822valid_CFLAGS= -DTEST rfc822_CFLAGS= -DMAIN +x509_name_match_CFLAGS= -DTEST + unmime_SOURCES= unmime.c unmime_CFLAGS= -DSTANDALONE -DHAVE_CONFIG_H -I$(builddir) netrc_SOURCES= netrc.c xmalloc.c report.c netrc_CFLAGS= -DSTANDALONE -DHAVE_CONFIG_H -I$(builddir) -mxget_SOURCES= mxget.c -mxget_CFLAGS= -DSTANDALONE -DHAVE_CONFIG_H -I$(builddir) - @SET_MAKE@ fetchmail.spec: Makefile.in specgen.sh @@ -127,6 +114,10 @@ DISTDOCS= FAQ FEATURES NOTES OLDNEWS fetchmail-man.html \ README.packaging README.SSL-SERVER \ fetchmail-FAQ.book fetchmail-FAQ.pdf fetchmail-FAQ.html \ Mailbox-Names-UTF7.txt Mailbox-Names-UTF7.html \ + fetchmail-SA-2012-02.txt \ + fetchmail-SA-2012-01.txt \ + fetchmail-SA-2011-01.txt \ + fetchmail-EN-2010-03.txt \ fetchmail-SA-2010-02.txt \ fetchmail-SA-2010-01.txt \ fetchmail-SA-2009-01.txt \ @@ -143,35 +134,35 @@ DISTDOCS= FAQ FEATURES NOTES OLDNEWS fetchmail-man.html \ # extra directories to ship distdirs = rh-config contrib beos -EXTRA_DIST+= $(DISTDOCS) $(distdirs) \ +EXTRA_DIST= $(DISTDOCS) $(distdirs) \ fetchmail.spec fetchmail.xpm \ - trio/CHANGES trio/README \ strlcpy.3 bighand.png \ m4/codeset.m4 \ m4/gettext.m4 \ + m4/glibc2.m4 \ m4/glibc21.m4 \ m4/iconv.m4 \ m4/intdiv0.m4 \ + m4/intl.m4 \ + m4/intldir.m4 \ + m4/intlmacosx.m4 \ m4/intmax.m4 \ m4/inttypes-pri.m4 \ - m4/inttypes.m4 \ m4/inttypes_h.m4 \ - m4/isc-posix.m4 \ m4/lcmessage.m4 \ m4/lib-ld.m4 \ m4/lib-link.m4 \ m4/lib-prefix.m4 \ - m4/longdouble.m4 \ + m4/lock.m4 \ m4/longlong.m4 \ m4/nls.m4 \ m4/po.m4 \ m4/printf-posix.m4 \ m4/progtest.m4 \ - m4/signed.m4 \ m4/size_max.m4 \ m4/stdint_h.m4 \ m4/uintmax_t.m4 \ - m4/ulonglong.m4 \ + m4/visibility.m4 \ m4/wchar_t.m4 \ m4/wint_t.m4 \ m4/xsize.m4 \ @@ -208,7 +199,7 @@ TODO: todo.html $(srcdir)/dist-tools/html2txt AWK=$(AWK) $(SHELL) $(srcdir)/dist-tools/html2txt $(srcdir)/todo.html >$@ || { rm -f $@ ; exit 1 ; } fetchmail-man.html: fetchmail.man $(srcdir)/dist-tools/manServer.pl - env - "PATH=$$PATH" $(srcdir)/dist-tools/manServer.pl $(srcdir)/fetchmail.man >$@ \ + env - "PATH=$$PATH" perl -T $(srcdir)/dist-tools/manServer.pl $(srcdir)/fetchmail.man >$@ \ || { rm -f $@ ; exit 1 ; } dist-hook: @@ -231,8 +222,9 @@ import-translations: rsync -Lrtvz translationproject.org::tp/latest/fetchmail/ $(top_srcdir)/po cd $(top_builddir)/po && $(MAKE) update-po -Mailbox-Names-UTF7.html: Mailbox-Names-UTF7.txt - asciidoc --unsafe -a toc -o $@ $< +SUFFIXES = .html .txt +.txt.html: + asciidoc --unsafe -a toc -a data-uri -o $@ $< || { rm -f $@ ; exit 1 ; } # The following sets edit modes for GNU EMACS. # Local Variables: