automake regeneration

diff --git a/Makefile.in b/Makefile.in
index e0dcdc953e0d72fc75cf0040910b4083f98bd21a..0952f966d8df14a8524d494ee42224a04e1afb5a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -173,9 +173,11 @@ EXTRA_DIST = RELNOTES LICENSE \
             doc/ja_JP.eucJP/dhclient-script.8 doc/ja_JP.eucJP/dhclient.8 \
             doc/ja_JP.eucJP/dhclient.conf.5 doc/ja_JP.eucJP/dhclient.leases.5 \
             doc/ja_JP.eucJP/dhcp-eval.5 doc/ja_JP.eucJP/dhcp-options.5 \
-            doc/examples/dhclient-dhcpv6.conf doc/examples/dhcpd-dhcpv6.conf
+            doc/examples/dhclient-dhcpv6.conf doc/examples/dhcpd-dhcpv6.conf \
+            util/bind.sh util/bindlib.sh util/bindcus.sh \
+            bind/bind.tar.gz bind/version.tmp 
 
-SUBDIRS = includes tests common minires dst omapip client dhcpctl relay server
+SUBDIRS = includes tests common dst omapip client dhcpctl relay server
 nobase_include_HEADERS = dhcpctl/dhcpctl.h
 all: all-recursive
 
@@ -360,7 +362,7 @@ distclean-tags:
 distdir: $(DISTFILES)
        $(am__remove_distdir)
        mkdir $(distdir)
-       $(mkdir_p) $(distdir)/contrib $(distdir)/contrib/ms2isc $(distdir)/dhcpctl $(distdir)/doc $(distdir)/doc/examples $(distdir)/doc/ja_JP.eucJP
+       $(mkdir_p) $(distdir)/bind $(distdir)/contrib $(distdir)/contrib/ms2isc $(distdir)/dhcpctl $(distdir)/doc $(distdir)/doc/examples $(distdir)/doc/ja_JP.eucJP $(distdir)/util
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
        list='$(DISTFILES)'; for file in $$list; do \

diff --git a/client/Makefile.in b/client/Makefile.in
index cad6c8e577a8dcef07f34d80501fea4b48018a97..4f66761d1d1e53918901c7081447259bc83a0497 100644 (file)
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -53,8 +53,8 @@ PROGRAMS = $(sbin_PROGRAMS)
 am_dhclient_OBJECTS = clparse.$(OBJEXT) dhclient.$(OBJEXT) \
        dhc6.$(OBJEXT)
 dhclient_OBJECTS = $(am_dhclient_OBJECTS)
-dhclient_DEPENDENCIES = ../common/libdhcp.a ../minires/libres.a \
-       ../omapip/libomapi.a ../dst/libdst.a
+dhclient_DEPENDENCIES = ../common/libdhcp.a ../omapip/libomapi.a \
+       ../bind/lib/libdns.a ../bind/lib/libisc.a
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/includes
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -166,8 +166,8 @@ dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
                   scripts/netbsd scripts/nextstep scripts/openbsd \
                   scripts/solaris scripts/openwrt
 
-dhclient_LDADD = ../common/libdhcp.a ../minires/libres.a \
-                ../omapip/libomapi.a ../dst/libdst.a
+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+                ../bind/lib/libdns.a ../bind/lib/libisc.a
 
 man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
 EXTRA_DIST = $(man_MANS)

diff --git a/common/Makefile.in b/common/Makefile.in
index 508a97deabc0b41ccb8ac0e6c77fd0fe1cfc84bb..2e0fa8b28c3aa4ece05e612a16da0d71532a3fcc 100644 (file)
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -53,10 +53,10 @@ am_libdhcp_a_OBJECTS = alloc.$(OBJEXT) bpf.$(OBJEXT) comapi.$(OBJEXT) \
        dispatch.$(OBJEXT) dlpi.$(OBJEXT) dns.$(OBJEXT) \
        ethernet.$(OBJEXT) execute.$(OBJEXT) fddi.$(OBJEXT) \
        icmp.$(OBJEXT) inet.$(OBJEXT) lpf.$(OBJEXT) memory.$(OBJEXT) \
