X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=client%2FMakefile.in;h=9d131c958bb6c14139783e179617c84ecdb41381;hp=0ed57ac8a22119fef777ecb86b2d3d10447b1282;hb=a447049fe33445d7d7c14e444b98171eb9c3f7aa;hpb=d1cff511d87e902d96bcd39544635f81728de1ae

diff --git a/client/Makefile.in b/client/Makefile.in
index 0ed57ac..9d131c9 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -25,8 +25,10 @@ srcdir=		@srcdir@
 VPATH=		@srcdir@
 
 PROGRAMS=	adnstest adnslogres adnshost
+PROGRAMS_LOCAL=	fanftest
+
 TARG_INSTALL=	$(PROGRAMS)
-TARG_LOCAL=	$(addsuffix _s, $(PROGRAMS))
+TARG_LOCAL=	$(addsuffix _s, $(PROGRAMS) $(PROGRAMS_LOCAL))
 TARGETS=	$(TARG_LOCAL) $(TARG_INSTALL)
 include		$(srcdir)/../settings.make
 
@@ -34,6 +36,10 @@ DIRCFLAGS=	-I$(srcdir)/../src
 
 ADH_OBJS=	adh-main.o adh-opts.o adh-query.o
 
+STATIC_LIB=	$(srcdir)/../src/libadns.a
+DYNAMIC_DEP=	$(srcdir)/../dynamic/$(SHLIBFILE)
+DYNAMIC_LINK=	-L$(srcdir)/../dynamic -ladns
+
 all:		$(TARGETS)
 
 install:	$(TARG_INSTALL)
@@ -43,14 +49,16 @@ install:	$(TARG_INSTALL)
 uninstall:
 		for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done
 
-adnshost:	$(ADH_OBJS) $(srcdir)/../dynamic/$(SHLIBFILE)
-		$(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS)
+$(ADH_OBJS):	adnshost.h
+
+adnshost:	$(ADH_OBJS) $(DYNAMIC_DEP)
+		$(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS)
 
-adnshost_s:	$(ADH_OBJS) $(srcdir)/../src/libadns.a
-		$(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS)
+adnshost_s:	$(ADH_OBJS) $(STATIC_LIB)
+		$(CC) $(LDFLAGS) $(ADH_OBJS) $(STATIC_LIB) -o $@ $(LDLIBS)
 
-%:		%.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)