Update version numbers to be between releases

[adns.git] / settings.make.in

diff --git a/settings.make.in b/settings.make.in
index 0967cd57f1c77e5d0d26a5de67834f0ece063f0e..81e1bb3c223e8453b2123721154d0a8d7deff7c3 100644 (file)
--- a/settings.make.in
+++ b/settings.make.in
@@ -1,16 +1,16 @@
-# settings.make.in - main configuration settings for Makefiles,
+# settings.make[.in] - main configuration settings for Makefiles,
 #  used by autoconf/configure to generate settings.make
 #  
-#  This file is
-#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
-#
-#  It is part of adns, which is
-#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
-#    Copyright (C) 1999 Tony Finch <dot@dotat.at>
+#  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 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,
@@ -19,49 +19,19 @@
 #  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=         0
-MINOR=         1
-SHLIBFILE=     @SHLIBFILE@
-SHLIBSONAME=   @SHLIBSONAME@
-
-CC=            @CC@
-CFLAGS=                $(AUTOCFLAGS) $(WARNS) $(WERROR) $(DIRCFLAGS) $(XCFLAGS)
-LDLIBS=                @LIBS@ $(XLIBS)
-AUTOCFLAGS=    @CFLAGS@
-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@
-bin_dir=       $(exec_prefix)/bin
-lib_dir=       $(exec_prefix)/lib
-include_dir=   $(prefix)/include
-
-INSTALL=               install -c
-INSTALL_PROGRAM=       $(INSTALL) -m 755 $(INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA=          $(INSTALL) -m 644
+include                ../common.make
 
 all:                   $(TARGETS)
 
 clean mostlyclean:
-               rm -f *.o *.tmp*
+               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)
+distprep:              $(AUTOCSRCS) $(AUTOCHDRS)
 
 maintainer-clean:      distclean
-               -rm -f $(AUTOCSRCS)
+               -rm -f $(AUTOCSRCS) $(AUTOCHDRS)