-       nit.$(OBJEXT) options.$(OBJEXT) packet.$(OBJEXT) \
-       parse.$(OBJEXT) print.$(OBJEXT) raw.$(OBJEXT) resolv.$(OBJEXT) \
-       socket.$(OBJEXT) tables.$(OBJEXT) tr.$(OBJEXT) tree.$(OBJEXT) \
-       upf.$(OBJEXT) heap.$(OBJEXT)
+       nit.$(OBJEXT) ns_name.$(OBJEXT) options.$(OBJEXT) \
+       packet.$(OBJEXT) parse.$(OBJEXT) print.$(OBJEXT) raw.$(OBJEXT) \
+       resolv.$(OBJEXT) socket.$(OBJEXT) tables.$(OBJEXT) \
+       tr.$(OBJEXT) tree.$(OBJEXT) upf.$(OBJEXT)
 libdhcp_a_OBJECTS = $(am_libdhcp_a_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/includes
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -166,9 +166,9 @@ AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
 noinst_LIBRARIES = libdhcp.a
 libdhcp_a_SOURCES = alloc.c bpf.c comapi.c conflex.c ctrace.c discover.c \
                    dispatch.c dlpi.c dns.c ethernet.c execute.c fddi.c \
-                   icmp.c inet.c lpf.c memory.c nit.c options.c packet.c \
-                   parse.c print.c raw.c resolv.c socket.c tables.c tr.c \
-                   tree.c upf.c heap.c
+                   icmp.c inet.c lpf.c memory.c nit.c ns_name.c options.c \
+                   packet.c parse.c print.c raw.c resolv.c socket.c \
+                   tables.c tr.c tree.c upf.c
 
 man_MANS = dhcp-eval.5 dhcp-options.5
 EXTRA_DIST = $(man_MANS)
@@ -232,12 +232,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ethernet.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/execute.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fddi.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icmp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inet.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lpf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memory.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ns_name.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/options.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packet.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Po@am__quote@

diff --git a/common/tests/Makefile.in b/common/tests/Makefile.in
index fc57c5d8ff6911cfa7b124cdb414c1f769a39ff3..2e7f09f6c451cc2cf449de48bf248724c764fb62 100644 (file)
--- a/common/tests/Makefile.in
+++ b/common/tests/Makefile.in
@@ -46,8 +46,8 @@ CONFIG_CLEAN_FILES =
 am_test_alloc_OBJECTS = test_alloc.$(OBJEXT)
 test_alloc_OBJECTS = $(am_test_alloc_OBJECTS)
 test_alloc_DEPENDENCIES = ../libdhcp.a ../../tests/libt_api.a \
-       ../../omapip/libomapi.a ../../dst/libdst.a \
-       ../../minires/libres.a
+       ../../omapip/libomapi.a ../../bind/lib/libdns.a \
+       ../../bind/lib/libisc.a
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/includes
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -145,7 +145,8 @@ AM_CPPFLAGS = -I../..
 TESTS = test_alloc
 test_alloc_SOURCES = test_alloc.c
 test_alloc_LDADD = ../libdhcp.a ../../tests/libt_api.a \
-       ../../omapip/libomapi.a ../../dst/libdst.a ../../minires/libres.a
+       ../../omapip/libomapi.a ../../bind/lib/libdns.a \
+        ../../bind/lib/libisc.a
 
 all: all-am
 

diff --git a/dhcpctl/Makefile.in b/dhcpctl/Makefile.in
index 4e57fdc58b6d99f672a06de0737a87f109ff27ad..15f2411d212780931cb170475e489fc222b7bc81 100644 (file)
--- a/dhcpctl/Makefile.in
+++ b/dhcpctl/Makefile.in
@@ -68,11 +68,11 @@ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am_cltest_OBJECTS = cltest.$(OBJEXT)
 cltest_OBJECTS = $(am_cltest_OBJECTS)
 cltest_DEPENDENCIES = libdhcpctl.a ../common/libdhcp.a \
-       ../minires/libres.a ../omapip/libomapi.a ../dst/libdst.a
+       ../omapip/libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a
 am_omshell_OBJECTS = omshell.$(OBJEXT)
 omshell_OBJECTS = $(am_omshell_OBJECTS)
 omshell_DEPENDENCIES = libdhcpctl.a ../common/libdhcp.a \
-       ../minires/libres.a ../omapip/libomapi.a ../dst/libdst.a
+       ../omapip/libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/includes
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -175,13 +175,13 @@ lib_LIBRARIES = libdhcpctl.a
 man_MANS = omshell.1 dhcpctl.3
 EXTRA_DIST = $(man_MANS)
 omshell_SOURCES = omshell.c
-omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../minires/libres.a \
-                ../omapip/libomapi.a ../dst/libdst.a
+omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
+               ../bind/lib/libdns.a ../bind/lib/libisc.a
 
 libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
 cltest_SOURCES = cltest.c
-cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../minires/libres.a \
-               ../omapip/libomapi.a ../dst/libdst.a
+cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
+              ../bind/lib/libdns.a ../bind/lib/libisc.a
 
 all: all-am
 

diff --git a/includes/Makefile.in b/includes/Makefile.in
index e52613fad6fb9fa910a695973b5f4f5748fb8f78..f39a152844f9ebe1919024ed2ea940a89b7dd293 100644 (file)
--- a/includes/Makefile.in
+++ b/includes/Makefile.in
@@ -141,17 +141,11 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 nobase_include_HEADERS = omapip/alloc.h omapip/buffer.h omapip/convert.h \
                         omapip/hash.h omapip/omapip.h omapip/omapip_p.h \
-                        omapip/trace.h \
-                        isc-dhcp/boolean.h isc-dhcp/formatcheck.h \
-                        isc-dhcp/lang.h isc-dhcp/mem.h isc-dhcp/result.h \
-                        isc-dhcp/types.h isc-dhcp/commandline.h \
-                        isc-dhcp/dst.h isc-dhcp/int.h isc-dhcp/list.h \
-                        isc-dhcp/print.h isc-dhcp/string.h
+                        omapip/trace.h
 
 EXTRA_DIST = cdefs.h ctrace.h dhcp.h dhcp6.h dhcpd.h dhctoken.h failover.h \
             heap.h inet.h osdep.h site.h statement.h tree.h t_api.h \
             arpa/nameser.h arpa/nameser_compat.h \
-            minires/minires.h minires/res_update.h minires/resolv.h \
             netinet/if_ether.h netinet/ip.h netinet/ip_icmp.h netinet/udp.h
 
 all: config.h
@@ -274,7 +268,7 @@ distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-       $(mkdir_p) $(distdir)/arpa $(distdir)/isc-dhcp $(distdir)/minires $(distdir)/netinet $(distdir)/omapip
+       $(mkdir_p) $(distdir)/arpa $(distdir)/netinet $(distdir)/omapip
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
        list='$(DISTFILES)'; for file in $$list; do \

diff --git a/omapip/Makefile.in b/omapip/Makefile.in
index 74316ce23d332419bf5a7a6d8812e3bfa39ee944..3f5a2231917553004dd32b230fd079e4133b2afe 100644 (file)
--- a/omapip/Makefile.in
+++ b/omapip/Makefile.in
@@ -65,12 +65,13 @@ am_libomapi_a_OBJECTS = protocol.$(OBJEXT) buffer.$(OBJEXT) \
        message.$(OBJEXT) convert.$(OBJEXT) hash.$(OBJEXT) \
        auth.$(OBJEXT) inet_addr.$(OBJEXT) array.$(OBJEXT) \
        trace.$(OBJEXT) mrtrace.$(OBJEXT) toisc.$(OBJEXT) \
-       iscprint.$(OBJEXT)
+       iscprint.$(OBJEXT) isclib.$(OBJEXT)
 libomapi_a_OBJECTS = $(am_libomapi_a_OBJECTS)
 PROGRAMS = $(noinst_PROGRAMS)
 am_svtest_OBJECTS = test.$(OBJEXT)
 svtest_OBJECTS = $(am_svtest_OBJECTS)
-svtest_DEPENDENCIES = libomapi.a ../dst/libdst.a
+svtest_DEPENDENCIES = libomapi.a ../bind/lib/libdns.a \
+       ../bind/lib/libisc.a
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/includes
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -171,12 +172,12 @@ lib_LIBRARIES = libomapi.a
 libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
                     errwarn.c listener.c dispatch.c generic.c support.c \
                     handle.c message.c convert.c hash.c auth.c inet_addr.c \
-                    array.c trace.c mrtrace.c toisc.c iscprint.c
+                    array.c trace.c mrtrace.c toisc.c iscprint.c isclib.c
 
 man_MANS = omapi.3
 EXTRA_DIST = $(man_MANS)
 svtest_SOURCES = test.c
-svtest_LDADD = libomapi.a ../dst/libdst.a
+svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a
 all: all-am
 
 .SUFFIXES:
@@ -268,6 +269,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/handle.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inet_addr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isclib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iscprint.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/listener.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/message.Po@am__quote@

diff --git a/relay/Makefile.in b/relay/Makefile.in
index b220cfe43157fecd8b0f348ec6c9688eba81e3f0..c7c32997eb1f7ca2b847cfc91d72bd7f3c4387b1 100644 (file)
--- a/relay/Makefile.in
+++ b/relay/Makefile.in
@@ -50,7 +50,7 @@ PROGRAMS = $(sbin_PROGRAMS)
 am_dhcrelay_OBJECTS = dhcrelay.$(OBJEXT)
 dhcrelay_OBJECTS = $(am_dhcrelay_OBJECTS)
 dhcrelay_DEPENDENCIES = ../common/libdhcp.a ../omapip/libomapi.a \
-       ../dst/libdst.a ../minires/libres.a
+       ../bind/lib/libdns.a ../bind/lib/libisc.a
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/includes
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -149,7 +149,9 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
 dhcrelay_SOURCES = dhcrelay.c
-dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dst/libdst.a ../minires/libres.a
+dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+                ../bind/lib/libdns.a ../bind/lib/libisc.a
+
 man_MANS = dhcrelay.8
 EXTRA_DIST = $(man_MANS)
 all: all-am

diff --git a/server/Makefile.in b/server/Makefile.in
index 5675144a66e7cb5b06aa7260ce9c780e1c5e2cb0..e9f09eae96a842dab162a165f676ecbb3cdd97bd 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -57,8 +57,8 @@ am_dhcpd_OBJECTS = dhcpd.$(OBJEXT) dhcp.$(OBJEXT) bootp.$(OBJEXT) \
        dhcpleasequery.$(OBJEXT) dhcpv6.$(OBJEXT) mdb6.$(OBJEXT)
 dhcpd_OBJECTS = $(am_dhcpd_OBJECTS)
 dhcpd_DEPENDENCIES = ../common/libdhcp.a ../omapip/libomapi.a \
-       ../dst/libdst.a ../dhcpctl/libdhcpctl.a ../minires/libres.a \
-       ../omapip/libomapi.a
+       ../dhcpctl/libdhcpctl.a ../omapip/libomapi.a \
+       ../bind/lib/libdns.a ../bind/lib/libisc.a
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/includes
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -172,9 +172,9 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
 
 
 # libomapi.a this is here twice to handle circular library dependencies :(
-dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dst/libdst.a \
-             ../dhcpctl/libdhcpctl.a ../minires/libres.a \
-             ../omapip/libomapi.a
+dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+             ../dhcpctl/libdhcpctl.a ../omapip/libomapi.a \
+             ../bind/lib/libdns.a ../bind/lib/libisc.a
 
 man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
 EXTRA_DIST = $(man_MANS)