summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2010-07-07 13:44:28 +0100
committerSimon MacMullen <simon@rabbitmq.com>2010-07-07 13:44:28 +0100
commit57636ecb35a82f9ff35a69e9637c2b183e044acd (patch)
tree44e601bcc2342280a20e6046b93a4de7944dd878
parent2ce4e01927d1af5425604a9f89df95fb031f46c2 (diff)
downloadrabbitmq-server-git-57636ecb35a82f9ff35a69e9637c2b183e044acd.tar.gz
More renaming.
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 216934aeee..a53275472e 100644
--- a/Makefile
+++ b/Makefile
@@ -101,10 +101,10 @@ $(EBIN_DIR)/%.beam:
erlc $(ERLC_OPTS) -pa $(EBIN_DIR) $<
$(INCLUDE_DIR)/rabbit_framing.hrl: codegen.py $(AMQP_CODEGEN_DIR)/amqp_codegen.py $(AMQP_SPEC_JSON_FILES_0_9_1) $(AMQP_SPEC_JSON_FILES_0_8)
- $(PYTHON) codegen.py --allow-accumulate header $(AMQP_SPEC_JSON_FILES_0_9_1) $(AMQP_SPEC_JSON_FILES_0_8) $@
+ $(PYTHON) codegen.py --ignore-conflicts header $(AMQP_SPEC_JSON_FILES_0_9_1) $(AMQP_SPEC_JSON_FILES_0_8) $@
$(INCLUDE_DIR)/rabbit_framing_spec.hrl: codegen.py $(AMQP_CODEGEN_DIR)/amqp_codegen.py $(AMQP_SPEC_JSON_FILES_0_9_1) $(AMQP_SPEC_JSON_FILES_0_8)
- $(PYTHON) codegen.py --allow-accumulate spec $(AMQP_SPEC_JSON_FILES_0_9_1) $(AMQP_SPEC_JSON_FILES_0_8) $@
+ $(PYTHON) codegen.py --ignore-conflicts spec $(AMQP_SPEC_JSON_FILES_0_9_1) $(AMQP_SPEC_JSON_FILES_0_8) $@
$(SOURCE_DIR)/rabbit_framing_amqp_0_9_1.erl: codegen.py $(AMQP_CODEGEN_DIR)/amqp_codegen.py $(AMQP_SPEC_JSON_FILES_0_9_1)
$(PYTHON) codegen.py body $(AMQP_SPEC_JSON_FILES_0_9_1) $@