resolv.conf option parsing: Fix word separation

[adns.git] / settings.make.in

diff --git a/settings.make.in b/settings.make.in
index 63e337390f62fe7f4d0f59ea46ea7db76b0ebd05..3e14589df160aa44c7c471bf5740beadba54fa8e 100644 (file)
--- 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  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.)
@@ -20,53 +21,17 @@
 #  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 *.o *.tmp* *.so *.so.* pipe.*
+               rm -f output-*.err output-*.leftover
+               rm -f output-*.out output-*.report
 
 distclean:             clean
-               rm -f $(TARGETS) *~ ./#*# core *.orig *.rej Makefile
+               rm -f $(TARGETS) *~ ./#*# core *.orig *.rej Makefile config.h
 
 distprep:              $(AUTOCSRCS) $(AUTOCHDRS)