Update copyright dates

[adns.git] / regress / Makefile.in

diff --git a/regress/Makefile.in b/regress/Makefile.in
index 5da4e2891fd53fee4867e4e8bc4242ef36519a40..21e71563aab89da9937b274fd895fdcc2d046580 100644 (file)
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -1,15 +1,15 @@
-# regress/Makefile - regression test Makefile
+# regress/Makefile[.in] - regression test 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 Tony Finch <dot@dotat.at>
+#  This file is part of adns, which is
+#    Copyright (C) 1997-2000,2003,2006,2014-2016  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,19 +18,20 @@
 #  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@
 
-CLIENTS=       adnstest adnshost adnslogres adnsresfilter
+PROGS_SYSDEP=  @PROGS_HAVE_TSEARCH@
+
+CLIENTS=       adnstest adnshost adnslogres $(PROGS_SYSDEP)
 AUTOCHDRS=     harness.h hsyscalls.h hredirect.h
 AUTOCSRCS=     hrecord.c hplayback.c hcommon.c
-include                $(srcdir)/../settings.make
+include                ../settings.make
 include                $(srcdir)/../src/adns.make
 
-DIRCFLAGS=     -I$(srcdir)/../src
+DIRCFLAGS=     -I../src -I$(srcdir) -I$(srcdir)/../src
 
 HCPPFLAGS=     -DADNS_REGRESS_TEST -I.
 
@@ -44,8 +45,14 @@ ALL_OBJS=    $(HARNLOBJS) dtest.o hrecord.o hplayback.o
 
 all install uninstall: $(TARGETS)
 
-check:         $(TARGETS)
-               ./checkall
+ALL_TESTS:=$(patsubst $(srcdir)/case-%.sys,%,$(wildcard $(srcdir)/case-*.sys))
+
+check:         $(TARGETS) $(addprefix check-,$(ALL_TESTS))
+               @echo
+               @echo 'all tests passed or maybe skipped.'
+
+check-%:       case-%.sys
+               @srcdir=$(srcdir) $(srcdir)/r1test $* || test $? = 5
 
 LINK_CMD=      $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
@@ -55,20 +62,30 @@ LINK_CMD=   $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
 %_playback:    %_c.o hplayback.o $(HARNLOBJS)
                $(LINK_CMD)
 
+.SECONDARY: $(addsuffix _c.o, $(filter-out adnshost, $(CLIENTS)))
+# Without this, make will remove <client>_c.o after building <client>.
+# This wastes effort.  (Debian bug #4073.)
+#
+# Also, it exposes us to a bug (in make 3.81, at least) which can
+# cause make to run the rule for building <client> without building
+# <client>_c.o!  (Debian #756123.)
+#
+# See also Savannah #29620, http://savannah.gnu.org/bugs/index.php?29620
+
 adnshost_%:    $(ADH_OBJS) h%.o $(HARNLOBJS)
                $(LINK_CMD)
 
 %_d.o:         $(srcdir)/../src/%.c hredirect.h
-               $(CC) $(HCPPFLAGS) -c -g -o $@ $<
+               $(CC) $(CFLAGS) $(HCPPFLAGS) -c -g -o $@ $<
 
 %_c.o:         $(srcdir)/../client/%.c hredirect.h
-               $(CC) $(HCPPFLAGS) -I $(srcdir)/../src -c -g -o $@ $<
+               $(CC) $(CFLAGS) $(HCPPFLAGS) -I $(srcdir)/../src -c -g -o $@ $<
 
 $(ALL_OBJS):   $(srcdir)/../src/adns.h $(srcdir)/../src/internal.h
 $(ALL_OBJS):   harness.h hsyscalls.h
 $(ADH_OBJS):   $(srcdir)/../client/adnshost.h
 
 %::    %.m4 hmacros.i4 hsyscalls.i4
-       $(M4) -P $< >$@-a.new
+       $(M4) -P -I$(srcdir) $< >$@-a.new
        sed -e 's/hm_comma/,/g; s/hm_squote/'\''/g; /^[  ]*$$/d' <$@-a.new >$@-b.new
-       @mv -f $@-b.new $@; rm -f $@-a.new
+       @mv -f $@-b.new $(srcdir)/$@; rm -f $@-a.new