client/adh-query.c: Surprising comma rather than semicolon.

[adns.git] / client / Makefile.in

diff --git a/client/Makefile.in b/client/Makefile.in
index ee0053957c3fc2b16fb896508855068d6551d901..01f2fcda4d44ce394c48926a2ffbb97a70cc62ce 100644 (file)
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -1,11 +1,10 @@
 # client/Makefile - client program(s) Makefile
 # 
-#  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 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
@@ -24,35 +23,47 @@
 srcdir=                @srcdir@
 VPATH=         @srcdir@
 
-PROGRAMS=      adnstest adnslogres adnshost adnsresfilter
-PROGRAMS_LOCAL=        fanftest
+PROGS_SYSDEP=  @PROGS_HAVE_TSEARCH@
+ENABLE_DYNAMIC=        @ENABLE_DYNAMIC@
+
+PROGRAMS=      adnslogres adnsheloex adnshost $(PROGS_SYSDEP)
+PROGRAMS_LOCAL=        fanftest adnstest
 PROGRAMS_ALL=  $(PROGRAMS) $(PROGRAMS_LOCAL)
 
+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 _s, $(PROGRAMS_ALL))
+TARG_LOCAL=    $(addsuffix $(DYNAMIC_SUFFIX), $(PROGRAMS_ALL))
 TARGETS=       $(TARG_LOCAL) $(TARG_INSTALL)
-include                $(srcdir)/../settings.make
+include                ../settings.make
 
-DIRCFLAGS=     -I$(srcdir)/../src
+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)
 
-ADNSDIR=       $(srcdir)/../src/
-
-STATIC_LIB=    $(ADNSDIR)/libadns.a
-DYNAMIC_DEP=   $(srcdir)/../dynamic/$(SHLIBFILE)
-DYNAMIC_LINK=  -L$(srcdir)/../dynamic -ladns
 
 all:           $(TARGETS)
 
 install:       $(TARG_INSTALL)
+               mkdir -p $(bindir)
                set -xe; for f in $(TARG_INSTALL); \
-                       do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done
+                       do $(INSTALL_PROGRAM) $$f $(bindir)/$$f; done
 
 uninstall:
-               for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done
+               for f in $(TARGETS); do rm -f $(bindir)/$$f; done
 
 adnshost:      $(ADH_OBJS) $(DYNAMIC_DEP)
                $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS)
@@ -61,7 +72,7 @@ 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
+$(ALL_OBJS):           $(ADNSDIR)/adns.h ../src/config.h
 adnsresfilter.o:       $(ADNSDIR)/tvarith.h
 
 %:             %.o $(DYNAMIC_DEP)
@@ -69,4 +80,3 @@ adnsresfilter.o:      $(ADNSDIR)/tvarith.h
 
 %_s:           %.o $(STATIC_LIB)
                $(CC) $(LDFLAGS) $< $(STATIC_LIB) -o $@ $(LDLIBS)
-