Browse Source

Small tweaks to previous PR

Loïc Hoguin 7 years ago
parent
commit
551f92737f
2 changed files with 6 additions and 4 deletions
  1. 0 2
      core/erlc.mk
  2. 6 2
      test/core_app.mk

+ 0 - 2
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,$@))

+ 6 - 2
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)/