X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=client%2FMakefile.in;h=59a358228ea9a2ba31acd23be1ae296aa5320c65;hp=2d3638eec75d24242235470be5c2bc47f051ea1e;hb=c5f033dba6fbc5848658e96aa71980c688020796;hpb=9579019a0c8a57a67465cb35775ee0cce0ccf804

diff --git a/client/Makefile.in b/client/Makefile.in
index 2d3638e..59a3582 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -1,6 +1,11 @@
 # client/Makefile - client program(s) Makefile
 # 
-#  This file is part of adns, which is Copyright (C) 1997, 1998 Ian Jackson
+#  This file is
+#    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
+#
+#  It is part of adns, which is
+#    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
+#    Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>
 #  
 #  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
@@ -19,16 +24,59 @@
 srcdir=		@srcdir@
 VPATH=		@srcdir@
 
-TARGETS=	adnstest
+PROGS_SYSDEP=	@PROGS_HAVE_TSEARCH@
+ENABLE_DYNAMIC=	@ENABLE_DYNAMIC@
+
+PROGRAMS=	adnslogres adnshost $(PROGS_SYSDEP)
+PROGRAMS_LOCAL=	fanftest adnstest
+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 $(DYNAMIC_SUFFIX), $(PROGRAMS_ALL))
+TARGETS=	$(TARG_LOCAL) $(TARG_INSTALL)
 include		$(srcdir)/../settings.make
 
 DIRCFLAGS=	-I$(srcdir)/../src
 
-install:	$(TARGETS)
-		set -xe; for f in $(TARGETS); \
+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/
+
+all:		$(TARGETS)
+
+install:	$(TARG_INSTALL)
+		set -xe; for f in $(TARG_INSTALL); \
 			do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done
 
 uninstall:
 		for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done
 
-adnstest:	adnstest.o $(srcdir)/../dynamic/$(SHLIBFILE)
+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)