Before showdots,

[~andy/fetchmail] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index e1753c23968484c7e91024e9460a3839250e216a..e8c05cb604dea4370256ff35d279f9ae18e24014 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,7 @@
 # So just uncomment all the lines marked QNX.
 
 PACKAGE = fetchmail
-VERSION = 5.1.2
+VERSION = 5.5.3
 
 SUBDIRS = @INTLSUB@ @POSUB@  
 
@@ -18,7 +18,7 @@ CC = @CC@
 CFLAGS = @CFLAGS@
 # CFLAGS =  -g2 -5     # QNX
 LDFLAGS = @LDFLAGS@
-# LDFLAGS =  -g2 -5    # QNX
+# LDFLAGS =  -g2 -5 -N64k      # QNX
 LEX = @LEX@
 LEXFLAGS=
 YACC = @YACC@
@@ -52,6 +52,8 @@ EXTRASRC = @EXTRASRC@
 EXTRAOBJ = @EXTRAOBJ@
 # EXTRAOBJ = strcasecmp.o getopt.o getopt1.o alloca.o
 
+DESTDIR = 
+
 # Common prefix for machine-independent installed files.
 prefix = @prefix@
 # Common prefix for machine-dependent installed files.
@@ -83,24 +85,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 \
+       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
+       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)/smbdes.c $(srcdir)/smbencrypt.c \
-       $(srcdir)/smbmd4.c $(srcdir)/smbutil.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
@@ -113,6 +115,7 @@ all: fetchmail po
 fetchmail: $(objs)
        $(CC) $(LDEFLAGS) $(LDFLAGS) $(objs) $(LOADLIBS) -o fetchmail
 
+
 po:    dummy
        @POMAKE@
 
@@ -147,21 +150,21 @@ tags: $(tagsrcs)
 .PHONY: install uninstall
 install:
        @echo "Creating installation directories..." 
-       $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(mandir)
+       $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)
        @echo "Installing fetchmail binary..."
-       $(INSTALL_PROGRAM) ./fetchmail $(bindir)/fetchmail
+       $(INSTALL_PROGRAM) ./fetchmail $(DESTDIR)$(bindir)/fetchmail
        @echo "Installing fetchmail configurator..."
-       $(INSTALL_PROGRAM) ${srcdir}/fetchmailconf $(bindir)/fetchmailconf
+       $(INSTALL_PROGRAM) ${srcdir}/fetchmailconf $(DESTDIR)$(bindir)/fetchmailconf
        @echo "Installing manual page..."
-       $(INSTALL_DATA) $(srcdir)/fetchmail.man $(mandir)/fetchmail.$(manext)
-       rm -f $(mandir)/fetchmailconf.$(manext)
-       ln -s $(mandir)/fetchmail.$(manext) $(mandir)/fetchmailconf.$(manext)
+       $(INSTALL_DATA) $(srcdir)/fetchmail.man $(DESTDIR)$(mandir)/fetchmail.$(manext)
+       rm -f $(DESTDIR)$(mandir)/fetchmailconf.$(manext)
+       cd $(DESTDIR)$(mandir) && ln -s fetchmail.$(manext) fetchmailconf.$(manext)
        @echo "Installing language catalogs..."
        @POMAKE@ install
 
 uninstall:
-       rm -f $(bindir)/fetchmail $(bindir)/fetchmailconf
-       rm -f $(mandir)/fetchmail.$(manext) $(mandir)/fetchmailconf.$(manext)
+       rm -f $(DESTDIR)$(bindir)/fetchmail $(DESTDIR)$(bindir)/fetchmailconf
+       rm -f $(DESTDIR)$(mandir)/fetchmail.$(manext) $(DESTDIR)$(mandir)/fetchmailconf.$(manext)
        @POMAKE@ uninstall
 
 .PHONY: clean realclean distclean mostlyclean
@@ -186,6 +189,8 @@ realclean: distclean
 mostlyclean: clean
 
 # 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
@@ -194,7 +199,7 @@ ${srcdir}/configure: configure.in aclocal.m4
 ${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
+       cd ${srcdir} # && autoheader
        echo timestamp> ${srcdir}/stamp-h.in
      
 config.h: stamp-h
@@ -233,10 +238,11 @@ headers = $(srcdir)/fetchmail.h $(srcdir)/socket.h $(srcdir)/smtp.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)/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 \
@@ -246,12 +252,15 @@ 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)/debian/* $(srcdir)/contrib/*[A-Za-uw-z] \
-       $(srcdir)/intl/* $(srcdir)/po/* ABOUT-NLS $(srcdir)/MANIFEST
+       $(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
@@ -273,7 +282,7 @@ fetchmail-man.html: fetchmail.man
 # Make distribution, update LSM with proper size, remake distribution
 # (Making fetchmail-man.html is a kluge to ensure that it will be
 # available when I upload the distribution.)
-dist: Makefile.in fetchmail-man.html
+dist: Makefile.in distdocs
        rm -f MANIFEST; make MANIFEST;
        touch fetchmail.lsm
        make fetchmail-$(VERSION).tar.gz 
@@ -296,8 +305,8 @@ rpm: dist
        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: