Refine the Makefile rules.

The make rules in use were duplicative, which leads to maintenance
headaches.

Change-Id: Ic9e37796422caa2427c1575eb776c5d6a98516c3

diff --git a/Makefile b/Makefile
index 8e0d18f..3f38859 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
 NOTCOMPUTE=nova-api.yaml keystone.yaml heat-allinone.yaml glance.yaml quantum.yaml mysql.yaml rabbitmq.yaml
 
 notcompute.yaml: $(NOTCOMPUTE)
-       python merge.py --master-role notcompute --slave-roles stateless stateful -- $(NOTCOMPUTE) > notcompute.yaml
+       python merge.py --master-role notcompute --slave-roles stateless stateful -- $^ > notcompute.yaml
 
 overcloud.yaml: bootstack-vm.yaml nova-compute-group.yaml
-       python merge.py bootstack-vm.yaml nova-compute-group.yaml > overcloud.yaml
+       python merge.py $^ > $@.tmp
+       mv $@.tmp $@