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

diff --git a/client/Makefile.in b/client/Makefile.in
index 1615340..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, 1998 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
@@ -16,12 +21,54 @@
 #  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
-TARGETS=	adnstest
+srcdir=		@srcdir@
+VPATH=		@srcdir@
 
-include ../settings.make
+PROGS_SYSDEP=		@PROGS_HAVE_TSEARCH@
 
-install:	$(TARGETS)
-		$(INSTALL_BIN) $(TARGETS) $(bin_dir)
+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 $(TARG_INSTALL); \
+			do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done
+
+uninstall:
+		for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done
+
+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:	adnstest.o ../dynamic/$(LIBFILE)