changelog: Document changes in 1.6.0 and finalise version number

[adns.git] / client / Makefile.in

diff --git a/client/Makefile.in b/client/Makefile.in
index cf64e8e81b561c6fcdc55c5cce52936dfea8b0bd..6264482505769ddcbfab38922cfbc38b8248128b 100644 (file)
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -1,15 +1,15 @@
 # client/Makefile - client program(s) Makefile
 # 
-#  This file is
-#    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
-#
-#  It is part of adns, which is
-#    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
-#    Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>
+#  This file is part of adns, which is
+#    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.)
 #  
 #  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,8 +18,7 @@
 #  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.
 
 srcdir=                @srcdir@
 VPATH=         @srcdir@
@@ -28,14 +27,14 @@ PROGS_SYSDEP=       @PROGS_HAVE_TSEARCH@
 ENABLE_DYNAMIC=        @ENABLE_DYNAMIC@
 
 PROGRAMS=      adnslogres adnsheloex adnshost $(PROGS_SYSDEP)
-PROGRAMS_LOCAL=        fanftest adnstest
+PROGRAMS_LOCAL=        fanftest adnstest addrtext
 PROGRAMS_ALL=  $(PROGRAMS) $(PROGRAMS_LOCAL)
 
-STATIC_LIB=    $(ADNSDIR)/libadns.a
+STATIC_LIB=    ../src/libadns.a
 
 ifeq ($(ENABLE_DYNAMIC),elf)
-DYNAMIC_DEP=   $(srcdir)/../dynamic/$(SHLIBFILE)
-DYNAMIC_LINK=  -L$(srcdir)/../dynamic -ladns
+DYNAMIC_DEP=   ../dynamic/$(SHLIBFILE)
+DYNAMIC_LINK=  -L../dynamic -ladns
 DYNAMIC_SUFFIX=        _s
 else
 DYNAMIC_DEP=   $(STATIC_LIB)
@@ -46,25 +45,25 @@ endif
 TARG_INSTALL=  $(PROGRAMS)
 TARG_LOCAL=    $(addsuffix $(DYNAMIC_SUFFIX), $(PROGRAMS_ALL))
 TARGETS=       $(TARG_LOCAL) $(TARG_INSTALL)
-include                $(srcdir)/../settings.make
+include                ../settings.make
 
-DIRCFLAGS=     -I$(srcdir)/../src
+ADNSDIR=       $(srcdir)/../src
+DIRCFLAGS=     -I. -I../src -I$(ADNSDIR)
 
 TARG_OBJS=     $(addsuffix .o, $(PROGRAMS_ALL))
 ADH_OBJS=      adh-main.o adh-opts.o adh-query.o
 ALL_OBJS=      $(ADH_OBJS) $(TARG_OBJS)
 
-ADNSDIR=       $(srcdir)/../src/
 
 all:           $(TARGETS)
 
 install:       $(TARG_INSTALL)
-               mkdir -p $(bin_dir)
+               mkdir -p $(bindir)
                set -xe; for f in $(TARG_INSTALL); \
-                       do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done
+                       do $(INSTALL_PROGRAM) $$f $(bindir)/$$f; done
 
 uninstall:
-               for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done
+               for f in $(TARGETS); do rm -f $(bindir)/$$f; done
 
 adnshost:      $(ADH_OBJS) $(DYNAMIC_DEP)
                $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS)
@@ -73,7 +72,7 @@ adnshost_s:   $(ADH_OBJS) $(STATIC_LIB)
                $(CC) $(LDFLAGS) $(ADH_OBJS) $(STATIC_LIB) -o $@ $(LDLIBS)
 
 $(ADH_OBJS):           adnshost.h
-$(ALL_OBJS):           $(ADNSDIR)/adns.h $(ADNSDIR)/config.h
+$(ALL_OBJS):           $(ADNSDIR)/adns.h ../src/config.h
 adnsresfilter.o:       $(ADNSDIR)/tvarith.h
 
 %:             %.o $(DYNAMIC_DEP)