X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=Makefile.in;h=2de1f26d05eac10c438da6b93e325812b5e5bb23;hb=571ff3b860a1031836739f219e031ccb358ff4ba;hp=6ea3faea45d6d57f1ef07374278db07f0101081f;hpb=61a002618ed38aa598ca15c62847b133cb54bac9;p=~andy%2Ffetchmail

diff --git a/Makefile.in b/Makefile.in
index 6ea3faea..2de1f26d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,7 @@
 # So just uncomment all the lines marked QNX.
 
 PACKAGE = fetchmail
-VERSION = 4.6.9
+VERSION = 5.4.3
 
 SUBDIRS = @INTLSUB@ @POSUB@  
 
@@ -18,7 +18,7 @@ CC = @CC@
 CFLAGS = @CFLAGS@
 # CFLAGS =  -g2 -5	# QNX
 LDFLAGS = @LDFLAGS@
-# LDLAGS =  -g2 -5	# QNX
+# LDFLAGS =  -g2 -5	# QNX
 LEX = @LEX@
 LEXFLAGS=
 YACC = @YACC@
@@ -83,22 +83,24 @@ ETAGS = etags
 CTAGS = ctags
 
 protobjs = rcfile_y.o rcfile_l.o socket.o getpass.o pop2.o pop3.o imap.o \
-       etrn.o fetchmail.o env.o options.o daemon.o driver.o sink.o \
-       rfc822.o smtp.o xmalloc.o uid.o mxget.o md5c.o md5ify.o rpa.o \
-       interface.o netrc.o base64.o error.o unmime.o conf.o checkalias.o
+       etrn.o fetchmail.o idle.o env.o options.o daemon.o driver.o sink.o \
+       rfc822.o smtp.o xmalloc.o uid.o mxget.o md5ify.o rpa.o \
+       interface.o netrc.o base64.o error.o unmime.o conf.o checkalias.o \
+       smbdes.o smbencrypt.o smbmd4.o smbutil.o ipv6-connect.o
 
 objs = $(protobjs) $(extras) $(EXTRAOBJ)
 
 srcs = $(srcdir)/socket.c $(srcdir)/getpass.c $(srcdir)/pop2.c 		\
        $(srcdir)/pop3.c $(srcdir)/imap.c $(srcdir)/etrn.c 		\
-       $(srcdir)/fetchmail.c $(srcdir)/env.c				\
+       $(srcdir)/fetchmail.c $(srcdir)/env.c $(srcdir)/idle.c		\
        $(srcdir)/options.c $(srcdir)/daemon.c $(srcdir)/driver.c	\
        $(srcdir)/sink.c $(srcdir)/rfc822.c $(srcdir)/smtp.c		\
        $(srcdir)/xmalloc.c $(srcdir)/uid.c $(srcdir)/mxget.c 		\
-       $(srcdir)/md5c.c $(srcdir)/md5ify.c $(srcdir)/rpa.c	  	\
-       $(srcdir)/interface.c $(srcdir)/netrc.c $(srcdir)/base64.c	\
-       $(srcdir)/error.c $(srcdir)/unmime.c $(srcdir)/conf.c		\
-       $(srcdir)/checkalias.c
+       $(srcdir)/md5ify.c $(srcdir)/rpa.c $(srcdir)/interface.c		\
+       $(srcdir)/netrc.c $(srcdir)/base64.c $(srcdir)/error.c		\
+       $(srcdir)/unmime.c $(srcdir)/conf.c $(srcdir)/checkalias.c 	\
+       $(srcdir)/smbdes.c $(srcdir)/smbencrypt.c $(srcdir)/smbmd4.c	\
+       $(srcdir)/smbutil.c $(srcdir)/ipv6-connect.c
 
 .SUFFIXES:
 .SUFFIXES: .o .c .h .y .l .ps .dvi .info .texi
@@ -111,6 +113,7 @@ all: fetchmail po
 fetchmail: $(objs)
 	$(CC) $(LDEFLAGS) $(LDFLAGS) $(objs) $(LOADLIBS) -o fetchmail
 
+
 po:	dummy
 	@POMAKE@
 
@@ -121,8 +124,13 @@ rfc822: rfc822.c
 	gcc -DTESTMAIN -g rfc822.c -o rfc822
 
 # Stand-alone MIME decoder
