zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wmake: Removed unnecessary '->>' line from output

Browse Source 
Changed 'ld' line to include path of target library or executable.
This commit is contained in:
Henry Weller
2016-11-13 22:14:53 +00:00
parent 3dab5f913a
commit a760ce5d08
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
wmake/makefiles/general
View File

@ -128,27 +128,25 @@ LIB_HEADER_DIRS = \
# Define link statements for executables # Define link statements for executables
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
.PHONY: silent
silent:
@:
$(EXE): $(OBJECTS) $(EXE): $(OBJECTS)
@$(WM_SCRIPTS)/makeTargetDir $(EXE) @$(WM_SCRIPTS)/makeTargetDir $(EXE)
$(call QUIET_MESSAGE,ld,$(notdir $(EXE))) $(call QUIET_MESSAGE,ld,$(EXE))
$E $(LINKEXE) $(OBJECTS) -L$(LIB_PLATFORMS) \ $E $(LINKEXE) $(OBJECTS) -L$(LIB_PLATFORMS) \
$(EXE_LIBS) $(PROJECT_LIBS) $(SYS_LIBS) \ $(EXE_LIBS) $(PROJECT_LIBS) $(SYS_LIBS) \
$(LINK_LIBS) $(GLIBS) -o $(EXE) $(LINK_LIBS) $(GLIBS) -o $(EXE)
@echo " ->> $(EXE)"
.PHONY: silent
silent:
@:
.PHONY: exe .PHONY: exe
exe: $(SEXE) | silent exe: $(SEXE) | silent
$(SEXE): $(OBJECTS) $(SEXE): $(OBJECTS)
@$(WM_SCRIPTS)/makeTargetDir $(SEXE) @$(WM_SCRIPTS)/makeTargetDir $(SEXE)
$(call QUIET_MESSAGE,ld,$(notdir $(SEXE))) $(call QUIET_MESSAGE,ld,$(SEXE))
$E $(LINKEXE) $(OBJECTS) $(EXE_LIBS) \ $E $(LINKEXE) $(OBJECTS) $(EXE_LIBS) \
$(SYS_LIBS) $(LINK_LIBS) $(GLIBS) -o $(SEXE) $(SYS_LIBS) $(LINK_LIBS) $(GLIBS) -o $(SEXE)
@echo " ->> $(SEXE)"
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
@ -163,10 +161,9 @@ libso: $(LIB).$(SO) | silent
$(LIB).$(SO): $(OBJECTS) $(LIB).$(SO): $(OBJECTS)
@$(WM_SCRIPTS)/makeTargetDir $(LIB) @$(WM_SCRIPTS)/makeTargetDir $(LIB)
$(call QUIET_MESSAGE,ld,$(notdir $(LIB)).$(SO)) $(call QUIET_MESSAGE,ld,$(LIB).$(SO))
$E $(LINKLIBSO) $(OBJECTS) -L$(LIB_PLATFORMS) \ $E $(LINKLIBSO) $(OBJECTS) -L$(LIB_PLATFORMS) \
$(LIB_LIBS) $(GLIB_LIBS) -o $(LIB).$(SO) $(LIB_LIBS) $(GLIB_LIBS) -o $(LIB).$(SO)
@echo " ->> $(LIB).$(SO)"
.PHONY: lib .PHONY: lib
lib: $(LIB).a | silent lib: $(LIB).a | silent
@ -174,11 +171,10 @@ lib: $(LIB).a | silent
$(LIB).a: $(OBJECTS) $(LIB).a: $(OBJECTS)
@$(WM_SCRIPTS)/makeTargetDir $(LIB) @$(WM_SCRIPTS)/makeTargetDir $(LIB)
@rm -f $(LIB).a @rm -f $(LIB).a
$(call QUIET_MESSAGE,ar,$(notdir $(LIB))) $(call QUIET_MESSAGE,ar,$(LIB))
$E $(AR) $(ARFLAGS) $(LIB).a $(OBJECTS) $E $(AR) $(ARFLAGS) $(LIB).a $(OBJECTS)
$(call QUIET_MESSAGE,ranlib,$(notdir $(LIB))) $(call QUIET_MESSAGE,ranlib,$(notdir $(LIB)))
$E $(RANLIB) $(LIB).a $E $(RANLIB) $(LIB).a
@echo " ->> $(LIB).a"
.PHONY: libo .PHONY: libo
libo: $(LIB).o | silent libo: $(LIB).o | silent
@ -186,9 +182,8 @@ libo: $(LIB).o | silent
$(LIB).o: $(OBJECTS) $(LIB).o: $(OBJECTS)
@$(WM_SCRIPTS)/makeTargetDir $(LIB) @$(WM_SCRIPTS)/makeTargetDir $(LIB)
@rm -f $(LIB).o @rm -f $(LIB).o
$(call QUIET_MESSAGE,ld,$(notdir $(LIB)).o) $(call QUIET_MESSAGE,ld,$(LIB).o)
$E $(LD) -r -o $(LIB).o $(OBJECTS) $E $(LD) -r -o $(LIB).o $(OBJECTS)
@echo " ->> $(LIB).o"
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------