X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=client%2FMakefile.in;h=462ca579c0eca6e6976bbe1eaa2a3f38c2826bea;hb=217cfd38966efba85badf9ebc56abd9c9a7707b9;hp=d55057e1513a234d4f3c8224a5070cf63a2735cd;hpb=e3f575ffc7bcb15d23f6844c7cf5562d2b93ac40;p=adns.git

diff --git a/client/Makefile.in b/client/Makefile.in
index d55057e..462ca57 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -1,11 +1,11 @@
 # 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) 1999 Tony Finch <dot@dotat.at>
+#    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
@@ -24,15 +24,37 @@
 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
+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)
+
+ADNSDIR=	$(srcdir)/../src/
 
 all:		$(TARGETS)
 
@@ -43,16 +65,18 @@ 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:	$(ADH_OBJS) $(srcdir)/../dynamic/$(SHLIBFILE)
-		$(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS)
+adnshost_s:	$(ADH_OBJS) $(STATIC_LIB)
+		$(CC) $(LDFLAGS) $(ADH_OBJS) $(STATIC_LIB) -o $@ $(LDLIBS)
 
-adnshost_s:	$(ADH_OBJS) $(srcdir)/../src/libadns.a
-		$(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS)
+$(ADH_OBJS):		adnshost.h
+$(ALL_OBJS):		$(ADNSDIR)/adns.h $(ADNSDIR)/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)