diff options
author | Pavel Raiskup <praiskup@redhat.com> | 2014-11-05 10:23:41 +0100 |
---|---|---|
committer | Pavel Raiskup <praiskup@redhat.com> | 2014-11-05 10:23:41 +0100 |
commit | f45d146cb70d09be1face87ddede306302627349 (patch) | |
tree | 2f191f1942af6828839eb115db3e39c814702679 | |
parent | 6408f8eb592f0d4885ce607ad874c29b284440c5 (diff) | |
download | postgresql-setup-tests-f45d146cb70d09be1face87ddede306302627349.tar.gz postgresql-setup-tests-f45d146cb70d09be1face87ddede306302627349.tar.xz postgresql-setup-tests-f45d146cb70d09be1face87ddede306302627349.zip |
controller: fix 'make distcheck' and 'make dist'
* Makefile.am: Make sure all sources and data files are
distributed.
-rw-r--r-- | controller/Makefile.am | 55 |
1 files changed, 40 insertions, 15 deletions
diff --git a/controller/Makefile.am b/controller/Makefile.am index d4d16a9..a5d227d 100644 --- a/controller/Makefile.am +++ b/controller/Makefile.am @@ -6,7 +6,7 @@ bin_SCRIPTS = \ sysconf_DATA = etc/dtf.sh -pkgdata_DATA = ./share/dtf-controller/parse_credsfile +pkgdata_DATA = $(srcdir)/share/dtf-controller/parse_credsfile libexec_SCRIPTS = libexec/dtf-wait-for-ssh \ libexec/dtf-commit-results \ @@ -17,49 +17,74 @@ libexec_SCRIPTS = libexec/dtf-wait-for-ssh \ ansiblevarsdir = $(pkgdatadir)/ansible/vars ansibleplaybooksdir = $(pkgdatadir)/ansible/playbooks -ansiblevars_DATA = share/dtf-controller/ansible/vars/generated-vars.yml +ansiblevars_DATA = $(srcdir)/share/dtf-controller/ansible/vars/generated-vars.yml dtfplaybookdir = $(pkgdatadir)/ansible/playbooks -ansibleplaybooks_DATA = share/dtf-controller/ansible/playbooks/fedora.yml +ansibleplaybooks_DATA = $(srcdir)/share/dtf-controller/ansible/playbooks/fedora.yml resulttemplatedir = $(pkgdatadir)/results-stats-templates -resulttemplate_DATA = share/dtf-controller/results-stats-templates/html.tmpl +resulttemplate_DATA = $(srcdir)/share/dtf-controller/results-stats-templates/html.tmpl share/dtf-controller/ansible/vars/generated-vars.yml: \ - share/dtf-controller/ansible/vars/generated-vars.yml.in .dep + $(srcdir)/share/dtf-controller/ansible/vars/generated-vars.yml.in .dep $(INSTANTIATE) .dep: $(c_s) + mkdir -p bin libexec etc touch .dep -libexec/dtf-commit-results: libexec/dtf-commit-results.in .dep +libexec/dtf-commit-results: $(srcdir)/libexec/dtf-commit-results.in .dep $(INSTANTIATE_SCRIPT) -libexec/dtf-result-stats: libexec/dtf-result-stats.in .dep +libexec/dtf-result-stats: $(srcdir)/libexec/dtf-result-stats.in .dep $(INSTANTIATE_SCRIPT) -libexec/dtf-nova: libexec/dtf-nova.in .dep +libexec/dtf-nova: $(srcdir)/libexec/dtf-nova.in .dep $(INSTANTIATE_SCRIPT) -bin/dtf-run-remote: bin/dtf-run-remote.in .dep +bin/dtf-run-remote: $(srcdir)/bin/dtf-run-remote.in .dep $(INSTANTIATE_SCRIPT) -bin/dtf-get-machine: bin/dtf-get-machine.in .dep +bin/dtf-get-machine: $(srcdir)/bin/dtf-get-machine.in .dep $(INSTANTIATE_SCRIPT) -bin/dtf-return-machine: bin/dtf-return-machine.in .dep +bin/dtf-return-machine: $(srcdir)/bin/dtf-return-machine.in .dep $(INSTANTIATE_SCRIPT) -bin/dtf-controller: bin/dtf-controller.in .dep +bin/dtf-controller: $(srcdir)/bin/dtf-controller.in .dep $(INSTANTIATE_SCRIPT) -etc/dtf.sh: etc/dtf.sh.in .dep +etc/dtf.sh: $(srcdir)/etc/dtf.sh.in .dep $(INSTANTIATE) GENERATED_FILES = $(bin_SCRIPTS) \ $(sysconf_DATA) \ share/dtf-controller/ansible/vars/generated-vars.yml \ libexec/dtf-commit-results \ - libexec/dtf-result-stats + libexec/dtf-result-stats \ + libexec/dtf-nova -CLEANFILES = $(GENERATED_FILES) +CONTROLLERSOURCES = \ + $(srcdir)/libexec/*.in \ + $(srcdir)/etc/*.in \ + $(srcdir)/bin/*.in \ + $(srcdir)/share/dtf-controller/ansible/vars/generated-vars.yml.in + +CONTROLLERDATA = \ + $(srcdir)/share/dtf-controller/parse_credsfile \ + $(srcdir)/share/dtf-controller/results-stats-templates \ + $(srcdir)/share/dtf-controller/results-stats-templates/html.tmpl \ + $(srcdir)/share/dtf-controller/ansible/run_include \ + $(srcdir)/share/dtf-controller/ansible/playbooks/include/beakerlib.yml \ + $(srcdir)/share/dtf-controller/ansible/playbooks/include/additional-packages.yml \ + $(srcdir)/share/dtf-controller/ansible/playbooks/include/prepare-testenv.yml \ + $(srcdir)/share/dtf-controller/ansible/playbooks/include/download-results.yml \ + $(srcdir)/share/dtf-controller/ansible/playbooks/fedora.yml \ + $(srcdir)/share/dtf-controller/ansible/dummy-wrapper.yml + + +EXTRA_DIST = $(srcdir)/libexec/dtf-wait-for-ssh \ + $(CONTROLLERSOURCES) \ + $(CONTROLLERDATA) + +CLEANFILES = $(GENERATED_FILES) .dep |