diff options
| -rw-r--r-- | core/erlc.mk | 13 | ||||
| -rw-r--r-- | core/test.mk | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/core/erlc.mk b/core/erlc.mk index c92a350..e540f38 100644 --- a/core/erlc.mk +++ b/core/erlc.mk @@ -43,10 +43,10 @@ mib_verbose = $(mib_verbose_$(V)) # Targets. ifeq ($(wildcard ebin/test),) -app:: +app:: $(PROJECT).d $(verbose) $(MAKE) --no-print-directory app-build else -app:: clean +app:: clean $(PROJECT).d $(verbose) $(MAKE) --no-print-directory app-build endif @@ -75,7 +75,7 @@ define app_file endef endif -app-build: ebin/$(PROJECT).app +app-build: ebin/$(PROJECT).app ; @echo -n # Source files. @@ -164,7 +164,10 @@ define makedep.erl ({attribute, _, file, {Dep, _}}, Acc) -> AddHd(Dep, Acc); (_, Acc) -> Acc end, [], Forms)), - [F, ":", [[" ", D] || D <- Deps], "; touch \$$@\n", CompileFirst(Deps)]; + case Deps of + [] -> ""; + _ -> [F, "::", [[" ", D] || D <- Deps], "; @touch \$$@\n", CompileFirst(Deps)] + end; {error, enoent} -> [] end @@ -176,7 +179,7 @@ endef $(PROJECT).d:: $(ERL_FILES) $(call core_find,include/,*.hrl) $(makedep_verbose) $(call erlang,$(call makedep.erl,$@)) -include $(PROJECT).d +-include $(PROJECT).d ebin/$(PROJECT).app:: ebin/ diff --git a/core/test.mk b/core/test.mk index 83bbecb..d7b0bfe 100644 --- a/core/test.mk +++ b/core/test.mk @@ -31,12 +31,12 @@ endif ifeq ($(wildcard ebin/test),) test-build:: ERLC_OPTS=$(TEST_ERLC_OPTS) -test-build:: clean deps test-deps +test-build:: clean deps test-deps $(PROJECT).d $(verbose) $(MAKE) --no-print-directory app-build test-dir ERLC_OPTS="$(TEST_ERLC_OPTS)" $(gen_verbose) touch ebin/test else test-build:: ERLC_OPTS=$(TEST_ERLC_OPTS) -test-build:: deps test-deps +test-build:: deps test-deps $(PROJECT).d $(verbose) $(MAKE) --no-print-directory app-build test-dir ERLC_OPTS="$(TEST_ERLC_OPTS)" endif |