New internal consistency checking with assert if right options set.

[adns.git] / settings.make.in

diff --git a/settings.make.in b/settings.make.in
index 43139727d5a79497bd302c9cbe5fd54aba7f7623..7e0a249ede75a71ad00f9a29ee353fcebc732581 100644 (file)
--- a/settings.make.in
+++ b/settings.make.in
@@ -1,7 +1,7 @@
 # settings.make.in - main configuration settings for Makefiles,
 #  used by autoconf/configure to generate settings.make
 #  
-#  This file is part of adns, which is Copyright (C) 1997, 1998 Ian Jackson
+#  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
 #
 #  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
@@ -17,7 +17,6 @@
 #  along with this program; if not, write to the Free Software Foundation,
 #  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 
-DISTVERSION=   0.1
 MAJOR=         0
 MINOR=         1
 SHLIBFILE=     @SHLIBFILE@
@@ -25,6 +24,7 @@ SHLIBSONAME=  @SHLIBSONAME@
 
 CC=            @CC@
 CFLAGS=                $(AUTOCFLAGS) $(WARNS) $(WERROR) $(DIRCFLAGS) $(XCFLAGS)
+LDLIBS=                @LIBS@ $(XLIBS)
 AUTOCFLAGS=    @CFLAGS@
 WARNS=         @WARNS@
 #WERROR=       -Werror
@@ -44,18 +44,17 @@ bin_dir=    $(exec_prefix)/bin
 lib_dir=       $(exec_prefix)/lib
 include_dir=   $(prefix)/include
 
-INSTALL=               install -o 0 -g 0
+INSTALL=               install -c
 INSTALL_PROGRAM=       $(INSTALL) -m 755 $(INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA=          $(INSTALL) -m 644
 
 all:                   $(TARGETS)
 
 clean mostlyclean:
-               rm -f *.o 
+               rm -f *.o *.tmp*
 
 distclean:             clean
-               rm -f $(TARGETS) *~ ./#*# core *.orig *.rej
-               rm -f Makefile settings.make config.h config.cache config.log
+               rm -f $(TARGETS) *~ ./#*# core *.orig *.rej Makefile
 
 distprep:              $(AUTOCSRCS)