diff options
| author | derwinlu <derwinlu+git@gmail.com> | 2015-07-03 11:27:41 +0200 |
|---|---|---|
| committer | derwinlu <derwinlu+git@gmail.com> | 2015-07-03 11:27:41 +0200 |
| commit | 383b70bb4e643f0dfb7d79c3ee841819dc0a0ff3 (patch) | |
| tree | 5cb84c216f3b57eaea3946c127dd3e6e6fc1efdc /Makefile | |
| parent | 9b5d2e21099250c9fa96a421e6af3e08cb270cf7 (diff) | |
| download | rabbitmq-server-git-383b70bb4e643f0dfb7d79c3ee841819dc0a0ff3.tar.gz | |
remove python version detection from Makefile...
...and let env handle it.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 25 |
1 files changed, 3 insertions, 22 deletions
@@ -26,25 +26,6 @@ WEB_MANPAGES=$(patsubst %.xml, %.man.xml, $(wildcard $(DOCS_DIR)/*.[0-9].xml) $( USAGES_XML=$(DOCS_DIR)/rabbitmqctl.1.xml $(DOCS_DIR)/rabbitmq-plugins.1.xml USAGES_ERL=$(foreach XML, $(USAGES_XML), $(call usage_xml_to_erl, $(XML))) -ifeq ($(shell python -c 'import simplejson' 2>/dev/null && echo yes),yes) -PYTHON=python -else -ifeq ($(shell python2.7 -c 'import json' 2>/dev/null && echo yes),yes) -PYTHON=python2.7 -else -ifeq ($(shell python2.6 -c 'import simplejson' 2>/dev/null && echo yes),yes) -PYTHON=python2.6 -else -ifeq ($(shell python2.5 -c 'import simplejson' 2>/dev/null && echo yes),yes) -PYTHON=python2.5 -else -# Hmm. Missing simplejson? -PYTHON=python -endif -endif -endif -endif - BASIC_PLT=basic.plt RABBIT_PLT=rabbit.plt @@ -161,13 +142,13 @@ $(TEST_EBIN_DIR): mkdir -p $(TEST_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 --ignore-conflicts header $(AMQP_SPEC_JSON_FILES_0_9_1) $(AMQP_SPEC_JSON_FILES_0_8) $@ + ./codegen.py --ignore-conflicts header $(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) $@ + ./codegen.py body $(AMQP_SPEC_JSON_FILES_0_9_1) $@ $(SOURCE_DIR)/rabbit_framing_amqp_0_8.erl: codegen.py $(AMQP_CODEGEN_DIR)/amqp_codegen.py $(AMQP_SPEC_JSON_FILES_0_8) - $(PYTHON) codegen.py body $(AMQP_SPEC_JSON_FILES_0_8) $@ + ./codegen.py body $(AMQP_SPEC_JSON_FILES_0_8) $@ dialyze: $(BEAM_TARGETS) $(BASIC_PLT) dialyzer --plt $(BASIC_PLT) --no_native --fullpath \ |