X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=client%2FMakefile.in;h=e97259c3e0bf530a1125dc87a5dc3394f063883e;hp=02effcb2b7cd9155380a36f6de7d796564342578;hb=58a876e5ac9539ff14acb7dc3ea3633f5bdb41d8;hpb=d942707de2dd9809338882f09a9f23316dc8be36

diff --git a/client/Makefile.in b/client/Makefile.in
index 02effcb..e97259c 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -1,15 +1,15 @@
 # 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,2014  Ian Jackson
+#    Copyright (C) 2014  Mark Wooding
+#    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
-#  the Free Software Foundation; either version 2, or (at your option)
+#  the Free Software Foundation; either version 3, or (at your option)
 #  any later version.
 #  
 #  This program is distributed in the hope that it will be useful,
@@ -18,31 +18,65 @@
 #  GNU General Public License for more details.
 #  
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software Foundation,
-#  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+#  along with this program; if not, write to the Free Software Foundation.
 
 srcdir=		@srcdir@
 VPATH=		@srcdir@
 
-PROGRAMS=	adnstest adnslogres adnshost
+PROGS_SYSDEP=	@PROGS_HAVE_TSEARCH@
+ENABLE_DYNAMIC=	@ENABLE_DYNAMIC@
+
+PROGRAMS=	adnslogres adnsheloex adnshost $(PROGS_SYSDEP)
+PROGRAMS_LOCAL=	fanftest adnstest addrtext
+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))
+TARG_LOCAL=	$(addsuffix $(DYNAMIC_SUFFIX), $(PROGRAMS_ALL))
 TARGETS=	$(TARG_LOCAL) $(TARG_INSTALL)
-include		$(srcdir)/../settings.make
+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)
 
-DIRCFLAGS=	-I$(srcdir)/../src
 
 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)
+
+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 $(srcdir)/../dynamic/$(SHLIBFILE)
-		$(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS)
+%:		%.o $(DYNAMIC_DEP)
+		$(CC) $(LDFLAGS) $< $(DYNAMIC_LINK) -o $@ $(LDLIBS)
 
-%_s:		%.o $(srcdir)/../src/libadns.a
-		$(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS)
+%_s:		%.o $(STATIC_LIB)
+		$(CC) $(LDFLAGS) $< $(STATIC_LIB) -o $@ $(LDLIBS)