Revision 0d2bf835 Makefile.am

b/Makefile.am
36 36
utilsdir = $(pkgpythondir)/utils
37 37
toolsdir = $(pkglibdir)/tools
38 38
iallocatorsdir = $(pkglibdir)/iallocators
39
pytoolsdir = $(pkgpythondir)/tools
39 40
docdir = $(datadir)/doc/$(PACKAGE)
40 41

  
41 42
# Delete output file if an error occurred while building it
......
65 66
	lib/masterd \
66 67
	lib/rapi \
67 68
	lib/server \
69
	lib/tools \
68 70
	lib/utils \
69 71
	lib/watcher \
70 72
	man \
......
247 249
	lib/server/noded.py \
248 250
	lib/server/rapi.py
249 251

  
252
pytools_PYTHON = \
253
	lib/tools/__init__.py \
254
	lib/tools/ensure_dirs.py
255

  
250 256
utils_PYTHON = \
251 257
	lib/utils/__init__.py \
252 258
	lib/utils/algo.py \
......
399 405
	scripts/gnt-node \
400 406
	scripts/gnt-os
401 407

  
402
PYTHON_BOOTSTRAP = \
408
PYTHON_BOOTSTRAP_SBIN = \
403 409
	daemons/ganeti-confd \
404 410
	daemons/ganeti-masterd \
405 411
	daemons/ganeti-noded \
......
414 420
	scripts/gnt-node \
415 421
	scripts/gnt-os
416 422

  
423
PYTHON_BOOTSTRAP = \
424
	$(PYTHON_BOOTSTRAP_SBIN) \
425
	tools/ensure-dirs
426

  
417 427
qa_scripts = \
418 428
	qa/ganeti-qa.py \
419 429
	qa/qa_cluster.py \
......
451 461
	tools/ganeti-listrunner
452 462

  
453 463
nodist_sbin_SCRIPTS = \
454
	$(PYTHON_BOOTSTRAP) \
464
	$(PYTHON_BOOTSTRAP_SBIN) \
455 465
	daemons/ganeti-cleaner
456 466

  
457 467
dist_tools_SCRIPTS = \
......
469 479
	daemons/import-export \
470 480
	tools/check-cert-expired
471 481

  
482
nodist_pkglib_python_scripts = \
483
	tools/ensure-dirs
484

  
472 485
pkglib_SCRIPTS = \
473 486
	daemons/daemon-util \
474 487
	daemons/ensure-dirs \
475 488
	tools/kvm-ifup \
476 489
	$(pkglib_python_scripts)
477 490

  
491
nodist_pkglib_SCRIPTS = \
492
	$(nodist_pkglib_python_scripts)
493

  
478 494
EXTRA_DIST = \
479 495
	NEWS \
480 496
	UPGRADE \
......
610 626
	test/ganeti.runtime_unittest.py \
611 627
	test/ganeti.serializer_unittest.py \
612 628
	test/ganeti.ssh_unittest.py \
629
	test/ganeti.tools.ensure_dirs_unittest.py \
613 630
	test/ganeti.uidpool_unittest.py \
614 631
	test/ganeti.utils.algo_unittest.py \
615 632
	test/ganeti.utils.filelock_unittest.py \
......
657 674
	$(dist_sbin_SCRIPTS) \
658 675
	$(dist_tools_SCRIPTS) \
659 676
	$(pkglib_python_scripts) \
677
	$(nodist_pkglib_python_scripts) \
660 678
	$(python_tests) \
661 679
	$(pkgpython_PYTHON) \
662 680
	$(client_PYTHON) \
663 681
	$(hypervisor_PYTHON) \
664 682
	$(rapi_PYTHON) \
665 683
	$(server_PYTHON) \
684
	$(pytools_PYTHON) \
666 685
	$(http_PYTHON) \
667 686
	$(confd_PYTHON) \
668 687
	$(masterd_PYTHON) \
......
881 900
daemons/ganeti-%: MODULE = ganeti.server.$(patsubst ganeti-%,%,$(notdir $@))
882 901
daemons/ganeti-watcher: MODULE = ganeti.watcher
883 902
scripts/%: MODULE = ganeti.client.$(subst -,_,$(notdir $@))
903
tools/ensure-dirs: MODULE = ganeti.tools.ensure_dirs
884 904

  
885 905
$(PYTHON_BOOTSTRAP): Makefile | $(all_dirfiles)
886 906
	test -n "$(MODULE)" || { echo Missing module; exit 1; }

Also available in: Unified diff