aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hp.com>2013-07-10 14:35:32 +1200
committerRobert Collins <rbtcollins@hp.com>2013-07-10 14:35:32 +1200
commit688a489021b0ca53c0aebfc7e843ddef5a922f6f (patch)
tree7aec3bac4f8cd1f017cde48c628beacc0ae7d2bd /Makefile
parent6529485a2af4075742dd23846a5fef68a9e8bd4c (diff)
Refine the Makefile rules.
The make rules in use were duplicative, which leads to maintenance headaches. Change-Id: Ic9e37796422caa2427c1575eb776c5d6a98516c3
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 8e0d18f4..3f388594 100644
--- 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 $@