Permalink
Browse files

Merge pull request #536 from kaos/z_stats

  • Loading branch information...
2 parents 19ebc17 + 87fc810 commit 891d046b10f6b5584182676125526419ec3e1741 @kaos kaos committed Mar 14, 2013
Showing with 2 additions and 18 deletions.
  1. +1 −14 .gitignore
  2. +1 −1 GNUmakefile
  3. +0 −1 deps/bear
  4. +0 −1 deps/folsom
  5. +0 −1 deps/meck
View
@@ -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/
View
@@ -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
Submodule bear deleted from 0da736
Submodule folsom deleted from 23c96e
Submodule meck deleted from 27ed56

0 comments on commit 891d046

Please sign in to comment.