X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=Makefile.in;h=dd55a3dfd4b04fc24345b515d98973a56f47fdb8;hp=e416df0b4be8fe31bbe249c5907596af9ef384f7;hb=58a876e5ac9539ff14acb7dc3ea3633f5bdb41d8;hpb=e1054f1582fe29f19348180c1318ce2120c1ac3d

diff --git a/Makefile.in b/Makefile.in
index e416df0..dd55a3d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,14 +1,15 @@
 # Makefile[.in] - top-level Makefile
 #  
 #  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+#    Copyright (C) 1997-2000,2003,2006,2014  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.)
 # 
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
+#  the Free Software Foundation; either version 3, or (at your option)
 #  any later version.
 #  
 #  This program is distributed in the hope that it will be useful,
@@ -17,12 +18,13 @@
 #  GNU General Public License for more details.
 #  
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software Foundation,
-#  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+#  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.3
+# possibly library soname (MAJOR and MINOR in common.make.in).
+DISTVERSION=	1.5.0~rc1~
 
 srcdir=		@srcdir@
 VPATH=		@srcdir@
@@ -34,6 +36,8 @@ else
 SUBDIRS_DYNAMIC=
 endif
 
+WEBDIR=web
+
 SUBDIRS= src $(SUBDIRS_DYNAMIC) client regress
 
 all install uninstall clean distclean mostlyclean maintainer-clean distprep:
@@ -44,10 +48,10 @@ 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 config.cache config.log config.status Makefile
 
 install-strip:
 	$(MAKE) INSTALL_PROGRAM_FLAGS=-s
@@ -56,21 +60,31 @@ dist_tmp=dist_tmp/adns-$(DISTVERSION)
 dist:			distprep
 	rm -rf dist_tmp*
 	mkdir dist_tmp $(dist_tmp)
-	find \( -name CVS -o -name dist_tmp* \) -prune -o -type d -print | \
+	find \( -name .git -o -name dist_tmp* \) -prune -o -type d -print | \
 		sed -e 's#.*#mkdir -p $(dist_tmp)/&#' | sh
-	find \( -name CVS -o -name dist_tmp* \) -prune -o -type f -print | \
+	find \( -name .git -o -name dist_tmp* \) -prune -o -type f -print | \
 		sed -e 's#.*#ln & $(dist_tmp)/&#' | sh
 	$(MAKE) -C dist_tmp/adns-$(DISTVERSION) distclean
 	cd dist_tmp && tar cf ../$(dist_tmp).tar `basename $(dist_tmp)`
 	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
 
 README:			README.html
-	lynx -dump -number_links -cfg=/dev/null ./README.html >README.tmp
-	mv -f README.tmp README
+	lynx -dump -number_links -cfg=/dev/null $(srcdir)/README.html >README.tmp
+	mv -f README.tmp $(srcdir)/README
 
 TAGS info dvi:
 	# do nothing