root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merging bug19985 into default (again). 

If you're wondering why this this has happened again, read the corresponding
bug report. Basically it seemed easier to just re-merge than to extract the
patch onto a separate branch.
This commit is contained in:
Ben Hood 2009-07-17 18:55:08 +01:00
parent 51ebae45d5 7cc998d97a
commit 2c3bdaf385
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deps/amqp_client/Makefile vendored
View File

@ -64,7 +64,7 @@ all: compile
compile: $(TARGETS)
compile_tests: $(TEST_TARGETS)
compile_tests: $(TEST_DIR)
dialyze: $(TARGETS)
@ -76,8 +76,10 @@ dialyze_all: $(TARGETS) $(TEST_TARGETS)
add_broker_to_plt: $(BROKER_SYMLINK)/ebin
$(DIALYZER_CALL) --add_to_plt -r $<
$(TEST_TARGETS): $(TEST_DIR)
$(TEST_TARGETS): $(BROKER_SYMLINK)
.PHONY: $(TEST_DIR)
$(TEST_DIR): $(BROKER_SYMLINK)
$(MAKE) -C $(TEST_DIR)
$(BROKER_SYMLINK):
@ -88,7 +90,7 @@ endif
$(EBIN_DIR):
mkdir -p $@
$(EBIN_DIR)/%.beam: $(SOURCE_DIR)/%.erl $(EBIN_DIR) $(BROKER_SYMLINK)
$(EBIN_DIR)/%.beam: $(SOURCE_DIR)/%.erl $(INCLUDES) $(BROKER_SYMLINK)
erlc $(ERLC_OPTS) $<

3
deps/amqp_client/test/Makefile vendored
View File

@ -26,6 +26,7 @@
TEST_SOURCES=$(wildcard *.erl)
TEST_TARGETS=$(patsubst %.erl, %.beam, $(TEST_SOURCES))
INCLUDES=$(wildcard ../$(INCLUDE_DIR)/*.hrl)
ERLC_OPTS=-I ../$(INCLUDE_DIR) -I ../$(INCLUDE_SERV_DIR) -o ./ -Wall -v +debug_info $(shell [ $(USE_SPECS) = "true" ] && echo "-Duse_specs")
@ -33,7 +34,7 @@ all: compile
compile: $(TEST_TARGETS)
%.beam: %.erl
%.beam: %.erl $(INCLUDES)
erlc $(ERLC_OPTS) $<
clean: