Extract node related logical units from cmdlib

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index dcc85c8..cc9d2d2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,7 @@ SHELL_ENV_INIT = autotools/shell-env-init
 # Note: these are automake-specific variables, and must be named after
 # the directory + 'dir' suffix
 clientdir = $(pkgpythondir)/client
+cmdlibdir = $(pkgpythondir)/cmdlib
 hypervisordir = $(pkgpythondir)/hypervisor
 httpdir = $(pkgpythondir)/http
 masterddir = $(pkgpythondir)/masterd
@@ -105,6 +106,7 @@ DIRS = \
        lib \
        lib/build \
        lib/client \
+       lib/cmdlib \
        lib/confd \
        lib/http \
        lib/hypervisor \
@@ -260,7 +262,6 @@ pkgpython_PYTHON = \
        lib/bdev.py \
        lib/bootstrap.py \
        lib/cli.py \
-       lib/cmdlib.py \
        lib/compat.py \
        lib/config.py \
        lib/constants.py \
@@ -306,6 +307,17 @@ client_PYTHON = \
        lib/client/gnt_os.py \
        lib/client/gnt_storage.py
 
+cmdlib_PYTHON = \
+       lib/cmdlib/__init__.py \
+       lib/cmdlib/common.py \
+       lib/cmdlib/base.py \
+       lib/cmdlib/cluster.py \
+       lib/cmdlib/group.py \
+       lib/cmdlib/node.py \
+       lib/cmdlib/tags.py \
+       lib/cmdlib/network.py \
+       lib/cmdlib/test.py
+
 hypervisor_PYTHON = \
        lib/hypervisor/__init__.py \
        lib/hypervisor/hv_base.py \
@@ -444,7 +456,11 @@ mandocrst = $(addprefix doc/man-,$(notdir $(manrst)))
 HS_BIN_PROGS=src/htools
 
 # Haskell programs to be installed in the MYEXECLIB dir
+if ENABLE_MOND
 HS_MYEXECLIB_PROGS=src/mon-collector
+else
+HS_MYEXECLIB_PROGS=
+endif
 
 # Haskell programs to be compiled by "make really-all"
 HS_COMPILE_PROGS= \
@@ -1236,6 +1252,7 @@ all_python_code = \
        $(python_tests) \
        $(pkgpython_PYTHON) \
        $(client_PYTHON) \
+       $(cmdlib_PYTHON) \
        $(hypervisor_PYTHON) \
        $(rapi_PYTHON) \
        $(server_PYTHON) \