diff options
Diffstat (limited to 'core/core.mk')
-rw-r--r-- | core/core.mk | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/core/core.mk b/core/core.mk index a6f55b6..4b292ee 100644 --- a/core/core.mk +++ b/core/core.mk @@ -73,13 +73,9 @@ endif # Core targets. -ifneq ($(words $(MAKECMDGOALS)),1) .NOTPARALLEL: -endif -all:: deps - $(verbose) $(MAKE) --no-print-directory app - $(verbose) $(MAKE) --no-print-directory rel +all:: deps app rel # Noop to avoid a Make warning when there's nothing to do. rel:: @@ -101,7 +97,7 @@ help:: "erlang.mk (version $(ERLANG_MK_VERSION)) is distributed under the terms of the ISC License." \ "Copyright (c) 2013-2015 Loïc Hoguin <[email protected]>" \ "" \ - "Usage: [V=1] $(MAKE) [-jNUM] [target]..." \ + "Usage: [V=1] $(MAKE) [target]..." \ "" \ "Core targets:" \ " all Run deps, app and rel targets in that order" \ @@ -136,7 +132,7 @@ endef # Adding erlang.mk to make Erlang scripts who call init:get_plain_arguments() happy. define erlang -$(ERL) -pz $(ERLANG_MK_TMP)/rebar/ebin -eval "$(subst $(newline),,$(subst ",\",$(1)))" -- erlang.mk +$(ERL) $(2) -pz $(ERLANG_MK_TMP)/rebar/ebin -eval "$(subst $(newline),,$(subst ",\",$(1)))" -- erlang.mk endef ifeq ($(shell which wget 2>/dev/null | wc -l), 1) @@ -166,7 +162,7 @@ endif core_eq = $(and $(findstring $(1),$(2)),$(findstring $(2),$(1))) -core_find = $(foreach d,$(call core_ls,$1*),$(call core_find,$d/,$2) $(filter $(subst *,%,$2),$d)) +core_find = $(if $(wildcard $1),$(shell find $1 -type f -name $(subst *,\*,$2))) core_lc = $(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(subst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q,$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,u,$(subst V,v,$(subst W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$(1))))))))))))))))))))))))))) |