HTMLize the design notes.

[~andy/fetchmail] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index fac4dc900d0def704844c2304c2679949de964d2..0904dcb5451ee53e8b341bd650f088df3cf2ed78 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,7 +3,7 @@
 # If you're running QNX, we can't assume a working autoconf.
 # So just uncomment all the lines marked QNX.
 
-VERS=3.9.6
+VERS=4.0.0
 
 # Ultrix 2.2 make doesn't expand the value of VPATH.
 srcdir = @srcdir@
@@ -77,15 +77,16 @@ ETAGS = etags -tw
 CTAGS = ctags -tw
 
 protobjs = rcfile_y.o rcfile_l.o socket.o getpass.o pop2.o pop3.o imap.o \
-       etrn.o fetchmail.o options.o daemon.o smtp.o driver.o rfc822.o \
-       xmalloc.o uid.o mxget.o md5c.o md5ify.o interface.o netrc.o base64.c \
+       etrn.o fetchmail.o env.o options.o daemon.o smtp.o driver.o rfc822.o \
+       xmalloc.o uid.o mxget.o md5c.o md5ify.o interface.o netrc.o base64.o \
        error.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)/options.c $(srcdir)/daemon.c    \
+       $(srcdir)/fetchmail.c $(srcdir)/env.c                           \
+       $(srcdir)/options.c $(srcdir)/daemon.c                          \
        $(srcdir)/driver.c $(srcdir)/rfc822.c $(srcdir)/smtp.c          \
        $(srcdir)/xmalloc.c $(srcdir)/uid.c $(srcdir)/mxget.c           \
        $(srcdir)/md5c.c $(srcdir)/md5ify.c $(srcdir)/interface.c       \
@@ -106,9 +107,8 @@ fetchmail: $(objs)
 rfc822: rfc822.c
        gcc -DTESTMAIN -g rfc822.c -o rfc822
 
-# -I. is needed to find config.h in the build directory.
 .c.o:
-       $(CC) $(defines) -c -I. -I$(srcdir) $(CFLAGS) $< $(OUTPUT_OPTION)
+       $(CC) $(defines) -c -I$(srcdir) $(CFLAGS) $< $(OUTPUT_OPTION)
 
 # lex rule
 .l.o:
@@ -138,7 +138,7 @@ MAKE = make
 
 FORCE:
 
-tagsrcs = $(srcs) $(srcdir)/rcfile_l.c $(srcdir)/rcfile_y.c
+tagsrcs = $(srcs) rcfile_l.c rcfile_y.c
 TAGS: $(tagsrcs)
        $(ETAGS) $(tagsrcs)
 tags: $(tagsrcs)
@@ -161,7 +161,7 @@ clean:
        -rm -f fetchmail *.o core fetchmail.dvi \
               rcfile_l.c rcfile_y.h rcfile_y.c \
               fetchmail.tar fetchmail.tar.gz \
-              rfc822 FAQ
+              rfc822 
 
 distclean: clean 
        -rm -f Makefile config.h TAGS tags
@@ -169,6 +169,7 @@ distclean: clean
        -rm -f fetchmail.log fetchmail.toc fetchmail.*aux
 
 realclean: distclean # fetchmail.info*
+       rm -f FAQ FEATURES
 
 mostlyclean: clean
 
@@ -193,8 +194,8 @@ config.h.in: acconfig.h configure.in
 .NOEXPORT:
 
 # Special dependencies, not easily handled without explicit rules
-$(srcdir)/rcfile_l.c $(srcdir)/rcfile_l.h: $(srcdir)/rcfile_l.l
-$(srcdir)/rcfile_y.c $(srcdir)/rcfile_y.h: $(srcdir)/rcfile_y.y
+rcfile_l.c rcfile_l.h: $(srcdir)/rcfile_l.l
+rcfile_y.c rcfile_y.h: $(srcdir)/rcfile_y.y
 
 parser = $(srcdir)/rcfile_l.l $(srcdir)/rcfile_y.y
 headers = $(srcdir)/fetchmail.h $(srcdir)/socket.h $(srcdir)/smtp.h \
@@ -202,8 +203,10 @@ headers = $(srcdir)/fetchmail.h $(srcdir)/socket.h $(srcdir)/smtp.h \
        $(srcdir)/netrc.h $(srcdir)/tunable.h
 extra = $(srcdir)/alloca.c $(srcdir)/getopt.[ch] $(srcdir)/getopt1.c \
        $(srcdir)/strcasecmp.c
-docs = $(srcdir)/COPYING $(srcdir)/README $(srcdir)/INSTALL $(srcdir)/NEWS \
-       $(srcdir)/NOTES $(srcdir)/fetchmail.lsm $(srcdir)/sample.rcfile \
+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)/*.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 \
@@ -215,16 +218,28 @@ all = $(docs) $(config) $(srcs) $(parser) $(headers) $(extra) $(scripts) \
 
 MANIFEST: $(srcdir) Makefile.in
        @echo $(all) | tr "[ \t]" '\n' | sort | sed "s/\\./fetchmail-$(VERS)/" >MANIFEST
+       @wc -l MANIFEST
 
 FAQ: fetchmail.FAQ.html
-       lynx -dump -nolist fetchmail.FAQ.html >FAQ
+       echo "(This document was generated from fetchmail.FAQ.html)" >FAQ
+       lynx -dump -nolist fetchmail.FAQ.html >>FAQ
+
+FEATURES: fetchmail-features.html
+       echo "(This document was generated from fetchmail-features.html)" >FEATURES
+       lynx -dump -nolist fetchmail-features.html | grep -v "Back to " >>FEATURES
+
+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
 
 # Make distribution, update LSM with proper size, remake distribution
 dist: Makefile.in  
+       rm MANIFEST; make MANIFEST;
        make fetchmail-$(VERS).tar.gz 
        lsmgen.sh $(VERS) `wc -c fetchmail-$(VERS).tar.gz` >fetchmail.lsm
        make fetchmail-$(VERS).tar.gz
        ls -l fetchmail-$(VERS).tar.gz
+       @echo "Don't forget to build RPMs from root!"
 
 fetchmail-$(VERS).tar: $(all)
        (cd ..; tar -cf fetchmail-$(VERS).tar `cat fetchmail-$(VERS)/MANIFEST`)
@@ -240,7 +255,7 @@ rpm: dist
        cp fetchmail-$(VERS).tar.gz $(RPMROOT)/SOURCES;
        $(srcdir)/specgen.sh $(VERS) >$(RPMROOT)/SPECS/fetchmail.spec
        cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) fetchmail.spec  
-       cp $(RPMROOT)/RPMS/i386/fetchmail-$(VERS)*.rpm $(srcdir)
+       cp $(RPMROOT)/RPMS/`arch|sed 's/i[4-9]86/i386/'`/fetchmail-$(VERS)*.rpm $(srcdir)
        cp $(RPMROOT)/SRPMS/fetchmail-$(VERS)*.src.rpm $(srcdir)
 
 # The automatically generated dependencies below may omit config.h