X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=client%2FMakefile.in;h=9d131c958bb6c14139783e179617c84ecdb41381;hp=76a8bd967ba9db789c71124d787a21ca9358f724;hb=a447049fe33445d7d7c14e444b98171eb9c3f7aa;hpb=11b3519314b471bb042bf3a69bbbb3adaa7aa19d

diff --git a/client/Makefile.in b/client/Makefile.in
index 76a8bd9..9d131c9 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-1999 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,13 +21,44 @@
 #  along with this program; if not, write to the Free Software Foundation,
 #  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 
-SUBDIR=/client
-DIRCFLAGS=	-I$(srcdir)/src
-TARGETS=	adnstest
+srcdir=		@srcdir@
+VPATH=		@srcdir@
 
-include $(srcdir)/settings.make
+PROGRAMS=	adnstest adnslogres adnshost
+PROGRAMS_LOCAL=	fanftest
 
-install:	$(TARGETS)
-		$(INSTALL_BIN) $(TARGETS) $(bin_dir)
+TARG_INSTALL=	$(PROGRAMS)
+TARG_LOCAL=	$(addsuffix _s, $(PROGRAMS) $(PROGRAMS_LOCAL))
+TARGETS=	$(TARG_LOCAL) $(TARG_INSTALL)
+include		$(srcdir)/../settings.make
 
-adnstest:	adnstest.o $(srcdir)/dynamic/$(SHLIBFILE)
+DIRCFLAGS=	-I$(srcdir)/../src
+
+ADH_OBJS=	adh-main.o adh-opts.o adh-query.o
+
+STATIC_LIB=	$(srcdir)/../src/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
+
+$(ADH_OBJS):	adnshost.h
+
+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)
+
+%:		%.o $(DYNAMIC_DEP)
+		$(CC) $(LDFLAGS) $< $(DYNAMIC_LINK) -o $@ $(LDLIBS)
+
+%_s:		%.o $(STATIC_LIB)
+		$(CC) $(LDFLAGS) $< $(STATIC_LIB) -o $@ $(LDLIBS)