Revert unintentional change of daemon log file names

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0cd3cfa..644bddf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -173,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
@@ -370,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))
@@ -434,6 +443,7 @@ HS_LIB_SRCS = \
        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 \
@@ -880,6 +890,7 @@ 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 \
@@ -933,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 =
@@ -985,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) \
@@ -1029,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 $@
@@ -1050,7 +1065,7 @@ 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)
+       $(GENERATED_FILES) $(HTOOLS_GENERATED_FILES)
        PYTHONPATH=. $(RUN_IN_TEMPDIR) \
          $(CURDIR)/$(BUILD_BASH_COMPLETION) $(BC_ARGS) > $@
 
@@ -1194,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)"; \