Abstract creation of instance from a spec

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 89f5bf3..759f717 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -155,17 +155,27 @@ CLEANFILES = \
 # BUILT_SOURCES should only be used as a dependency on phony targets. Otherwise
 # it'll cause the target to rebuild every time.
 BUILT_SOURCES = \
+  $(built_base_sources) \
+       $(BUILT_PYTHON_SOURCES) \
+       $(PYTHON_BOOTSTRAP)
+
+built_base_sources = \
        ganeti \
        stamp-srclinks \
-       $(all_dirfiles) \
-       $(PYTHON_BOOTSTRAP) \
-       $(BUILT_PYTHON_SOURCES)
+       $(all_dirfiles)
 
-BUILT_PYTHON_SOURCES = \
+built_python_base_sources = \
        lib/_autoconf.py \
-       lib/_vcsversion.py \
+       lib/_vcsversion.py
+
+BUILT_PYTHON_SOURCES = \
+       $(built_python_base_sources) \
        lib/_generated_rpc.py
 
+# Generating the RPC wrappers depends on many things, so make sure it's built at
+# the end of the built sources
+lib/_generated_rpc.py: | $(built_base_sources) $(built_python_base_sources)
+
 # these are all built from the underlying %.in sources
 BUILT_EXAMPLES = \
        doc/examples/ganeti-kvm-poweroff.initd \
@@ -377,6 +387,7 @@ HS_LIB_SRCS = \
        htools/Ganeti/HTools/Program/Hbal.hs \
        htools/Ganeti/HTools/Program/Hscan.hs \
        htools/Ganeti/HTools/Program/Hspace.hs \
+       htools/Ganeti/BasicTypes.hs \
        htools/Ganeti/Jobs.hs \
        htools/Ganeti/Luxi.hs \
        htools/Ganeti/OpCodes.hs \
@@ -585,6 +596,7 @@ EXTRA_DIST = \
        doc/examples/gnt-debug/README \
        doc/examples/gnt-debug/delay0.json \
        doc/examples/gnt-debug/delay50.json \
+       test/lockperf.py \
        test/testutils.py \
        test/mocks.py \
        $(dist_TESTS) \
@@ -649,6 +661,10 @@ TEST_FILES = \
        test/data/proc_drbd83.txt \
        test/data/proc_drbd83_sync.txt \
        test/data/proc_drbd83_sync_krnl2.6.39.txt \
+       test/data/kvm_1.0_help.txt \
+       test/data/kvm_0.15.90_help.txt \
+       test/data/kvm_0.12.5_help.txt \
+       test/data/kvm_0.9.1_help.txt \
        test/data/sys_drbd_usermode_helper.txt \
        test/data/ovfdata/compr_disk.vmdk.gz \
        test/data/ovfdata/config.ini \
@@ -740,6 +756,9 @@ python_tests = \
        test/docs_unittest.py \
        test/pycurl_reset_unittest.py \
        test/tempfile_fork_unittest.py
+if HAS_FAKEROOT
+python_tests += test/ganeti.utils.io_unittest-runasroot.py
+endif
 
 haskell_tests = htools/test
 
@@ -759,7 +778,8 @@ TESTS = $(dist_TESTS) $(nodist_TESTS)
 
 # Environment for all tests
 PLAIN_TESTS_ENVIRONMENT = \
-       PYTHONPATH=. TOP_SRCDIR=$(abs_top_srcdir) PYTHON=$(PYTHON) $(RUN_IN_TEMPDIR)
+       PYTHONPATH=. TOP_SRCDIR=$(abs_top_srcdir) PYTHON=$(PYTHON) \
+       FAKEROOT=$(FAKEROOT_PATH) $(RUN_IN_TEMPDIR)
 
 # Environment for tests run by automake
 TESTS_ENVIRONMENT = \
@@ -1019,8 +1039,8 @@ lib/_vcsversion.py: Makefile vcs-version | lib/.dir
          echo "VCS_VERSION = '$$VCSVER'"; \
        } > $@
 
-lib/_generated_rpc.py: lib/rpc_defs.py $(BUILD_RPC) | lib/.dir
-       PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(BUILD_RPC) $< > $@
+lib/_generated_rpc.py: lib/rpc_defs.py $(BUILD_RPC)
+       PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(BUILD_RPC) lib/rpc_defs.py > $@
 
 $(REPLACE_VARS_SED): Makefile
        set -e; \