Revert unintentional change of daemon log file names

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7a37757..644bddf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -155,6 +155,7 @@ CLEANFILES = \
        devel/upload \
        $(BUILT_EXAMPLES) \
        doc/examples/bash_completion \
+       doc/examples/bash_completion-debug \
        lib/_generated_rpc.py \
        $(man_MANS) \
        $(manhtml) \
@@ -172,6 +173,14 @@ GENERATED_FILES = \
        $(BUILT_PYTHON_SOURCES) \
        $(PYTHON_BOOTSTRAP)
 
+HTOOLS_GENERATED_FILES =
+if WANT_HTOOLS
+HTOOLS_GENERATED_FILES += $(HS_PROGS)
+if HS_CONFD
+HTOOLS_GENERATED_FILES += htools/hconfd
+endif
+endif
+
 built_base_sources = \
        stamp-directories \
        stamp-srclinks
@@ -225,8 +234,10 @@ pkgpython_PYTHON = \
        lib/mcpu.py \
        lib/netutils.py \
        lib/objects.py \
+       lib/objectutils.py \
        lib/opcodes.py \
        lib/ovf.py \
+       lib/pathutils.py \
        lib/qlang.py \
        lib/query.py \
        lib/rpc.py \
@@ -237,6 +248,7 @@ pkgpython_PYTHON = \
        lib/ssh.py \
        lib/storage.py \
        lib/uidpool.py \
+       lib/vcluster.py \
        lib/workerpool.py
 
 client_PYTHON = \
@@ -282,6 +294,7 @@ confd_PYTHON = \
 
 masterd_PYTHON = \
        lib/masterd/__init__.py \
+       lib/masterd/iallocator.py \
        lib/masterd/instance.py
 
 impexpd_PYTHON = \
@@ -365,6 +378,7 @@ docrst = \
 
 HS_PROGS = htools/htools
 HS_BIN_ROLES = hbal hscan hspace hinfo hcheck
+HS_HTOOLS_PROGS = $(HS_BIN_ROLES) hail
 
 HS_ALL_PROGS = $(HS_PROGS) htest/test htest/hpc-htools htools/hconfd
 HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
@@ -426,8 +440,10 @@ HS_LIB_SRCS = \
        htools/Ganeti/Luxi.hs \
        htools/Ganeti/Objects.hs \
        htools/Ganeti/OpCodes.hs \
+       htools/Ganeti/Path.hs \
        htools/Ganeti/Query/Common.hs \
        htools/Ganeti/Query/Filter.hs \
+       htools/Ganeti/Query/Group.hs \
        htools/Ganeti/Query/Language.hs \
        htools/Ganeti/Query/Node.hs \
        htools/Ganeti/Query/Query.hs \
@@ -526,6 +542,7 @@ noinst_DATA = \
        doc/html \
        $(BUILT_EXAMPLES) \
        doc/examples/bash_completion \
+       doc/examples/bash_completion-debug \
        $(manhtml)
 
 gnt_scripts = \
@@ -873,10 +890,12 @@ python_tests = \
        test/ganeti.jstore_unittest.py \
        test/ganeti.locking_unittest.py \
        test/ganeti.luxi_unittest.py \
+       test/ganeti.masterd.iallocator_unittest.py \
        test/ganeti.masterd.instance_unittest.py \
        test/ganeti.mcpu_unittest.py \
        test/ganeti.netutils_unittest.py \
        test/ganeti.objects_unittest.py \
+       test/ganeti.objectutils_unittest.py \
        test/ganeti.opcodes_unittest.py \
        test/ganeti.ovf_unittest.py \
        test/ganeti.qlang_unittest.py \
@@ -906,6 +925,7 @@ python_tests = \
        test/ganeti.utils.wrapper_unittest.py \
        test/ganeti.utils.x509_unittest.py \
        test/ganeti.utils_unittest.py \
+       test/ganeti.vcluster_unittest.py \
        test/ganeti.workerpool_unittest.py \
        test/qa.qa_config_unittest.py \
        test/cfgupgrade_unittest.py \
@@ -924,6 +944,7 @@ dist_TESTS = \
        test/ganeti-cleaner_unittest.bash \
        test/import-export_unittest.bash \
        test/cli-test.bash \
+       test/bash_completion.bash \
        $(python_tests)
 
 nodist_TESTS =
@@ -976,6 +997,7 @@ srclink_files = \
        test/ganeti-cleaner_unittest.bash \
        test/import-export_unittest.bash \
        test/cli-test.bash \
+       test/bash_completion.bash \
        htest/offline-test.sh \
        htest/cli-tests-defs.sh \
        $(all_python_code) \
@@ -1020,6 +1042,8 @@ test/daemon-util_unittest.bash: daemons/daemon-util
 
 test/ganeti-cleaner_unittest.bash: daemons/ganeti-cleaner
 
+test/bash_completion.bash: doc/examples/bash_completion-debug
+
 tools/kvm-ifup: tools/kvm-ifup.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
        chmod +x $@
@@ -1035,10 +1059,15 @@ daemons/%:: daemons/%.in $(REPLACE_VARS_SED)
 doc/examples/%:: doc/examples/%.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
 
-doc/examples/bash_completion: $(BUILD_BASH_COMPLETION) $(RUN_IN_TEMPDIR) \
+doc/examples/bash_completion: BC_ARGS = --compact
+doc/examples/bash_completion-debug: BC_ARGS =
+
+doc/examples/bash_completion doc/examples/bash_completion-debug: \
+       $(BUILD_BASH_COMPLETION) $(RUN_IN_TEMPDIR) \
        lib/cli.py $(gnt_scripts) $(client_PYTHON) tools/burnin \
-       $(GENERATED_FILES)
-       PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(BUILD_BASH_COMPLETION) > $@
+       $(GENERATED_FILES) $(HTOOLS_GENERATED_FILES)
+       PYTHONPATH=. $(RUN_IN_TEMPDIR) \
+         $(CURDIR)/$(BUILD_BASH_COMPLETION) $(BC_ARGS) > $@
 
 doc/%.png: doc/%.dot
        @test -n "$(DOT)" || { echo 'dot' not found during configure; exit 1; }
@@ -1180,6 +1209,7 @@ lib/_autoconf.py: Makefile | stamp-directories
          echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)"; \
          echo "TOOLSDIR = '$(toolsdir)'"; \
          echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \
+         echo "HTOOLS_PROGS = [$(foreach i,$(HS_HTOOLS_PROGS),'$(i)',)]"; \
          echo "PKGLIBDIR = '$(pkglibdir)'"; \
          echo "DRBD_BARRIERS = '$(DRBD_BARRIERS)'"; \
          echo "DRBD_NO_META_FLUSH = $(DRBD_NO_META_FLUSH)"; \