-unmime: unmime.c base64.c rfc822.c xmalloc.c error.c memmove.c
-	$(CC) -DSTANDALONE -g -o $@ $^ 
+unmime: unmime.c base64.c rfc822.c xmalloc.c error.c
+	$(CC) -DSTANDALONE -DHAVE_CONFIG_H -I. -g -o $@ $^
+
+
+# Stand-alone netrc tester
+netrc: netrc.c xmalloc.o error.o
+	$(CC) -DSTANDALONE -DHAVE_CONFIG_H -I. -g -o $@ $^
 
 .c.o:
 	$(CC) $(defines) -c $(CPFLAGS) -I$(srcdir) -I. $(CEFLAGS) $(CFLAGS) $<
@@ -147,7 +155,8 @@ install:
 	$(INSTALL_PROGRAM) ${srcdir}/fetchmailconf $(bindir)/fetchmailconf
 	@echo "Installing manual page..."
 	$(INSTALL_DATA) $(srcdir)/fetchmail.man $(mandir)/fetchmail.$(manext)
-	ln -f -s $(mandir)/fetchmail.$(manext) $(mandir)/fetchmailconf.$(manext)
+	rm -f $(mandir)/fetchmailconf.$(manext)
+	ln -s $(mandir)/fetchmail.$(manext) $(mandir)/fetchmailconf.$(manext)
 	@echo "Installing language catalogs..."
 	@POMAKE@ install
 
@@ -162,7 +171,7 @@ clean:
 	-rm -f fetchmail *.o core fetchmail.dvi \
 	       rcfile_l.c rcfile_y.h rcfile_y.c \
 	       fetchmail.tar fetchmail.tar.gz \
-	       rfc822 unmime
+	       netrc rfc822 unmime fetchmail-man.html
 
 distclean: clean 
 	@POMAKE@ distclean
@@ -177,20 +186,29 @@ realclean: distclean
 
 mostlyclean: clean
 
-config.status: configure Makefile.in
-	$(srcdir)/configure
-
-config.h: config.status config.h.in
-	sh config.status; touch config.h
-
-Makefile: config.status
-	sh config.status
-
-configure: configure.in
-	autoconf $(ACFLAGS)
-
-config.h.in: acconfig.h configure.in
-	autoheader $(ACFLAGS); touch config.h.in
+# These magic rules are copied from the autoconf documentation
+# except that Harry McGavran says the autoheader call in the third
+# one below is unnecessary and causes problems with cross-platform builds.
+
+${srcdir}/configure: configure.in aclocal.m4
+	cd ${srcdir} && autoconf
+     
+# autoheader might not change config.h.in, so touch a stamp file.
+${srcdir}/config.h.in: stamp-h.in
+
+${srcdir}/stamp-h.in: configure.in aclocal.m4 acconfig.h # config.h.top config.h.bot
+	cd ${srcdir} # && autoheader
+	echo timestamp> ${srcdir}/stamp-h.in
+     
+config.h: stamp-h
+stamp-h: config.h.in config.status
+	./config.status
+     
+Makefile: Makefile.in config.status
+	./config.status
+     
+config.status: configure
+	./config.status --recheck
 
 # This tells versions [3.59,3.63) of GNU make not to export all variables.
 .NOEXPORT:
@@ -214,13 +232,16 @@ parser = $(srcdir)/rcfile_l.l $(srcdir)/rcfile_y.y
 headers = $(srcdir)/fetchmail.h $(srcdir)/socket.h $(srcdir)/smtp.h \
 	$(srcdir)/mx.h $(srcdir)/md5.h $(srcdir)/md5global.h \
 	$(srcdir)/netrc.h $(srcdir)/tunable.h $(srcdir)/i18n.h \
-	$(srcdir)/aclocal.m4
+	$(srcdir)/aclocal.m4 $(srcdir)/ntlm.h $(srcdir)/smb.h \
+	$(srcdir)/smbbyteorder.h $(srcdir)/smbdes.h $(srcdir)/smbencrypt.h \
+	$(srcdir)/smbmd4.h
 extra = $(srcdir)/alloca.c $(srcdir)/getopt.[ch] $(srcdir)/getopt1.c \
-	$(srcdir)/strcasecmp.c $(srcdir)/strstr.c $(srcdir)/memmove.c
+	$(srcdir)/strcasecmp.c $(srcdir)/strstr.c $(srcdir)/memmove.c \
+	$(srcdir)/md5c.c
 docs = $(srcdir)/COPYING $(srcdir)/FEATURES $(srcdir)/fetchmail-features.html \
 	$(srcdir)/design-notes.html $(srcdir)/NOTES \
-	$(srcdir)/INSTALL $(srcdir)/NEWS  $(srcdir)/README \
-	$(srcdir)/fetchmail.lsm $(srcdir)/sample.rcfile \
+	$(srcdir)/INSTALL $(srcdir)/NEWS $(srcdir)/TODO $(srcdir)/README \
+	$(srcdir)/README.NTLM $(srcdir)/fetchmail.lsm $(srcdir)/sample.rcfile \
 	$(srcdir)/*.man	$(srcdir)/FAQ $(srcdir)/fetchmail-FAQ.html
 config = $(srcdir)/Makefile.in $(srcdir)/configure.in $(srcdir)/configure \
 	$(srcdir)/config.guess $(srcdir)/config.h.in $(srcdir)/config.sub \
@@ -228,13 +249,16 @@ config = $(srcdir)/Makefile.in $(srcdir)/configure.in $(srcdir)/configure \
 scripts = $(srcdir)/install.sh $(srcdir)/mkinstalldirs \
 	$(srcdir)/specgen.sh $(srcdir)/lsmgen.sh $(srcdir)/fetchmailconf
 all = $(docs) $(config) $(srcs) $(parser) $(headers) $(extra) $(scripts) \
-	$(srcdir)/rh-config/* $(srcdir)/contrib/*[A-Za-uw-z] \
-	$(srcdir)/intl/* $(srcdir)/po/* ABOUT-NLS $(srcdir)/MANIFEST
+	$(srcdir)/rh-config/* $(srcdir)/debian/* $(srcdir)/contrib/*[A-Za-uw-z] \
+	$(srcdir)/intl/* $(srcdir)/po/* $(srcdir)/beos/* ABOUT-NLS \
+	$(srcdir)/MANIFEST
 
 MANIFEST: $(srcdir) Makefile.in
 	@echo $(all) | tr "[ \t]" '\n' | sed -e '/^\.\//s///' | sort >MANIFEST
 	@wc -l MANIFEST
 
+distdocs: FAQ FEATURES NOTES fetchmail-man.html
+
 FAQ: fetchmail-FAQ.html
 	echo "   (This document was generated from fetchmail-FAQ.html)" >FAQ
 	lynx -dump -nolist fetchmail-FAQ.html >>FAQ
@@ -247,8 +271,16 @@ NOTES: design-notes.html
 	echo "   (This document was generated from design-notes.html)" >NOTES
 	lynx -dump -nolist design-notes.html | grep -v "Back to " >NOTES
 
+# man2html chokes and dies on this man page
+fetchmail-man.html: fetchmail.man
+	echo "<pre>"                                  >fetchmail-man.html
+	groff -t -man -Tascii -P-b -P-u fetchmail.man >>fetchmail-man.html
+	echo "</pre>"                                 >>fetchmail-man.html
+
 # Make distribution, update LSM with proper size, remake distribution
-dist: Makefile.in  
+# (Making fetchmail-man.html is a kluge to ensure that it will be
+# available when I upload the distribution.)
+dist: Makefile.in distdocs
 	rm -f MANIFEST; make MANIFEST;
 	touch fetchmail.lsm
 	make fetchmail-$(VERSION).tar.gz 
@@ -268,11 +300,11 @@ RPMROOT=/usr/src/redhat
 RPM = rpm
 RPMFLAGS = -ba
 rpm: dist
-	cp fetchmail-$(VERSION).tar.gz fetchmail.gif $(RPMROOT)/SOURCES;
+	cp fetchmail-$(VERSION).tar.gz fetchmail.xpm $(RPMROOT)/SOURCES;
 	$(srcdir)/specgen.sh $(VERSION) >$(RPMROOT)/SPECS/fetchmail.spec
 	cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) fetchmail.spec	
-	cp $(RPMROOT)/RPMS/`arch|sed 's/i[4-9]86/i386/'`/fetchmail-$(VERSION)*.rpm $(srcdir)
-	cp $(RPMROOT)/SRPMS/fetchmail-$(VERSION)*.src.rpm $(srcdir)
+	cp $(RPMROOT)/RPMS/`arch|sed 's/i[4-9]86/i386/'`/fetchmail*-$(VERSION)*.rpm $(srcdir)
+	cp $(RPMROOT)/SRPMS/fetchmail*-$(VERSION)*.src.rpm $(srcdir)
 
 # The following sets edit modes for GNU EMACS.
 # Local Variables: