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

diff --git a/client/Makefile.in b/client/Makefile.in
index 76a8bd9..0588072 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -1,6 +1,10 @@
 # client/Makefile - client program(s) 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-2000,2003,2006  Ian Jackson
+#    Copyright (C) 1999-2000,2003,2006  Tony Finch
+#    Copyright (C) 1991 Massachusetts Institute of Technology
+#  (See the file INSTALL for full details.)
 #  
 #  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 +20,63 @@
 #  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
+PROGS_SYSDEP=	@PROGS_HAVE_TSEARCH@
+ENABLE_DYNAMIC=	@ENABLE_DYNAMIC@
 
-install:	$(TARGETS)
-		$(INSTALL_BIN) $(TARGETS) $(bin_dir)
+PROGRAMS=	adnslogres adnsheloex adnshost $(PROGS_SYSDEP)
+PROGRAMS_LOCAL=	fanftest adnstest addrtext
+PROGRAMS_ALL=	$(PROGRAMS) $(PROGRAMS_LOCAL)
 
-adnstest:	adnstest.o $(srcdir)/dynamic/$(SHLIBFILE)
+STATIC_LIB=	../src/libadns.a
+
+ifeq ($(ENABLE_DYNAMIC),elf)
+DYNAMIC_DEP=	../dynamic/$(SHLIBFILE)
+DYNAMIC_LINK=	-L../dynamic -ladns
+DYNAMIC_SUFFIX=	_s
+else
+DYNAMIC_DEP=	$(STATIC_LIB)
+DYNAMIC_LINK=	$(STATIC_LIB)
+DYNAMIC_SUFFIX=
+endif
+
+TARG_INSTALL=	$(PROGRAMS)
+TARG_LOCAL=	$(addsuffix $(DYNAMIC_SUFFIX), $(PROGRAMS_ALL))
+TARGETS=	$(TARG_LOCAL) $(TARG_INSTALL)
+include		../settings.make
+
+ADNSDIR=	$(srcdir)/../src
+DIRCFLAGS=	-I. -I../src -I$(ADNSDIR)
+
+TARG_OBJS=	$(addsuffix .o, $(PROGRAMS_ALL))
+ADH_OBJS=	adh-main.o adh-opts.o adh-query.o
+ALL_OBJS=	$(ADH_OBJS) $(TARG_OBJS)
+
+
+all:		$(TARGETS)
+
+install:	$(TARG_INSTALL)
+		mkdir -p $(bindir)
+		set -xe; for f in $(TARG_INSTALL); \
+			do $(INSTALL_PROGRAM) $$f $(bindir)/$$f; done
+
+uninstall:
+		for f in $(TARGETS); do rm -f $(bindir)/$$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 ../src/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)