diff options
| author |   Mark McLoughlin <markmc@redhat.com> | 2014-01-14 10:51:41 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2014-01-14 13:57:10 +0000 |
| commit | 5ea44eb897a1f4da3d95a6ad9c3e875029caf82d (patch) | |
| tree | da7a2be6dd6e31f5cdbfa4d2be9ee7adc92a502d /Makefile | |
| parent | 5b3593cc0d2b5b51cbfb03041cfb6c3bc05f4381 (diff) | |
Avoid echoing comment from makefile recipe
We include a comment to explain why nova-compute-instance.yaml is
included in the prerequisite list for overcloud.yaml, but this comment
gets echoed by make before it executes the recipe using a shell.
$> make overcloud.yaml
# overcloud-source.yaml [..] won't work here because [..]
# a prerequisite but don't want to pass it into merge.py
python ./tripleo_heat_merge/merge.py overcloud-source.yaml [..]
mv overcloud.yaml.tmp overcloud.yaml
Instead, maintain a list of files included by overcloud.yaml in a
variable and put a comment above that.
Change-Id: I1af69fbb33e1833170f086aec9b54c5c4e57138f
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1,6 +1,7 @@ -overcloud.yaml: overcloud-source.yaml nova-compute-instance.yaml swift-source.yaml - # $^ won't work here because we want to list nova-compute-instance.yaml as - # a prerequisite but don't want to pass it into merge.py +# Files included in overcloud-source.yaml via FileInclude +overcloud_source_deps = nova-compute-instance.yaml + +overcloud.yaml: overcloud-source.yaml swift-source.yaml $(overcloud_source_deps) python ./tripleo_heat_merge/merge.py overcloud-source.yaml swift-source.yaml > $@.tmp mv $@.tmp $@ |