X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=client%2FMakefile.in;h=989ca711f4f5cebf9d79b0ce5d0daa894651f3a5;hb=e24e7155ee921f30b195b079d0e2d29bf268a354;hp=a3a6327ef084106fd5480f1d75d1aee5327042bc;hpb=5476fe648e50a32b81edc2006a2c7ab8cc9dc30a;p=adns.git

diff --git a/client/Makefile.in b/client/Makefile.in
index a3a6327..989ca71 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -1,6 +1,11 @@
 # client/Makefile - client program(s) Makefile
 # 
-#  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+#  This file is
+#    Copyright (C) 1997-1999 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,23 +24,51 @@
 srcdir=		@srcdir@
 VPATH=		@srcdir@
 
-TARG_LOCAL=	adnstest_s
-TARG_INSTALL=	adnstest
+PROGS_SYSDEP=		@PROGS_HAVE_TSEARCH@
+
+PROGRAMS=	adnstest adnslogres adnshost $(PROGS_SYSDEP)
+PROGRAMS_LOCAL=	fanftest
+PROGRAMS_ALL=	$(PROGRAMS) $(PROGRAMS_LOCAL)
+
+TARG_INSTALL=	$(PROGRAMS)
+TARG_LOCAL=	$(addsuffix _s, $(PROGRAMS_ALL))
 TARGETS=	$(TARG_LOCAL) $(TARG_INSTALL)
 include		$(srcdir)/../settings.make
 
 DIRCFLAGS=	-I$(srcdir)/../src
 
+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/
+
+STATIC_LIB=	$(ADNSDIR)/libadns.a
+DYNAMIC_DEP=	$(srcdir)/../dynamic/$(SHLIBFILE)
+DYNAMIC_LINK=	-L$(srcdir)/../dynamic -ladns
+
 all:		$(TARGETS)
 
 install:	$(TARG_INSTALL)
-		set -xe; for f in $(TARGETS); \
+		set -xe; for f in $(TARG_INSTALL); \
 			do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done
 
 uninstall:
 		for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done
 
-adnstest:	adnstest.o $(srcdir)/../dynamic/$(SHLIBFILE)
+adnshost:	$(ADH_OBJS) $(DYNAMIC_DEP)
+		$(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS)
+
+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
+adnsresfilter.o:	$(ADNSDIR)/tvarith.h
+
+%:		%.o $(DYNAMIC_DEP)
+		$(CC) $(LDFLAGS) $< $(DYNAMIC_LINK) -o $@ $(LDLIBS)
+
+%_s:		%.o $(STATIC_LIB)
+		$(CC) $(LDFLAGS) $< $(STATIC_LIB) -o $@ $(LDLIBS)
 
-adnstest_s:	adnstest.o $(srcdir)/../src/libadns.a
-		$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)