X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/a8a76bc2278abc14ea7571b4c888a7bb9c9f5ab2..637b8d7ec2a2267d99ac213812ed529a2fd1fb30:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e1dac22..56e70fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,7 @@ REPLACE_VARS_SED = autotools/replace_vars.sed
 
 hypervisordir = $(pkgpythondir)/hypervisor
 httpdir = $(pkgpythondir)/http
+confddir = $(pkgpythondir)/confd
 rapidir = $(pkgpythondir)/rapi
 toolsdir = $(pkglibdir)/tools
 docdir = $(datadir)/doc/$(PACKAGE)
@@ -25,10 +26,12 @@ DIRS = \
 	devel \
 	doc \
 	doc/examples \
+	doc/examples/hooks \
 	lib \
 	lib/http \
 	lib/hypervisor \
 	lib/rapi \
+	lib/confd \
 	man \
 	qa \
 	scripts \
@@ -110,6 +113,10 @@ http_PYTHON = \
 	lib/http/client.py \
 	lib/http/server.py
 
+confd_PYTHON = \
+	lib/confd/__init__.py \
+	lib/confd/server.py \
+	lib/confd/querylib.py
 
 docrst = \
 	doc/admin.rst \
@@ -145,6 +152,7 @@ dist_sbin_SCRIPTS = \
 	daemons/ganeti-noded \
 	daemons/ganeti-watcher \
 	daemons/ganeti-masterd \
+	daemons/ganeti-confd \
 	daemons/ganeti-rapi \
 	scripts/gnt-backup \
 	scripts/gnt-cluster \
@@ -175,6 +183,7 @@ EXTRA_DIST = \
 	doc/examples/ganeti.initd.in \
 	doc/examples/ganeti.cron.in \
 	doc/examples/dumb-allocator \
+	doc/examples/hooks/ethers \
 	doc/locking.txt \
 	test/testutils.py \
 	test/mocks.py \
@@ -334,6 +343,7 @@ $(REPLACE_VARS_SED): Makefile stamp-directories
 	  echo 's#@CUSTOM_XEN_KERNEL@#$(XEN_KERNEL)#g'; \
 	  echo 's#@CUSTOM_XEN_INITRD@#$(XEN_INITRD)#g'; \
 	  echo 's#@RPL_FILE_STORAGE_DIR@#$(FILE_STORAGE_DIR)#g'; \
+	  echo 's#@PKGLIBDIR@#$(pkglibdir)#g'; \
 	} > $@
 
 # We need to create symlinks because "make distcheck" will not install Python
@@ -342,7 +352,7 @@ $(REPLACE_VARS_SED): Makefile stamp-directories
 srclinks: stamp-directories
 	set -e; \
 	for i in man/footer.sgml $(pkgpython_PYTHON) $(hypervisor_PYTHON) \
-			$(rapi_PYTHON) $(http_PYTHON); do \
+			$(rapi_PYTHON) $(http_PYTHON) $(confd_PYTHON); do \
 		if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \
 			$(LN_S) $(abs_top_srcdir)/$$i $$i; \
 		fi; \