merging from default

This commit is contained in:
Vlad Ionescu 2009-07-21 12:34:08 +01:00
commit e996274833
2 changed files with 8 additions and 8 deletions

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):
@ -85,11 +87,8 @@ ifdef BROKER_DIR
ln -sf $(BROKER_DIR) $(BROKER_SYMLINK)
endif
$(EBIN_DIR):
mkdir -p $@
$(EBIN_DIR)/%.beam: $(SOURCE_DIR)/%.erl $(EBIN_DIR) $(BROKER_SYMLINK)
erlc $(ERLC_OPTS) $<
$(EBIN_DIR)/%.beam: $(SOURCE_DIR)/%.erl $(INCLUDES) $(BROKER_SYMLINK)
mkdir -p $(EBIN_DIR); erlc $(ERLC_OPTS) $<
run: compile

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: