X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=regress%2FMakefile.in;h=9a249c25ddd69fbac974af2e55c645d8b0aff9c1;hp=862144f6c5fb81b7fb4535ba120ffb90c916ffca;hb=73c4c523c0fc436ed51e7d473e016d36e9a4b6bd;hpb=1c957fdadf0ab368ab1266fbd6a9ea8fbe3b271d

diff --git a/regress/Makefile.in b/regress/Makefile.in
index 862144f..9a249c2 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -1,6 +1,6 @@
 # regress/Makefile - regression test Makefile
 # 
-#  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
@@ -16,7 +16,15 @@
 #  along with this program; if not, write to the Free Software Foundation,
 #  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 
-DIRCFLAGS=	-I../src
+srcdir=		@srcdir@
+VPATH=		@srcdir@
+
+TARGETS=	hplayback hrecord
+AUTOCSRCS=	harness.h hrecord.c hplayback.c hcommon.c
+include		$(srcdir)/../settings.make
+include		$(srcdir)/../src/adns.make
+
+DIRCFLAGS=	-I$(srcdir)/../src
 
 HCPPFLAGS:= $(foreach F,			\
 	gettimeofday select			\
@@ -24,29 +32,26 @@ HCPPFLAGS:= $(foreach F,			\
 	sendto recvfrom read write writev	\
 , -D$F=H$F)
 
-HARNLOBJS=	$(addsuffix _d.o, $(basename $(LIBOBJS)))
+HARNLOBJS=	$(addsuffix _d.o, $(basename $(LIBOBJS))) $(LDLIBS)
 ALLOBJS=	$(HARNLOBJS) dtest.o hrecord.o hplayback.o hcommon.o
-AUTOCSRCS=	harness.h hrecord.c hplayback.c hcommon.c
-
-TARGETS=	hplayback hrecord
-
-include ../settings.make
-include ../src/adns.make
 
 .PRECIOUS:	$(AUTOCSRCS)
 
 check:		$(TARGETS)
 		./checkall
 
-hrecord:	../client/adnstest.o hrecord.o hcommon.o $(HARNLOBJS)
-hplayback:	../client/adnstest.o hplayback.o hcommon.o $(HARNLOBJS)
+hrecord:	adnstest_c.o hrecord.o hcommon.o $(HARNLOBJS)
+hplayback:	adnstest_c.o hplayback.o hcommon.o $(HARNLOBJS)
 
-%_d.o:		../src/%.c
+%_d.o:		$(srcdir)/../src/%.c
 		$(CC) $(HCPPFLAGS) -c -g -o $@ $<
 
-$(ALLOBJS):	../src/adns.h ../src/internal.h harness.h
+%_c.o:		$(srcdir)/../client/%.c
+		$(CC) $(HCPPFLAGS) -I $(srcdir)/../src -c -g -o $@ $<
+
+$(ALLOBJS):	$(srcdir)/../src/adns.h $(srcdir)/../src/internal.h harness.h
 
 %::	%.m4 hmacros.i4 hsyscalls.i4
-	m4 -P $< >$@-a.new
+	$(M4) -P $< >$@-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