wmake: Update '-s' option to print the files processed without the rules

Based on patch contributed by Alexey Matveichev
Resolves feature request http://bugs.openfoam.org/view.php?id=2328
This commit is contained in:
Henry Weller
2016-11-12 22:01:44 +00:00
parent 1fc8529672
commit a0094dee38
14 changed files with 91 additions and 35 deletions

View File

@ -1,11 +1,13 @@
SUFFIXES += .y .Y
ytoo = $(WM_SCHEDULER) bison -v -d -y $< $(AND) \
ytoo = $E $(call QUIET_MESSAGE, " bison: $(<F)) \
$(WM_SCHEDULER) bison -v -d -y $< $(AND) \
mv y.tab.c $(@D)/$(<F).c $(AND) \
mv y.tab.h $(@D)/$(<F).h $(AND) \
$(cc) $(cFLAGS) -c $(@D)/$(<F).c -o $@
Ytoo = $(WM_SCHEDULER) bison -v -d -y $< $(AND) \
Ytoo = $E $(call QUIET_MESSAGE, " bison: $(<F)) \
$(WM_SCHEDULER) bison -v -d -y $< $(AND) \
mv y.tab.c $(@D)/$(<F).C $(AND) \
mv y.tab.h $(@D)/$(<F).H $(AND) \
$(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@

View File

@ -1,6 +1,7 @@
SUFFIXES += .y
ytoo = $(WM_SCHEDULER) btyacc -v -d $(SKELETON) $< $(AND) \
ytoo = $E $(call QUIET_MESSAGE, " btyacc: $(<F)") \
$(WM_SCHEDULER) btyacc -v -d $(SKELETON) $< $(AND) \
mv y_tab.c $(@D)/$(<F).C $(AND) \
mv y_tab.h $(@D)/$(<F).H $(AND) \
$(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@

View File

@ -1,6 +1,7 @@
SUFFIXES += .Y
Ytoo = $(WM_SCHEDULER) btyacc++ -v -d $(SKELETON) $< $(AND) \
Ytoo = $E $(call QUIET_MESSAGE, " btyacc++: $(<F)") \
$(WM_SCHEDULER) btyacc++ -v -d $(SKELETON) $< $(AND) \
mv y_tab.c $(@D)/$(<F).C $(AND) \
mv y_tab.h $(@D)/$(<F).H $(AND) \
$(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@

View File

@ -1,6 +1,7 @@
SUFFIXES += .y
ytoo = $(WM_SCHEDULER) byacc -v $(YYPREFIX) -d $< $(AND) \
ytoo = $E $(call QUIET_MESSAGE, " byacc: $(<F)") \
$(WM_SCHEDULER) byacc -v $(YYPREFIX) -d $< $(AND) \
mv y.tab.c $(@D)/$(<F).C $(AND) \
mv y.tab.h $(@D)/$(<F).H $(AND) \
$(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@

View File

@ -1,4 +1,5 @@
SUFFIXES += .l
ltoo = $(WM_SCHEDULER) flex -o $(@D)/$(<F).c $< $(AND) \
ltoo = $E $(call QUIET_MESSAGE, " flex: $(<F)") \
$(WM_SCHEDULER) flex -o $(@D)/$(<F).c $< $(AND) \
$(cc) $(cFLAGS) -c $(@D)/$(<F).c -o $@

View File

@ -1,4 +1,5 @@
SUFFIXES += .L
Ltoo = $(WM_SCHEDULER) flex -+ -o$(@D)/$(<F).C -f $< $(AND) \
Ltoo = $E $(call QUIET_MESSAGE, " flex++: $(<F)") \
$(WM_SCHEDULER) flex -+ -o$(@D)/$(<F).C -f $< $(AND) \
$(CC) $(c++FLAGS) $(c++LESSWARN) -c $(@D)/$(<F).C -o $@

View File

@ -1,4 +1,5 @@
SUFFIXES += .qt
qttoo = $(WM_SCHEDULER) $(QTDIR)/bin/moc -f $< -o $(@D)/$(<F).C $(AND) \
$(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
qttoo = $E $(call QUIET_MESSAGE, " moc: $(<F)") \
$(WM_SCHEDULER) $(QTDIR)/bin/moc -f $< -o $(@D)/$(<F).C $(AND) \
$(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@

View File

@ -1,15 +1,29 @@
#-------------------------------*- makefile -*---------------------------------
ifneq ("$(WM_QUIET)","")
E=@
define QUIET_MESSAGE
@echo $1 ;
endef
QUIET_OP=-s
else
E=
define QUIET_MESSAGE
endef
QUIET_OP=
endif
define DEFINE_TRANSFORM
$(OBJECTS_DIR)/%.o : %$1
$$($(subst .,,$(1))too)
$(call QUIET_MESSAGE, " $(subst .,,$(1))too: $(value <F)")
$E $$($(subst .,,$(1))too)
endef
$(foreach s,$(SUFFIXES),$(eval $(call DEFINE_TRANSFORM,$(s))))
$(OBJECTS_DIR)/%.dep : %
@$(WM_SCRIPTS)/makeTargetDir $@
@$(WMAKE_BIN)/wmkdep -I$(*D) $(LIB_HEADER_DIRS) $< | \
@$(WMAKE_BIN)/wmkdep $(QUIET_OP) -I$(*D) $(LIB_HEADER_DIRS) $< | \
sed -e 's,^$(WM_PROJECT_DIR)/,$$(WM_PROJECT_DIR)/,' \
-e 's,^$(WM_THIRD_PARTY_DIR)/,$$(WM_THIRD_PARTY_DIR)/,' > $@