client/adh-query.c: Surprising comma rather than semicolon.

[adns.git] / client / Makefile.in

diff --git a/client/Makefile.in b/client/Makefile.in
index 462ca579c0eca6e6976bbe1eaa2a3f38c2826bea..01f2fcda4d44ce394c48926a2ffbb97a70cc62ce 100644 (file)
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -1,11 +1,10 @@
 # client/Makefile - client program(s) Makefile
 # 
 # client/Makefile - client program(s) Makefile
 # 

-#  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 file is part of adns, which is
+#    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+#    Copyright (C) 1999-2000,2003,2006  Tony Finch
+#    Copyright (C) 1991 Massachusetts Institute of Technology
+#  (See the file INSTALL for full details.)

 #  
 #  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
 #  
 #  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


@@ -31,11 +30,11 @@ PROGRAMS=   adnslogres adnsheloex adnshost $(PROGS_SYSDEP)
 PROGRAMS_LOCAL=        fanftest adnstest
 PROGRAMS_ALL=  $(PROGRAMS) $(PROGRAMS_LOCAL)
 
 PROGRAMS_LOCAL=        fanftest adnstest
 PROGRAMS_ALL=  $(PROGRAMS) $(PROGRAMS_LOCAL)
 

-STATIC_LIB=    $(ADNSDIR)/libadns.a
+STATIC_LIB=    ../src/libadns.a

 
 ifeq ($(ENABLE_DYNAMIC),elf)
 
 ifeq ($(ENABLE_DYNAMIC),elf)

-DYNAMIC_DEP=   $(srcdir)/../dynamic/$(SHLIBFILE)
-DYNAMIC_LINK=  -L$(srcdir)/../dynamic -ladns
+DYNAMIC_DEP=   ../dynamic/$(SHLIBFILE)
+DYNAMIC_LINK=  -L../dynamic -ladns

 DYNAMIC_SUFFIX=        _s
 else
 DYNAMIC_DEP=   $(STATIC_LIB)
 DYNAMIC_SUFFIX=        _s
 else
 DYNAMIC_DEP=   $(STATIC_LIB)


@@ -46,24 +45,25 @@ endif
 TARG_INSTALL=  $(PROGRAMS)
 TARG_LOCAL=    $(addsuffix $(DYNAMIC_SUFFIX), $(PROGRAMS_ALL))
 TARGETS=       $(TARG_LOCAL) $(TARG_INSTALL)
 TARG_INSTALL=  $(PROGRAMS)
 TARG_LOCAL=    $(addsuffix $(DYNAMIC_SUFFIX), $(PROGRAMS_ALL))
 TARGETS=       $(TARG_LOCAL) $(TARG_INSTALL)

-include                $(srcdir)/../settings.make
+include                ../settings.make

 
 

-DIRCFLAGS=     -I$(srcdir)/../src
+ADNSDIR=       $(srcdir)/../src
+DIRCFLAGS=     -I. -I../src -I$(ADNSDIR)

 
 TARG_OBJS=     $(addsuffix .o, $(PROGRAMS_ALL))
 ADH_OBJS=      adh-main.o adh-opts.o adh-query.o
 ALL_OBJS=      $(ADH_OBJS) $(TARG_OBJS)
 
 
 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)
 
 all:           $(TARGETS)
 
 install:       $(TARG_INSTALL)

+               mkdir -p $(bindir)

                set -xe; for f in $(TARG_INSTALL); \
                set -xe; for f in $(TARG_INSTALL); \

-                       do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done
+                       do $(INSTALL_PROGRAM) $$f $(bindir)/$$f; done

 
 uninstall:
 
 uninstall:

-               for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done
+               for f in $(TARGETS); do rm -f $(bindir)/$$f; done

 
 adnshost:      $(ADH_OBJS) $(DYNAMIC_DEP)
                $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS)
 
 adnshost:      $(ADH_OBJS) $(DYNAMIC_DEP)
                $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS)


@@ -72,7 +72,7 @@ adnshost_s:   $(ADH_OBJS) $(STATIC_LIB)
                $(CC) $(LDFLAGS) $(ADH_OBJS) $(STATIC_LIB) -o $@ $(LDLIBS)
 
 $(ADH_OBJS):           adnshost.h
                $(CC) $(LDFLAGS) $(ADH_OBJS) $(STATIC_LIB) -o $@ $(LDLIBS)
 
 $(ADH_OBJS):           adnshost.h

-$(ALL_OBJS):           $(ADNSDIR)/adns.h $(ADNSDIR)/config.h
+$(ALL_OBJS):           $(ADNSDIR)/adns.h ../src/config.h

 adnsresfilter.o:       $(ADNSDIR)/tvarith.h
 
 %:             %.o $(DYNAMIC_DEP)
 adnsresfilter.o:       $(ADNSDIR)/tvarith.h
 
 %:             %.o $(DYNAMIC_DEP)