X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/11b3519314b471bb042bf3a69bbbb3adaa7aa19d..053b9ec6b3baf06c69318d6864e78417979eb78c:/regress/Makefile.in

diff --git a/regress/Makefile.in b/regress/Makefile.in
index 4419b15..2055f08 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,8 +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. 
 
-SUBDIR=/regress
-DIRCFLAGS=	-I$(srcdir)/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			\
@@ -27,27 +34,24 @@ HCPPFLAGS:= $(foreach F,			\
 
 HARNLOBJS=	$(addsuffix _d.o, $(basename $(LIBOBJS)))
 ALLOBJS=	$(HARNLOBJS) dtest.o hrecord.o hplayback.o hcommon.o
-AUTOCSRCS=	harness.h hrecord.c hplayback.c hcommon.c
-
-TARGETS=	hplayback hrecord
-
-include $(srcdir)/settings.make
-include $(srcdir)/src/adns.make
 
 .PRECIOUS:	$(AUTOCSRCS)
 
 check:		$(TARGETS)
 		./checkall
 
-hrecord:	$(srcdir)/client/adnstest.o hrecord.o hcommon.o $(HARNLOBJS)
-hplayback:	$(srcdir)/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:		$(srcdir)/src/%.c
+%_d.o:		$(srcdir)/../src/%.c
 		$(CC) $(HCPPFLAGS) -c -g -o $@ $<
 
-$(ALLOBJS):	$(srcdir)/src/adns.h $(srcdir)/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