diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-05-12 11:43:06 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-05-12 11:43:06 +0100 |
| commit | 9b7774748885024f8e848fcd45461f0b097d4574 (patch) | |
| tree | cdae0e8a216d826a9ffe87572994a13a78960fef | |
| parent | fb5e3344fe2a3179faa33a753a9f6477ad62ced2 (diff) | |
| download | rabbitmq-server-git-9b7774748885024f8e848fcd45461f0b097d4574.tar.gz | |
Support multiple source dirs
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | generate_app | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -94,7 +94,7 @@ $(DEPS_FILE): $(SOURCES) $(INCLUDES) echo $(subst : ,:,$(foreach FILE,$^,$(FILE):)) | escript generate_deps $@ $(EBIN_DIR) $(EBIN_DIR)/rabbit.app: $(EBIN_DIR)/rabbit_app.in $(SOURCES) generate_app - escript generate_app $(SOURCE_DIR) $@ < $< + escript generate_app $@ $(SOURCE_DIR) < $< $(EBIN_DIR)/%.beam: $(SOURCE_DIR)/%.erl | $(DEPS_FILE) erlc $(ERLC_OPTS) -pa $(EBIN_DIR) $< diff --git a/generate_app b/generate_app index 2246971dbb..d8813542b0 100644 --- a/generate_app +++ b/generate_app @@ -1,8 +1,9 @@ #!/usr/bin/env escript %% -*- erlang -*- -main([SrcDir, TargetFile]) -> +main([TargetFile | SrcDirs]) -> Modules = [list_to_atom(filename:basename(F, ".erl")) || + SrcDir <- SrcDirs, F <- filelib:wildcard("*.erl", SrcDir)], {ok, {application, Application, Properties}} = io:read(''), NewProperties = |