X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=settings.make.in;h=81e1bb3c223e8453b2123721154d0a8d7deff7c3;hp=a8830daddb46b2f9a2f744a234207b5406f4448c;hb=3212d4ff1f32821483c1c8f2fd592666a83050f1;hpb=15480be436960212fd31b8963516766a68adcdd5

diff --git a/settings.make.in b/settings.make.in
index a8830da..81e1bb3 100644
--- a/settings.make.in
+++ b/settings.make.in
@@ -2,14 +2,15 @@
 #  used by autoconf/configure to generate settings.make
 #  
 #  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,
@@ -18,56 +19,17 @@
 #  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.
 
-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 *.o *.tmp* *.so *.so.*
+		rm -f *.o *.tmp* *.so *.so.* pipe.*
 
 distclean:		clean
-		rm -f $(TARGETS) *~ ./#*# core *.orig *.rej Makefile
+		rm -f $(TARGETS) *~ ./#*# core *.orig *.rej Makefile config.h
 
 distprep:		$(AUTOCSRCS) $(AUTOCHDRS)