summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index b05f951a..cdfd9a42 100644
--- a/Makefile
+++ b/Makefile
@@ -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 $@