diff --git a/src/bin/host/.gitignore b/examples/host/.gitignore similarity index 100% rename from src/bin/host/.gitignore rename to examples/host/.gitignore diff --git a/examples/host/Makefile.am b/examples/host/Makefile.am new file mode 100644 index 0000000000..79d6f3542f --- /dev/null +++ b/examples/host/Makefile.am @@ -0,0 +1,6 @@ +AM_CPPFLAGS = $(BOOST_INCLUDES) $(BIND10_INCLUDES) + +bin_PROGRAMS = b10-host +b10_host_SOURCES = host.cc +b10_host_LDFLAGS = ${BIND10_LDFLAGS} +b10_host_LDADD = ${BIND10_LDADD} diff --git a/src/bin/host/README b/examples/host/README similarity index 100% rename from src/bin/host/README rename to examples/host/README diff --git a/src/bin/host/b10-host.xml b/examples/host/b10-host.xml similarity index 100% rename from src/bin/host/b10-host.xml rename to examples/host/b10-host.xml diff --git a/src/bin/host/host.cc b/examples/host/host.cc similarity index 100% rename from src/bin/host/host.cc rename to examples/host/host.cc diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 7af44f9b8f..0b4c1ae796 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = bind10 bindctl cfgmgr ddns loadzone msgq host cmdctl auth xfrin \ +SUBDIRS = bind10 bindctl cfgmgr ddns loadzone msgq cmdctl auth xfrin \ xfrout usermgr zonemgr stats tests resolver sockcreator dhcp4 dhcp6 \ dbutil sysinfo diff --git a/src/bin/host/Makefile.am b/src/bin/host/Makefile.am deleted file mode 100644 index 42ef954ce1..0000000000 --- a/src/bin/host/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib -AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns -AM_CPPFLAGS += $(BOOST_INCLUDES) - -AM_CXXFLAGS = $(B10_CXXFLAGS) - -if USE_STATIC_LINK -AM_LDFLAGS = -static -endif - -CLEANFILES = *.gcno *.gcda - -bin_PROGRAMS = b10-host -b10_host_SOURCES = host.cc -b10_host_LDADD = $(top_builddir)/src/lib/dns/libb10-dns++.la -b10_host_LDADD += $(top_builddir)/src/lib/util/libb10-util.la -b10_host_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la - -man_MANS = b10-host.1 -DISTCLEANFILES = $(man_MANS) -EXTRA_DIST = $(man_MANS) b10-host.xml - -.PHONY: man -if GENERATE_DOCS - -man: b10-host.1 - -b10-host.1: b10-host.xml - @XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-host.xml - -else - -$(man_MANS): - @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. - @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ - -endif