Fix MD5* library pickup.

[~andy/fetchmail] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index db6fb731b2d83f5aba549972e13459f9a3bf0c63..2b61761abc20dbaade7b8434cfd6b7aed46351e9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,8 @@ libfm_a_SOURCES=      xmalloc.c base64.c rfc822.c report.c rfc2047e.c \
                        servport.c ntlm.h smbbyteorder.h smbdes.h smbmd4.h \
                        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
+                       smbtypes.h fm_getaddrinfo.c tls.c rfc822valid.c \
+                       xmalloc.h sdump.h sdump.c
 libfm_a_LIBADD=                $(EXTRAOBJ)
 libfm_a_DEPENDENCIES=  $(EXTRAOBJ)
 LDADD  =               libfm.a @LIBINTL@ $(LIBOBJS)
@@ -45,8 +46,8 @@ DEPENDENCIES=         libfm.a $(LIBOBJS)
 
 check_PROGRAMS=
 
-TESTS=                 t.smoke
-TESTS_ENVIRONMENT=     srcdir="@srcdir@" LC_ALL=C TZ=UTC
+TESTS=                 t.smoke t.validate-xhtml
+TESTS_ENVIRONMENT=     srcdir="$(srcdir)" LC_ALL=C TZ=UTC SHELL="$(SHELL)" $(SHELL)
 
 if NEED_TRIO
 noinst_LIBRARIES+=     libtrio.a
@@ -55,17 +56,17 @@ libtrio_a_SOURCES=  trio/triostr.c trio/trio.c trio/trionan.c \
                        trio/trionan.h trio/triostr.h
 check_PROGRAMS+=       regression
 regression_SOURCES=    trio/regression.c
-LDADD +=               libtrio.a -lm
-TESTS+=                        regression
+LDADD+=                        libtrio.a -lm
+TESTS+=                        t.regression
 endif
 
 fetchmail_SOURCES=     fetchmail.h getopt.h \
-               i18n.h kerberos.h md5.h mx.h netrc.h smtp.h \
+               i18n.h kerberos.h fm_md5.h mx.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 \
-               uid.c mxget.c md5ify.c cram.c gssapi.c \
+               idlist.c uid.c mxget.c md5ify.c cram.c gssapi.c \
                opie.c interface.c netrc.c \
                unmime.c conf.c checkalias.c \
                lock.h lock.c \
@@ -115,8 +116,6 @@ netrc_CFLAGS=       -DSTANDALONE -DHAVE_CONFIG_H -I$(builddir)
 mxget_SOURCES= mxget.c
 mxget_CFLAGS=  -DSTANDALONE -DHAVE_CONFIG_H -I$(builddir)
 
-# For some losing Unix makes.
-SHELL = /bin/sh
 @SET_MAKE@
 
 fetchmail.spec: Makefile.in specgen.sh
@@ -127,6 +126,9 @@ DISTDOCS=   FAQ FEATURES NOTES OLDNEWS fetchmail-man.html \
                fetchmail-features.html README.SSL README.NTLM \
                README.packaging README.SSL-SERVER \
                fetchmail-FAQ.book fetchmail-FAQ.pdf fetchmail-FAQ.html \
+               fetchmail-SA-2010-02.txt \
+               fetchmail-SA-2010-01.txt \
+               fetchmail-SA-2009-01.txt \
                fetchmail-SA-2008-01.txt \
                fetchmail-SA-2007-02.txt \
                fetchmail-SA-2007-01.txt \
@@ -140,7 +142,8 @@ DISTDOCS=   FAQ FEATURES NOTES OLDNEWS fetchmail-man.html \
 # extra directories to ship
 distdirs = rh-config contrib beos
 
-EXTRA_DIST+=   $(DISTDOCS) fetchmail.spec $(distdirs) ucs/README.svn \
+EXTRA_DIST+=   $(DISTDOCS) $(distdirs) \
+               fetchmail.spec fetchmail.xpm \
                trio/CHANGES trio/README \
                strlcpy.3 bighand.png \
                m4/codeset.m4 \
@@ -173,7 +176,7 @@ EXTRA_DIST+=        $(DISTDOCS) fetchmail.spec $(distdirs) ucs/README.svn \
                m4/xsize.m4 \
                m4-local/ac-archive-license.txt \
                m4-local/ac_ma_search_package.m4 \
-               t.smoke t.rc \
+               $(TESTS) t.rc t.regression \
                dist-tools/html2txt \
                dist-tools/manServer.pl \
                Doxyfile
@@ -208,7 +211,7 @@ fetchmail-man.html: fetchmail.man $(srcdir)/dist-tools/manServer.pl
        || { rm -f $@ ; exit 1 ; }
 
 dist-hook:
-       cd $(distdir) && find $(distdirs) po -name .svn -type d -prune -exec rm -rf '{}' ';'
+       cd $(distdir) && find $(distdirs) po -name .git -type d -prune -exec rm -rf '{}' ';'
        cd $(distdir) && find $(distdirs) po -name '*~' -exec rm -f '{}' ';'
 
 .PHONY: lsm
@@ -222,6 +225,11 @@ lsm: genlsm.sh dist
 rsync:  distdir $(srcdir)/.rsyncs
        @( cat $(srcdir)/.rsyncs | sed -e 's}^}rsync -aH --delete-after $(PACKAGE)-$(VERSION)/ }; s/\($$\)/ \&/;' ; echo "wait" ) | $(SHELL) -x
 
+.PHONY: import-translations
+import-translations:
+       rsync -Lrtvz translationproject.org::tp/latest/fetchmail/  $(top_srcdir)/po
+       cd $(top_builddir)/po && $(MAKE) update-po
+
 # The following sets edit modes for GNU EMACS.
 # Local Variables:
 # compile-command:"configure"