Merge pull request #536 from kaos/z_stats

zotonic · Mar 14, 2013 · 891d046 · 891d046
2 parents 19ebc17 + 87fc810
commit 891d046
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,20 +19,7 @@ rebar
 *.mo
 
 ebin/
-
-/deps/mochiweb/doc/
-/deps/mochiweb/.eunit/
-
-/deps/bert/
-/deps/dh_date/
-/deps/eiconv/
-/deps/gen_smtp/
-/deps/lager/
-/deps/mimetypes/
-/deps/mochiweb/
-/deps/ua_classifier/
-/deps/webzmachine/
-/deps/z_stdlib/
+deps/
 
 /src/erlydtl/erlydtl_parser.erl
 /src/tests/erlydtl/rendered_output/

diff --git a/GNUmakefile b/GNUmakefile
@@ -22,7 +22,7 @@ all: get-deps update-deps compile
 
 DEPS = $(shell find deps -type d | egrep '^deps/[^/]*$$' | grep -v 'deps/lager')
 LAGER = deps/lager
-Compile = (cd $(1) && $(REBAR_DEPS) compile)
+Compile = (cd $(1) && $(REBAR_DEPS) deps_dir=.. compile)
 
 # Helper targets
 .PHONY: erl

diff --git a/deps/bear b/deps/bear
diff --git a/deps/folsom b/deps/folsom
diff --git a/deps/meck b/deps/meck