X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=settings.make.in;h=d69c8afc2be89f567ff3fa1bb347aa83496877e8;hb=98833810619e9d1725042a07e8ed4aa0a66b5fa4;hp=042d62cfa1cfe02892fa056e04d7c523f6cd0547;hpb=26e1c3d691b52d21a8bb52d9bf3f8e2b42ae6cfa;p=adns.git

diff --git a/settings.make.in b/settings.make.in
index 042d62c..d69c8af 100644
--- a/settings.make.in
+++ b/settings.make.in
@@ -2,7 +2,8 @@
 #  used by autoconf/configure to generate settings.make
 #  
 #  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.)
@@ -20,55 +21,19 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program; if not, write to the Free Software Foundation.
 
-MAJOR=		1
-MINOR=		3
-SHLIBFILE=	@SHLIBFILE@
-SHLIBSONAME=	@SHLIBSONAME@
-SHLIBFORLINK=	@SHLIBFORLINK@
-
-CC=		@CC@
-CFLAGS=		$(AUTOCFLAGS) $(WARNS) $(WERROR) $(DIRCFLAGS) $(XCFLAGS)
-LDFLAGS=	$(AUTOLDFLAGS) $(DIRLDFLAGS) $(XLDFLAGS)
-LDLIBS=		@LIBS@ $(XLIBS)
-AUTOCFLAGS=	@CFLAGS@
-AUTOLDFLAGS=	@LDFLAGS@
-WARNS=		@WARNS@
-#WERROR=	-Werror
-
-M4=		m4
-RANLIB=		@RANLIB@
-
-SHLIBCC=	@SHLIBCC@
-
-MKSHLIB_1=	@MKSHLIB_1@
-MKSHLIB_2=	@MKSHLIB_2@
-MKSHLIB_3=	@MKSHLIB_3@
-
-prefix=		@prefix@
-exec_prefix=	@exec_prefix@
-bindir=		@bindir@
-libdir=		@libdir@
-includedir=	@includedir@
-
-AC_INSTALL=	@INSTALL@
-ifeq ($(AC_INSTALL),./install-sh -c)
-INSTALL=	$(srcdir)/../$(AC_INSTALL)
-else
-INSTALL=	$(AC_INSTALL)
-endif
-
-INSTALL_PROGRAM=	$(INSTALL) -m 755 $(INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA=		$(INSTALL) -m 644
+include		../common.make
 
 all:			$(TARGETS)
 
 clean mostlyclean:
+		rm -f $(TARGETS) $(AUTOCSRCS) $(AUTOCHDRS)
 		rm -f *.o *.tmp* *.so *.so.* pipe.*
+		rm -f output-*.err output-*.leftover
+		rm -f output-*.out output-*.report fuzz-* fuzzcat.d
 
 distclean:		clean
-		rm -f $(TARGETS) *~ ./#*# core *.orig *.rej Makefile
+		rm -f *~ ./#*# core *.orig *.rej Makefile config.h
 
-distprep:		$(AUTOCSRCS) $(AUTOCHDRS)
+distprep:
 
 maintainer-clean:	distclean
-		-rm -f $(AUTOCSRCS) $(AUTOCHDRS)