Makefile: Streamline directory creation

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 14639c2..bce35f0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,12 +49,12 @@ DIRS = \
        lib/rapi \
        man \
        qa \
-       scripts \
        test \
        test/data \
        tools
 
 BUILDTIME_DIRS = \
+       scripts \
        doc/api \
        doc/coverage \
        doc/html
@@ -64,6 +64,8 @@ DIRCHECK_EXCLUDE = \
        ganeti-[0-9]*.[0-9]*.[0-9]* \
        doc/html/_*
 
+all_dirfiles = $(addsuffix /.dir,$(DIRS) $(BUILDTIME_DIRS))
+
 MAINTAINERCLEANFILES = \
        $(docpng) \
        $(maninput) \
@@ -76,6 +78,7 @@ maintainer-clean-local:
 
 CLEANFILES = \
        $(addsuffix /*.py[co],$(DIRS)) \
+       $(all_dirfiles) \
        $(PYTHON_BOOTSTRAP) \
        autotools/replace_vars.sed \
        daemons/daemon-util \
@@ -89,15 +92,17 @@ CLEANFILES = \
        doc/examples/hooks/ipsec \
        $(man_MANS) \
        $(manhtml) \
-       stamp-directories \
        stamp-srclinks \
        $(nodist_pkgpython_PYTHON)
 
+# BUILT_SOURCES should only be used as a dependency on phony targets. Otherwise
+# it'll cause the target to rebuild every time.
 BUILT_SOURCES = \
        ganeti \
        stamp-srclinks \
-       stamp-directories \
-       lib/_autoconf.py
+       lib/_autoconf.py \
+       $(all_dirfiles) \
+       $(PYTHON_BOOTSTRAP)
 
 nodist_pkgpython_PYTHON = \
        lib/_autoconf.py
@@ -139,8 +144,12 @@ pkgpython_PYTHON = \
 
 client_PYTHON = \
        lib/client/__init__.py \
+       lib/client/gnt_backup.py \
        lib/client/gnt_cluster.py \
        lib/client/gnt_debug.py \
+       lib/client/gnt_instance.py \
+       lib/client/gnt_job.py \
+       lib/client/gnt_node.py \
        lib/client/gnt_os.py
 
 hypervisor_PYTHON = \
@@ -200,7 +209,10 @@ docrst = \
        doc/security.rst \
        doc/walkthrough.rst
 
-doc/html/.stamp: $(docrst) $(docpng) doc/conf.py configure.ac
+$(RUN_IN_TEMPDIR): | $(all_dirfiles)
+
+doc/html/index.html: $(docrst) $(docpng) doc/conf.py configure.ac \
+       $(RUN_IN_TEMPDIR) | doc/html/.dir
        @test -n "$(SPHINX)" || \
            { echo 'sphinx-build' not found during configure; exit 1; }
        PYTHONPATH=. $(RUN_IN_TEMPDIR) $(SPHINX) -q -W -b html \
@@ -211,7 +223,7 @@ doc/html/.stamp: $(docrst) $(docpng) doc/conf.py configure.ac
        rm -f doc/html/.buildinfo doc/html/objects.inv
        touch $@
 
-doc/html: doc/html/.stamp
+doc/html: doc/html/index.html
 
 doc/news.rst: NEWS
        set -e; \
@@ -258,8 +270,12 @@ gnt_scripts = \
        scripts/gnt-os
 
 PYTHON_BOOTSTRAP = \
+       scripts/gnt-backup \
        scripts/gnt-cluster \
        scripts/gnt-debug \
+       scripts/gnt-instance \
+       scripts/gnt-job \
+       scripts/gnt-node \
        scripts/gnt-os
 
 dist_sbin_SCRIPTS = \
@@ -267,11 +283,7 @@ dist_sbin_SCRIPTS = \
        daemons/ganeti-watcher \
        daemons/ganeti-masterd \
        daemons/ganeti-confd \
-       daemons/ganeti-rapi \
-       scripts/gnt-backup \
-       scripts/gnt-instance \
-       scripts/gnt-job \
-       scripts/gnt-node
+       daemons/ganeti-rapi
 
 nodist_sbin_SCRIPTS = \
        $(PYTHON_BOOTSTRAP) \
@@ -486,21 +498,18 @@ devel/upload: devel/upload.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
        chmod u+x $@
 
-daemons/%: daemons/%.in \
-               $(REPLACE_VARS_SED)
+daemons/%: daemons/%.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
        chmod +x $@
 
-doc/examples/%: doc/examples/%.in \
-               $(REPLACE_VARS_SED)
+doc/examples/%: doc/examples/%.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
 
-doc/examples/hooks/%: doc/examples/hooks/%.in \
-               $(REPLACE_VARS_SED)
+doc/examples/hooks/%: doc/examples/hooks/%.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
 
 doc/examples/bash_completion: $(BUILD_BASH_COMPLETION) $(RUN_IN_TEMPDIR) \
-       lib/cli.py $(gnt_scripts) tools/burnin
+       lib/cli.py $(gnt_scripts) $(client_PYTHON) tools/burnin
        PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(BUILD_BASH_COMPLETION) > $@
 
 doc/%.png: doc/%.dot
@@ -543,7 +552,7 @@ regen-vcs-version:
          $(MAKE) vcs-version; \
        fi
 
-lib/_autoconf.py: Makefile stamp-directories vcs-version
+lib/_autoconf.py: Makefile vcs-version | lib/.dir
        set -e; \
        VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \
        { echo '# This file is automatically generated, do not edit!'; \
@@ -624,7 +633,7 @@ $(REPLACE_VARS_SED): Makefile
          echo 's#@GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \
        } > $@
 
-$(PYTHON_BOOTSTRAP): Makefile
+$(PYTHON_BOOTSTRAP): Makefile | $(all_dirfiles)
        set -e; \
        module='$(subst -,_,$(notdir $@))'; \
        { echo '#!/usr/bin/python'; \
@@ -651,7 +660,7 @@ $(PYTHON_BOOTSTRAP): Makefile
 
 # We need to create symlinks because "make distcheck" will not install Python
 # files when building.
-stamp-srclinks: Makefile stamp-directories
+stamp-srclinks: Makefile | $(all_dirfiles)
        set -e; \
        for i in $(srclink_files); do \
                if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \
@@ -691,7 +700,7 @@ check-local: check-dirs
        $(CHECK_PYTHON_CODE) $(check_python_code)
 
 .PHONY: lint
-lint: ganeti $(BUILT_SOURCES)
+lint: $(BUILT_SOURCES)
        @test -n "$(PYLINT)" || { echo 'pylint' not found during configure; exit 1; }
        $(PYLINT) $(LINT_OPTS) $(lint_python_code)
 
@@ -722,13 +731,13 @@ install-exec-local:
          "$(DESTDIR)${localstatedir}/log/ganeti" \
          "$(DESTDIR)${localstatedir}/run/ganeti"
 
-stamp-directories: Makefile
-       @mkdir_p@ $(DIRS)
-       touch $@
+# To avoid conflicts between directory names and other targets, a file inside
+# the directory is used to ensure its existence.
+%.dir:
+       @mkdir_p@ $* && touch $@
 
 .PHONY: apidoc
 apidoc: epydoc.conf $(RUN_IN_TEMPDIR) $(BUILT_SOURCES)
-       test -e doc/api || mkdir doc/api
        $(RUN_IN_TEMPDIR) epydoc -v \
                --conf $(CURDIR)/epydoc.conf \
                --output $(CURDIR)/doc/api
@@ -744,7 +753,6 @@ TAGS: $(BUILT_SOURCES)
 .PHONY: coverage
 coverage: $(BUILT_SOURCES) $(python_tests)
        set -e; \
-       mkdir -p doc/coverage; \
        COVERAGE_FILE=$(CURDIR)/doc/coverage/data \
        TEXT_COVERAGE=$(CURDIR)/doc/coverage/report.txt \
        HTML_COVERAGE=$(CURDIR)/doc/coverage \