X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/5fa1642226abc6540a2d3a653cb0ce2d6a8ab60c..5a062513dae6be88cd77361fd84ce38577455994:/Makefile.am diff --git a/Makefile.am b/Makefile.am index c6e5e86..e0b5c2e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,10 +36,10 @@ DIRS = \ doc/examples/hooks \ lib \ lib/build \ + lib/confd \ lib/http \ lib/hypervisor \ lib/rapi \ - lib/confd \ man \ qa \ scripts \ @@ -57,6 +57,7 @@ maintainer-clean-local: rm -rf doc/api doc/html doc/coverage CLEANFILES = \ + $(addsuffix /*.py[co],$(DIRS)) \ autotools/replace_vars.sed \ daemons/daemon-util \ daemons/ganeti-cleaner \ @@ -66,15 +67,8 @@ CLEANFILES = \ doc/examples/ganeti.cron \ doc/examples/gnt-config-backup \ doc/examples/hooks/ipsec \ - lib/*.py[co] \ - lib/build/*.py[co] \ - lib/http/*.py[co] \ - lib/hypervisor/*.py[co] \ - lib/rapi/*.py[co] \ $(man_MANS) \ $(manhtml) \ - qa/*.py[co] \ - test/*.py[co] \ stamp-directories \ stamp-srclinks \ $(nodist_pkgpython_PYTHON) @@ -99,6 +93,7 @@ pkgpython_PYTHON = \ lib/bootstrap.py \ lib/cli.py \ lib/cmdlib.py \ + lib/compat.py \ lib/config.py \ lib/constants.py \ lib/daemon.py \ @@ -116,6 +111,7 @@ pkgpython_PYTHON = \ lib/ssh.py \ lib/storage.py \ lib/utils.py \ + lib/uidpool.py \ lib/workerpool.py hypervisor_PYTHON = \ @@ -129,6 +125,7 @@ hypervisor_PYTHON = \ rapi_PYTHON = \ lib/rapi/__init__.py \ lib/rapi/baserlib.py \ + lib/rapi/client.py \ lib/rapi/connector.py \ lib/rapi/rlib2.py @@ -141,8 +138,8 @@ http_PYTHON = \ confd_PYTHON = \ lib/confd/__init__.py \ lib/confd/client.py \ - lib/confd/server.py \ - lib/confd/querylib.py + lib/confd/querylib.py \ + lib/confd/server.py docrst = \ doc/admin.rst \ @@ -233,8 +230,10 @@ dist_tools_SCRIPTS = \ tools/burnin \ tools/cfgshell \ tools/cfgupgrade \ + tools/cfgupgrade12 \ tools/cluster-merge \ - tools/lvmstrap + tools/lvmstrap \ + tools/sanitize-config pkglib_SCRIPTS = \ daemons/daemon-util @@ -323,7 +322,8 @@ python_tests = \ test/ganeti.bdev_unittest.py \ test/ganeti.cli_unittest.py \ test/ganeti.cmdlib_unittest.py \ - test/ganeti.confd_client_unittest.py \ + test/ganeti.compat_unittest.py \ + test/ganeti.confd.client_unittest.py \ test/ganeti.config_unittest.py \ test/ganeti.constants_unittest.py \ test/ganeti.errors_unittest.py \ @@ -333,9 +333,11 @@ python_tests = \ test/ganeti.mcpu_unittest.py \ test/ganeti.objects_unittest.py \ test/ganeti.opcodes_unittest.py \ + test/ganeti.rapi.client_unittest.py \ test/ganeti.rapi.resources_unittest.py \ test/ganeti.serializer_unittest.py \ test/ganeti.ssh_unittest.py \ + test/ganeti.uidpool_unittest.py \ test/ganeti.utils_unittest.py \ test/ganeti.workerpool_unittest.py \ test/docs_unittest.py \ @@ -426,7 +428,6 @@ man/%.7: man/%.7.in $(REPLACE_VARS_SED) man/%.8: man/%.8.in $(REPLACE_VARS_SED) sed -f $(REPLACE_VARS_SED) < $< > $@ - $(CHECK_MAN) $@ man/%.html: man/%.html.in $(REPLACE_VARS_SED) sed -f $(REPLACE_VARS_SED) < $< > $@ @@ -563,4 +564,6 @@ coverage: $(BUILT_SOURCES) $(python_tests) $(PLAIN_TESTS_ENVIRONMENT) $(abs_top_srcdir)/autotools/gen-coverage \ $(python_tests) +commit-check: distcheck lint apidoc + # vim: set noet :