+ * TODO list updated somewhat.

[adns.git] / client / Makefile.in

diff --git a/client/Makefile.in b/client/Makefile.in
index 02effcb2b7cd9155380a36f6de7d796564342578..989ca711f4f5cebf9d79b0ce5d0daa894651f3a5 100644 (file)
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -4,7 +4,7 @@
 #    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>
 #
 #  It is part of adns, which is

-#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+#    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>

 #    Copyright (C) 1999 Tony Finch <dot@dotat.at>
 #  
 #  This program is free software; you can redistribute it and/or modify
 #    Copyright (C) 1999 Tony Finch <dot@dotat.at>
 #  
 #  This program is free software; you can redistribute it and/or modify


@@ -24,14 +24,29 @@
 srcdir=                @srcdir@
 VPATH=         @srcdir@
 
 srcdir=                @srcdir@
 VPATH=         @srcdir@
 

-PROGRAMS=      adnstest adnslogres adnshost
+PROGS_SYSDEP=          @PROGS_HAVE_TSEARCH@
+
+PROGRAMS=      adnstest adnslogres adnshost $(PROGS_SYSDEP)
+PROGRAMS_LOCAL=        fanftest
+PROGRAMS_ALL=  $(PROGRAMS) $(PROGRAMS_LOCAL)
+

 TARG_INSTALL=  $(PROGRAMS)
 TARG_INSTALL=  $(PROGRAMS)

-TARG_LOCAL=    $(addsuffix _s, $(PROGRAMS))
+TARG_LOCAL=    $(addsuffix _s, $(PROGRAMS_ALL))

 TARGETS=       $(TARG_LOCAL) $(TARG_INSTALL)
 include                $(srcdir)/../settings.make
 
 DIRCFLAGS=     -I$(srcdir)/../src
 
 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/
+
+STATIC_LIB=    $(ADNSDIR)/libadns.a
+DYNAMIC_DEP=   $(srcdir)/../dynamic/$(SHLIBFILE)
+DYNAMIC_LINK=  -L$(srcdir)/../dynamic -ladns
+

 all:           $(TARGETS)
 
 install:       $(TARG_INSTALL)
 all:           $(TARGETS)
 
 install:       $(TARG_INSTALL)


@@ -41,8 +56,19 @@ install:     $(TARG_INSTALL)
 uninstall:
                for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done
 
 uninstall:
                for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done
 

-%:             %.o $(srcdir)/../dynamic/$(SHLIBFILE)
-               $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS)
+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)

 
 

-%_s:           %.o $(srcdir)/../src/libadns.a
-               $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS)