diff options
| author | David Wragg <david@rabbitmq.com> | 2010-07-01 13:10:38 +0100 |
|---|---|---|
| committer | David Wragg <david@rabbitmq.com> | 2010-07-01 13:10:38 +0100 |
| commit | ec0b517396c195534b0190f10ef0387c50279df1 (patch) | |
| tree | 189575dc1f88127f6e75c7eea66d41cd0805fe42 | |
| parent | 04351ad1f079c9f8cbd707eb7dc72bf7693b5ca1 (diff) | |
| download | rabbitmq-server-ec0b517396c195534b0190f10ef0387c50279df1.tar.gz | |
Refine the inclusion of deps.mk
| -rw-r--r-- | Makefile | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -96,7 +96,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) @@ -296,11 +296,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 |