summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-04-29 16:56:17 +0100
committerSimon MacMullen <simon@rabbitmq.com>2013-04-29 16:56:17 +0100
commit2470be2a21c1300ee8b7c3b9f7162325d3f0d628 (patch)
tree8aef25d9d83c009bc405e52d0eb58a84d5ea1053
parent13080927daa79f895f2d907ee094b5ce95395fc7 (diff)
parent52d424afd8fb0aac540ae3ca2ab8fc80c36bb0c4 (diff)
downloadrabbitmq-server-git-2470be2a21c1300ee8b7c3b9f7162325d3f0d628.tar.gz
Merge heads
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index bf33b93146..449d1edddd 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@ TARGET_SRC_DIR=dist/$(TARBALL_NAME)
SIBLING_CODEGEN_DIR=../rabbitmq-codegen/
AMQP_CODEGEN_DIR=$(shell [ -d $(SIBLING_CODEGEN_DIR) ] && echo $(SIBLING_CODEGEN_DIR) || echo codegen)
-AMQP_SPEC_JSON_FILES_0_9_1=$(AMQP_CODEGEN_DIR)/amqp-rabbitmq-0.9.1.json
+AMQP_SPEC_JSON_FILES_0_9_1=$(AMQP_CODEGEN_DIR)/amqp-rabbitmq-0.9.1.json $(AMQP_CODEGEN_DIR)/credit_extension.json
AMQP_SPEC_JSON_FILES_0_8=$(AMQP_CODEGEN_DIR)/amqp-rabbitmq-0.8.json
ERL_CALL=erl_call -sname $(RABBITMQ_NODENAME) -e