diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-01-14 17:44:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-01-14 17:44:40 +0000 |
| commit | 9b39f379900cb09dbfcd3668352677a2b196a094 (patch) | |
| tree | 29d836a87ad2ec87547714c9aea1e3a1f1b6cca5 | |
| parent | cf45003e97d0007ea4e706bde7a62bdd014baf0d (diff) | |
| parent | 5ea44eb897a1f4da3d95a6ad9c3e875029caf82d (diff) | |
Merge "Avoid echoing comment from makefile recipe"
| -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 $@ |