X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.in;h=5c29ccbc6a3f3972379f506160ea7cb2cc81a8b4;hb=HEAD;hp=4faa50b5df759ba93114b703e9e36e654202df6b;hpb=f93780315a35ba08211c4c1539fea2b39b15c64b;p=adns.git diff --git a/Makefile.in b/Makefile.in index 4faa50b..bc1a0b2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,11 +1,7 @@ # Makefile[.in] - top-level Makefile # -# This file is part of adns, which is -# 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 file is part of adns, which is Copyright Ian Jackson +# and contributors (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 @@ -20,9 +16,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.1 srcdir= @srcdir@ VPATH= @srcdir@ @@ -34,6 +32,8 @@ else SUBDIRS_DYNAMIC= endif +WEBDIR=web + SUBDIRS= src $(SUBDIRS_DYNAMIC) client regress all install uninstall clean distclean mostlyclean maintainer-clean distprep: @@ -47,7 +47,8 @@ clean-here mostlyclean-here: rm -rf dist_tmp web adnshost.txt distclean-here maintainer-clean-here: clean-here - rm -f settings.make config.cache config.log config.status Makefile + rm -f settings.make common.make + rm -f config.cache config.log config.status Makefile install-strip: $(MAKE) INSTALL_PROGRAM_FLAGS=-s @@ -68,6 +69,13 @@ dist: distprep 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 $(DESTDIR)$(WEBDIR)/ + $(INSTALL_DATA) $(srcdir)/src/adns.h $(DESTDIR)$(WEBDIR)/adns.h.txt + $(INSTALL_DATA) COPYING $(DESTDIR)$(WEBDIR)/COPYING.txt + $(INSTALL_DATA) adnshost.txt $(DESTDIR)$(WEBDIR)/ + check: all $(MAKE) -C regress check