zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wmake: Simplified QUIET_MESSAGE function

Browse Source
This commit is contained in:
Henry Weller
2016-11-13 11:19:29 +00:00
parent 8b0ec47566
commit 79081ba3bb
11 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wmake/makefiles/general
View File

@ -130,19 +130,21 @@ LIB_HEADER_DIRS = \
$(EXE): $(OBJECTS)
@$(WM_SCRIPTS)/makeTargetDir $(EXE)
$(call QUIET_MESSAGE, " ld: $(notdir $(EXE))")
$(call QUIET_MESSAGE,ld,$(notdir $(EXE)))
$E $(LINKEXE) $(OBJECTS) -L$(LIB_PLATFORMS) \
$(EXE_LIBS) $(PROJECT_LIBS) $(SYS_LIBS) \
$(LINK_LIBS) $(GLIBS) -o $(EXE)
@echo "->> $(EXE)"
exe: $(SEXE)
@echo "->> $(SEXE)"
$(SEXE):$(OBJECTS)
@$(WM_SCRIPTS)/makeTargetDir $(SEXE)
$(call QUIET_MESSAGE, " ld: $(notdir $(SEXE))")
$(call QUIET_MESSAGE,ld,$(notdir $(SEXE)))
$E $(LINKEXE) $(OBJECTS) $(EXE_LIBS) \
$(SYS_LIBS) $(LINK_LIBS) $(GLIBS) -o $(SEXE)
@echo "->> $(SEXE)"
#------------------------------------------------------------------------------
@ -156,7 +158,7 @@ libso: $(LIB).$(SO)
$(LIB).$(SO): $(OBJECTS)
@$(WM_SCRIPTS)/makeTargetDir $(LIB)
$(call QUIET_MESSAGE, " ld: $(notdir $(LIB)).$(SO)")
$(call QUIET_MESSAGE,ld,$(notdir $(LIB)).$(SO))
$E $(LINKLIBSO) $(OBJECTS) -L$(LIB_PLATFORMS) \
$(LIB_LIBS) $(GLIB_LIBS) -o $(LIB).$(SO)
@ -166,9 +168,9 @@ lib: $(LIB).a
$(LIB).a: $(OBJECTS)
@$(WM_SCRIPTS)/makeTargetDir $(LIB)
@rm -f $(LIB).a
$(call QUIET_MESSAGE, " ar: $(notdir $(LIB))")
$(call QUIET_MESSAGE,ar,$(notdir $(LIB)))
$E $(AR) $(ARFLAGS) $(LIB).a $(OBJECTS)
$(call QUIET_MESSAGE, " ranlib: $(notdir $(LIB))")
$(call QUIET_MESSAGE,ranlib,$(notdir $(LIB)))
$E $(RANLIB) $(LIB).a
libo: $(LIB).o
@ -177,7 +179,7 @@ libo: $(LIB).o
$(LIB).o: $(OBJECTS)
@$(WM_SCRIPTS)/makeTargetDir $(LIB)
@rm -f $(LIB).o
$(call QUIET_MESSAGE, " ld: $(notdir $(LIB)).o")
$(call QUIET_MESSAGE,ld,$(notdir $(LIB)).o)
$E $(LD) -r -o $(LIB).o $(OBJECTS)

4
wmake/rules/General/bison
View File

@ -1,12 +1,12 @@
SUFFIXES += .y .Y
ytoo = $E $(call QUIET_MESSAGE, " bison: $(<F)) \
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 = $E $(call QUIET_MESSAGE, " bison: $(<F)) \
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) \

2
wmake/rules/General/btyacc
View File

@ -1,6 +1,6 @@
SUFFIXES += .y
ytoo = $E $(call QUIET_MESSAGE, " btyacc: $(<F)") \
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) \

2
wmake/rules/General/btyacc++
View File

@ -1,6 +1,6 @@
SUFFIXES += .Y
Ytoo = $E $(call QUIET_MESSAGE, " btyacc++: $(<F)") \
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) \

2
wmake/rules/General/byacc
View File

@ -1,6 +1,6 @@
SUFFIXES += .y
ytoo = $E $(call QUIET_MESSAGE, " byacc: $(<F)") \
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) \

2
wmake/rules/General/flex
View File

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

2
wmake/rules/General/flex++
View File

@ -1,5 +1,5 @@
SUFFIXES += .L
Ltoo = $E $(call QUIET_MESSAGE, " flex++: $(<F)") \
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 $@

2
wmake/rules/General/moc
View File

@ -1,5 +1,5 @@
SUFFIXES += .qt
qttoo = $E $(call QUIET_MESSAGE, " moc: $(<F)") \
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 $@

4
wmake/rules/General/transform
View File

@ -3,7 +3,7 @@
ifneq ("$(WM_QUIET)","")
E=@
define QUIET_MESSAGE
@echo $1 ;
@echo " $1: $2";
endef
QUIET_OP=-s
else
@ -15,7 +15,7 @@ endif
define DEFINE_TRANSFORM
$(OBJECTS_DIR)/%.o : %$1
$(call QUIET_MESSAGE, " $(subst .,,$(1))too: $(value <F)")
$(call QUIET_MESSAGE,$(subst .,,$(1))too,$(value <F))
$E $$($(subst .,,$(1))too)
endef

4
wmake/rules/General/yacc
View File

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

4
wmake/src/Makefile
View File

@ -64,12 +64,12 @@ clean:
$(WMAKE_BIN)/dirToString: dirToString.c
@mkdir -p $(WMAKE_BIN)
$(call QUIET_MESSAGE, " compile: $<")
$(call QUIET_MESSAGE,compile,$<)
$E $(cc) $(cFLAGS) dirToString.c -o $(WMAKE_BIN)/dirToString
$(WMAKE_BIN)/wmkdep: wmkdep.l
@mkdir -p $(WMAKE_BIN)
$(call QUIET_MESSAGE, " lex: $<")
$(call QUIET_MESSAGE,lex,$<)
$E flex wmkdep.l; \
$(cc) $(cFLAGS) lex.yy.c -o $(WMAKE_BIN)/wmkdep
@rm -f lex.yy.c 2>/dev/null