diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-09-19 22:53:04 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-09-19 22:53:04 +0100 |
| commit | 3bd4c542a75db5de4353f29a2458d884ee5affc0 (patch) | |
| tree | 2d8483e7f7cdf47739cad624a731848961b3e613 | |
| parent | acdd9667d506fdc82a662546f2e6e24848a154e1 (diff) | |
| parent | 98326252b89a3088bb4c31ffac492b4b9875f0b3 (diff) | |
| download | rabbitmq-server-git-3bd4c542a75db5de4353f29a2458d884ee5affc0.tar.gz | |
Merging bug 22926 into default
| -rw-r--r-- | Makefile | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -97,7 +97,7 @@ $(DEPS_FILE): $(SOURCES) $(INCLUDES) $(EBIN_DIR)/rabbit.app: $(EBIN_DIR)/rabbit_app.in $(BEAM_TARGETS) generate_app escript generate_app $(EBIN_DIR) $@ < $< -$(EBIN_DIR)/%.beam: +$(EBIN_DIR)/%.beam: $(SOURCE_DIR)/%.erl $(DEPS_FILE) 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) @@ -308,11 +308,6 @@ else TESTABLEGOALS:=$(MAKECMDGOALS) endif -ifneq "$(strip $(TESTABLEGOALS))" "$(DEPS_FILE)" ifneq "$(strip $(patsubst clean%,,$(patsubst %clean,,$(TESTABLEGOALS))))" "" -ifeq "$(strip $(wildcard $(DEPS_FILE)))" "" -$(info $(shell $(MAKE) $(DEPS_FILE))) -endif -include $(DEPS_FILE) -endif +-include $(DEPS_FILE) endif |