chiark
/
gitweb
/
~ianmdlvl
/
adns.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
+ * Better reporting of unexpected or weird replies from nameserver.
[adns.git]
/
client
/
Makefile.in
diff --git
a/client/Makefile.in
b/client/Makefile.in
index d55057e1513a234d4f3c8224a5070cf63a2735cd..a7b3aaaa330135c3cf59ae796615d16c91e037f3 100644
(file)
--- a/
client/Makefile.in
+++ b/
client/Makefile.in
@@
-24,15
+24,28
@@
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
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)
all: $(TARGETS)
@@
-43,16
+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
-$(ADH_OBJS): adnshost.h
+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)
-adnshost: $(ADH_OBJS) $(srcdir)/../dynamic/$(SHLIBFILE)
- $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS)
+$(ADH_OBJS): adnshost.h
+$(ALL_OBJS): $(ADNSDIR)/adns.h $(ADNSDIR)/config.h
+adnsresfilter.o: $(ADNSDIR)/tvarith.h
-adnshost_s: $(ADH_OBJS) $(srcdir)/../src/libadns.a
- $(CC) $(LDFLAGS) $
^
-o $@ $(LDLIBS)
+%: %.o $(DYNAMIC_DEP)
+ $(CC) $(LDFLAGS) $
< $(DYNAMIC_LINK)
-o $@ $(LDLIBS)
-%
: %.o $(srcdir)/../dynamic/$(SHLIBFILE
)
- $(CC) $(LDFLAGS) $
^
-o $@ $(LDLIBS)
+%
_s: %.o $(STATIC_LIB
)
+ $(CC) $(LDFLAGS) $
< $(STATIC_LIB)
-o $@ $(LDLIBS)
-%_s: %.o $(srcdir)/../src/libadns.a
- $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS)