Do not run tests of executables not built. Do not build

[adns.git] / client / Makefile.in

diff --git a/client/Makefile.in b/client/Makefile.in
index 9963c1a477aedb2d91e61256864a0af3b3ed3a56..f6971c72be18ff47de45c5335b710aa7f26d6ca4 100644 (file)
--- 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,19 +24,37 @@
 srcdir=                @srcdir@
 VPATH=         @srcdir@
 
-PROGRAMS=      adnstest adnslogres adnshost
+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))
+TARG_LOCAL=    $(addsuffix $(DYNAMIC_SUFFIX), $(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)
 
-STATIC_LIB=    $(srcdir)/../src/libadns.a
-DYNAMIC_DEP=   $(srcdir)/../dynamic/$(SHLIBFILE)
-DYNAMIC_LINK=  -L$(srcdir)/../dynamic -ladns
+ADNSDIR=       $(srcdir)/../src/
 
 all:           $(TARGETS)
 
@@ -47,16 +65,19 @@ install:    $(TARG_INSTALL)
 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)
 
+$(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)
+