X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=d7fc543a3d366dbc37f4551698d7f0fb417d49e1;hb=0757603f2ec10223a99de17123cfd9c1a6a815af;hp=52d65efbadb37b1e3455fe64a6d678c13baf8529;hpb=2fcc443bf2d00dc04d7bab831ea0b55e52a5656a;p=apex-tripleo-heat-templates.git

diff --git a/Makefile b/Makefile
index 52d65efb..d7fc543a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,43 @@
-overcloud.yaml: overcloud-source.yaml nova-compute-instance.yaml
-	python merge.py $< > $@.tmp
+generated_templates =                \
+        overcloud.yaml               \
+        undercloud-vm.yaml           \
+        undercloud-bm.yaml           \
+        undercloud-vm-tuskar.yaml    \
+        undercloud-vm-ironic.yaml
+
+# Files included in overcloud-source.yaml via FileInclude
+overcloud_source_deps = nova-compute-instance.yaml
+
+all: $(generated_templates)
+
+overcloud.yaml: overcloud-source.yaml swift-source.yaml ssl-source.yaml $(overcloud_source_deps)
+	python ./tripleo_heat_merge/merge.py overcloud-source.yaml swift-source.yaml ssl-source.yaml > $@.tmp
+	mv $@.tmp $@
+
+overcloud-with-block-storage.yaml: overcloud-source.yaml nova-compute-instance.yaml swift-source.yaml block-storage.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
+	python ./tripleo_heat_merge/merge.py overcloud-source.yaml swift-source.yaml block-storage.yaml > $@.tmp
 	mv $@.tmp $@
 
-undercloud-vm-tuskar.yaml: undercloud-vm.yaml tuskar-source.yaml
-	python merge.py $^ > $@.tmp
+undercloud-vm.yaml: undercloud-source.yaml undercloud-vm-source.yaml
+	python ./tripleo_heat_merge/merge.py $^ > $@.tmp
 	mv $@.tmp $@
 
-undercloud-vm-ironic.yaml: undercloud-vm.yaml ironic-source.yaml
-	python merge.py $^ > $@.tmp
+undercloud-bm.yaml: undercloud-source.yaml undercloud-bm-source.yaml
+	python ./tripleo_heat_merge/merge.py $^ > $@.tmp
+	mv $@.tmp $@
+
+undercloud-vm-tuskar.yaml: undercloud-source.yaml undercloud-vm-source.yaml tuskar-source.yaml
+	python ./tripleo_heat_merge/merge.py $^ > $@.tmp
+	mv $@.tmp $@
+
+undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-ironic-source.yaml ironic-source.yaml
+	python ./tripleo_heat_merge/merge.py $^ > $@.tmp
 	mv $@.tmp $@
 
 test:
 	@bash test_merge.bash
+
+clean:
+	rm -f $(generated_templates)