diff options
| author | Loïc Hoguin <[email protected]> | 2018-05-14 15:46:58 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2018-05-14 15:46:58 +0200 |
| commit | 551f92737f2f20b43f45c5324eb9bdf55c6a2621 (patch) | |
| tree | eb9faa9c29c16715c38c123ae9eddbc18a59d830 | |
| parent | 054674e44715a98f02497c8a4b0e53c75065cd8e (diff) | |
| download | erlang.mk-551f92737f2f20b43f45c5324eb9bdf55c6a2621.tar.gz erlang.mk-551f92737f2f20b43f45c5324eb9bdf55c6a2621.tar.bz2 erlang.mk-551f92737f2f20b43f45c5324eb9bdf55c6a2621.zip | |
Small tweaks to previous PR
| -rw-r--r-- | core/erlc.mk | 2 | ||||
| -rw-r--r-- | test/core_app.mk | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/core/erlc.mk b/core/erlc.mk index e73c2e4..353f13b 100644 --- a/core/erlc.mk +++ b/core/erlc.mk @@ -265,8 +265,6 @@ define makedep.erl halt() endef -## TODO: Analyze if it is possible to use erlc -M instead of makedep.erl -## e.g.: erlc -M -MG -MF $@ -I $(APPS_DIR) -I $(DEPS_DIR) -I include/ src/* ifeq ($(if $(NO_MAKEDEP),$(wildcard $(PROJECT).d),),) $(PROJECT).d:: $(ERL_FILES) $(call core_find,include/,*.hrl) $(MAKEFILE_LIST) $(makedep_verbose) $(call erlang,$(call makedep.erl,$@)) diff --git a/test/core_app.mk b/test/core_app.mk index f1ec83b..42927c1 100644 --- a/test/core_app.mk +++ b/test/core_app.mk @@ -34,7 +34,7 @@ CORE_APP_CASES = appsrc-change \ hrl-multiapps-include-lib-recursive \ hrl-include-lib-src \ hrl-include-lib-src-recursive \ - hlr-deps \ + hrl-deps \ hrl-include-loop \ hrl-include_lib-loop \ hrl-include-loop-define-protected \ @@ -1980,6 +1980,7 @@ endif halt()" core-app-hrl-multiapps-include-lib: build clean + $i "Create a multi application repository with no root application" $t mkdir $(APP)/ $t cp ../erlang.mk $(APP)/ @@ -2083,6 +2084,7 @@ endif halt()" core-app-hrl-multiapps-include-lib-recursive: build clean + $i "Create a multi application repository with no root application" $t mkdir $(APP)/ $t cp ../erlang.mk $(APP)/ @@ -2364,7 +2366,8 @@ endif [{module, M} = code:load_file(M) || M <- Mods], \ halt()" -core-app-hlr-deps: build clean +core-app-hrl-deps: build clean + $i "Create a multi application repository with no root application" $t mkdir $(APP)/ $t cp ../erlang.mk $(APP)/ @@ -2552,6 +2555,7 @@ core-app-hrl-include_lib-loop-define-protected: build clean $t grep "src/use_red.erl:: include/blue.hrl include/red.hrl; @touch" $(APP)/$(APP).d core-app-hrl-multiapps-include-loop-define-protected: build clean + $i "Create a multi application repository with no root application" $t mkdir $(APP)/ $t cp ../erlang.mk $(APP)/ |