X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=client%2FMakefile.in;h=f6971c72be18ff47de45c5335b710aa7f26d6ca4;hp=ee0053957c3fc2b16fb896508855068d6551d901;hb=a069d77f2601cbaf8a6eca34e0af656c7f39ae9e;hpb=41559f53541ae03b5647c41c42883dc4b78634d9

diff --git a/client/Makefile.in b/client/Makefile.in
index ee00539..f6971c7 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -1,10 +1,10 @@
 # client/Makefile - client program(s) Makefile
 # 
 #  This file is
-#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+#    Copyright (C) 1997-2000 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) 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
@@ -24,12 +24,27 @@
 srcdir=		@srcdir@
 VPATH=		@srcdir@
 
-PROGRAMS=	adnstest adnslogres adnshost adnsresfilter
+PROGS_SYSDEP=	@PROGS_HAVE_TSEARCH@
+ENABLE_DYNAMIC=	@ENABLE_DYNAMIC@
+
+PROGRAMS=	adnstest adnslogres adnshost $(PROGS_SYSDEP)
 PROGRAMS_LOCAL=	fanftest
 PROGRAMS_ALL=	$(PROGRAMS) $(PROGRAMS_LOCAL)
 
+STATIC_LIB=	$(ADNSDIR)/libadns.a
+
+ifeq ($(ENABLE_DYNAMIC),elf)
+DYNAMIC_DEP=	$(srcdir)/../dynamic/$(SHLIBFILE)
+DYNAMIC_LINK=	-L$(srcdir)/../dynamic -ladns
+DYNAMIC_SUFFIX=	_s
+else
+DYNAMIC_DEP=	$(STATIC_LIB)
+DYNAMIC_LINK=	$(STATIC_LIB)
+DYNAMIC_SUFFIX=
+endif
+
 TARG_INSTALL=	$(PROGRAMS)
-TARG_LOCAL=	$(addsuffix _s, $(PROGRAMS_ALL))
+TARG_LOCAL=	$(addsuffix $(DYNAMIC_SUFFIX), $(PROGRAMS_ALL))
 TARGETS=	$(TARG_LOCAL) $(TARG_INSTALL)
 include		$(srcdir)/../settings.make
 
@@ -41,10 +56,6 @@ 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)