changelog: Document changes in 1.6.0 and finalise version number

[adns.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index b3f7b458ced39ddb0eac71e6fe60f98dea29450f..976a1595d3cc70c3ebc5b5da01ff9de98457d81d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,8 @@
 # Makefile[.in] - top-level Makefile
 #  
 #  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014  Ian Jackson
+#    Copyright (C) 1997-2000,2003,2006,2014-2016,2020  Ian Jackson
+#    Copyright (C) 2014  Mark Wooding
 #    Copyright (C) 1999-2000,2003,2006  Tony Finch
 #    Copyright (C) 1991 Massachusetts Institute of Technology
 #  (See the file INSTALL for full details.)
@@ -19,9 +20,11 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program; if not, write to the Free Software Foundation.
 
+include                ./common.make
+
 # Remember to change ADNS_VERSION_STRING in client/client.h too, and
-# possibly library soname (MAJOR and MINOR in settings.make.in).
-DISTVERSION=   1.5.0~~
+# possibly library soname (MAJOR and MINOR in common.make.in).
+DISTVERSION=   1.6.0
 
 srcdir=                @srcdir@
 VPATH=         @srcdir@
@@ -33,6 +36,8 @@ else
 SUBDIRS_DYNAMIC=
 endif
 
+WEBDIR=web
+
 SUBDIRS= src $(SUBDIRS_DYNAMIC) client regress
 
 all install uninstall clean distclean mostlyclean maintainer-clean distprep:
@@ -43,10 +48,11 @@ all-here install-here uninstall-here distprep-here: README
 
 clean-here mostlyclean-here:
                rm -f *~ ./#*# core *.orig *.rej adns-*.tar.gz
-               rm -rf dist_tmp
+               rm -rf dist_tmp web adnshost.txt
 
 distclean-here maintainer-clean-here:  clean-here
-               rm -f settings.make config.h config.cache config.log config.status
+       rm -f settings.make common.make
+       rm -f config.cache config.log config.status Makefile
 
 install-strip:
        $(MAKE) INSTALL_PROGRAM_FLAGS=-s
@@ -64,6 +70,16 @@ dist:                        distprep
        gzip -9 $(dist_tmp).tar
        mv $(dist_tmp).tar.gz .
 
+adnshost.txt: all
+       client/adnshost_s --help >$@.tmp && mv -f $@.tmp $@
+
+web-install: adnshost.txt
+       test -e $(WEBDIR) || mkdir $(WEBDIR)
+       $(INSTALL_DATA) $(srcdir)/README.html $(WEBDIR)/
+       $(INSTALL_DATA) $(srcdir)/src/adns.h $(WEBDIR)/adns.h.txt
+       $(INSTALL_DATA) COPYING $(WEBDIR)/COPYING.txt
+       $(INSTALL_DATA) adnshost.txt $(WEBDIR)/
+
 check:                 all
        $(MAKE) -C regress check