zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Henry Weller
2016-11-14 08:32:30 +00:00
parent 9cf0a44d12
commit cebac21893
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wmake/rules/General/transform
View File

@ -5,11 +5,15 @@ ifneq ("$(WM_QUIET)","")
define QUIET_MESSAGE define QUIET_MESSAGE
@echo " $1: $2"; @echo " $1: $2";
endef endef
QUIET_OP=-s define VERBOSE_MESSAGE
endef
else else
E= E=
define QUIET_MESSAGE define QUIET_MESSAGE
endef endef
define VERBOSE_MESSAGE
@echo "$1 $2";
endef
QUIET_OP= QUIET_OP=
endif endif
@ -22,8 +26,10 @@ endef
$(foreach s,$(SUFFIXES),$(eval $(call DEFINE_TRANSFORM,$(s)))) $(foreach s,$(SUFFIXES),$(eval $(call DEFINE_TRANSFORM,$(s))))
$(OBJECTS_DIR)/%.dep : % $(OBJECTS_DIR)/%.dep : %
$(call QUIET_MESSAGE,wmkdep,$(<F))
$(call VERBOSE_MESSAGE,Making dependency list for source file,$(<F))
@$(WM_SCRIPTS)/makeTargetDir $@ @$(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)/,' \ sed -e 's,^$(WM_PROJECT_DIR)/,$$(WM_PROJECT_DIR)/,' \
-e 's,^$(WM_THIRD_PARTY_DIR)/,$$(WM_THIRD_PARTY_DIR)/,' > $@ -e 's,^$(WM_THIRD_PARTY_DIR)/,$$(WM_THIRD_PARTY_DIR)/,' > $@

15
wmake/src/wmkdep.l
View File

@ -155,21 +155,6 @@ int main(int argc, char* argv[])
} }
sourceFile = strdup(argv[argc-1]); 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) if ((basePos = strrchr(sourceFile, '/')) == NULL)
{ {