Commit 2dbfe2a7 authored by Henry Weller's avatar Henry Weller
Browse files

wmake: Moved wmkdep messages into rules/General/transform makefile

parent 961b6531
......@@ -5,11 +5,15 @@ ifneq ("$(WM_QUIET)","")
define QUIET_MESSAGE
@echo " $1: $2";
endef
QUIET_OP=-s
define VERBOSE_MESSAGE
endef
else
E=
define QUIET_MESSAGE
endef
define VERBOSE_MESSAGE
@echo "$1 $2";
endef
QUIET_OP=
endif
......@@ -22,8 +26,10 @@ endef
$(foreach s,$(SUFFIXES),$(eval $(call DEFINE_TRANSFORM,$(s))))
$(OBJECTS_DIR)/%.dep : %
$(call QUIET_MESSAGE,wmkdep,$(<F))
$(call VERBOSE_MESSAGE,Making dependency list for source file,$(<F))
@$(WM_SCRIPTS)/makeTargetDir $@
@$(WMAKE_BIN)/wmkdep $(QUIET_OP) -I$(*D) $(LIB_HEADER_DIRS) $< | \
@$(WMAKE_BIN)/wmkdep -I$(*D) $(LIB_HEADER_DIRS) $< | \
sed -e 's,^$(WM_PROJECT_DIR)/,$$(WM_PROJECT_DIR)/,' \
-e 's,^$(WM_THIRD_PARTY_DIR)/,$$(WM_THIRD_PARTY_DIR)/,' > $@
......
......@@ -155,21 +155,6 @@ int main(int argc, char* argv[])
}
sourceFile = strdup(argv[argc-1]);
silent = (strncmp(argv[1], "-s", 2) == 0);
if (silent)
{
fprintf(stderr, " wmkdep: %s\n", basename(sourceFile));
}
else
{
fprintf
(
stderr,
"Making dependency list for source file %s\n",
sourceFile
);
}
if ((basePos = strrchr(sourceFile, '/')) == NULL)
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment