X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=regress%2FMakefile.in;h=fd08d800c17db70d0a7fbf7e59e040ca982ce609;hp=c67c68280238bcde04b883cfd2a0b1f21ad44eac;hb=73eb26037c46bebeaa30ba38eba887216f0e9a6e;hpb=81937f1c2254ca2dacc34aaa2c24173d8914c060

diff --git a/regress/Makefile.in b/regress/Makefile.in
index c67c682..fd08d80 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -1,6 +1,11 @@
 # regress/Makefile - regression test Makefile
 # 
-#  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+#  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 program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -19,39 +24,49 @@
 srcdir=		@srcdir@
 VPATH=		@srcdir@
 
-TARGETS=	hplayback hrecord
-AUTOCSRCS=	harness.h hrecord.c hplayback.c hcommon.c
+CLIENTS=	adnstest adnshost
+AUTOCHDRS=	harness.h hsyscalls.h hredirect.h
+AUTOCSRCS=	hrecord.c hplayback.c hcommon.c
 include		$(srcdir)/../settings.make
 include		$(srcdir)/../src/adns.make
 
 DIRCFLAGS=	-I$(srcdir)/../src
 
-HCPPFLAGS:= $(foreach F,			\
-	gettimeofday select			\
-	socket fcntl connect close		\
-	sendto recvfrom read write writev	\
-, -D$F=H$F)
+HCPPFLAGS=	-DADNS_REGRESS_TEST -I.
 
-HARNLOBJS=	$(addsuffix _d.o, $(basename $(LIBOBJS)))
-ALLOBJS=	$(HARNLOBJS) dtest.o hrecord.o hplayback.o hcommon.o
+REDIRLIBOBJS=	$(addsuffix _d.o, $(basename $(LIBOBJS)))
+HARNLOBJS=	hcommon.o $(REDIRLIBOBJS)
+TARGETS=	$(addsuffix _record, $(CLIENTS)) $(addsuffix _playback, $(CLIENTS))
+ADH_OBJS=	adh-main_c.o adh-opts_c.o adh-query_c.o
+ALL_OBJS=	$(HARNLOBJS) dtest.o hrecord.o hplayback.o
 
-.PRECIOUS:	$(AUTOCSRCS)
+.PRECIOUS:	$(AUTOCSRCS) $(AUTOCHDRS)
+
+all install uninstall: $(TARGETS)
 
 check:		$(TARGETS)
 		./checkall
 
-all install uninstall:
+LINK_CMD=	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
+
+%_record:	%_c.o hrecord.o $(HARNLOBJS)
+		$(LINK_CMD)
+
+%_playback:	%_c.o hplayback.o $(HARNLOBJS)
+		$(LINK_CMD)
 
-hrecord:	adnstest_c.o hrecord.o hcommon.o $(HARNLOBJS)
-hplayback:	adnstest_c.o hplayback.o hcommon.o $(HARNLOBJS)
+adnshost_%:	$(ADH_OBJS) h%.o $(HARNLOBJS)
+		$(LINK_CMD)
 
-%_d.o:		$(srcdir)/../src/%.c
+%_d.o:		$(srcdir)/../src/%.c hredirect.h
 		$(CC) $(HCPPFLAGS) -c -g -o $@ $<
 
-%_c.o:		$(srcdir)/../client/%.c
+%_c.o:		$(srcdir)/../client/%.c hredirect.h
 		$(CC) $(HCPPFLAGS) -I $(srcdir)/../src -c -g -o $@ $<
 
-$(ALLOBJS):	$(srcdir)/../src/adns.h $(srcdir)/../src/internal.h harness.h
+$(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