From a1df3f062e27397b0968b89538fb3756786e46a3 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 27 Nov 2009 15:48:45 +0100 Subject: on wntmsci* platforms, do not echo to to-be-compiled C(++) file name twice, if not in verbose mode --- solenv/inc/rules.mk | 44 ++++++++++++++++++++++---------------------- solenv/inc/settings.mk | 2 ++ solenv/inc/wntmsci11.mk | 5 +++++ 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 71909c8d348b..2c00889cfc25 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -32,7 +32,7 @@ MKFILENAME:=RULES.MK $(OBJ)/%.obj : %.cxx - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx @@ -56,7 +56,7 @@ $(OBJ)/%.obj : %.cxx .ENDIF # "$(nodep)"=="" $(OBJ)/%.obj : %.cpp - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp @@ -78,7 +78,7 @@ $(OBJ)/%.obj : %.cpp .ENDIF # "$(nodep)"=="" $(OBJ)/%.obj : %.cc - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cc @@ -159,7 +159,7 @@ $(SLO)/precompiled_ex.% .PHONY: .ENDIF # "$(ENABLE_PCH)"!="" $(SLO)/%.obj : %.cxx - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(ENABLE_PCH)"!="" && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" ) # just a helper var @noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS))) @@ -198,7 +198,7 @@ $(SLO)/%.obj : %.cxx .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : %.cpp - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(PWD)/$*.cpp @@ -224,7 +224,7 @@ $(SLO)/%.obj : %.cpp .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : $(MISC)/%.cxx - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx @@ -249,7 +249,7 @@ $(SLO)/%.obj : $(MISC)/%.cxx .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : $(MISC)/%.cc - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cc @@ -266,7 +266,7 @@ $(SLO)/%.obj : $(MISC)/%.cc .ENDIF $(OBJ)/%.obj : $(MISC)/%.cxx - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx @@ -291,7 +291,7 @@ $(OBJ)/%.obj : $(MISC)/%.cxx .ENDIF # "$(nodep)"=="" $(OBJ)/%.obj : %.c - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c @@ -321,7 +321,7 @@ $(OBJ)/%.obj : %.c .ENDIF # "$(nodep)"=="" $(OBJ)/%.obj : $(MISC)/%.c - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.c @@ -343,7 +343,7 @@ $(OBJ)/%.obj : $(MISC)/%.c .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : $(MISC)/%.c - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.c @@ -366,7 +366,7 @@ $(SLO)/%.obj : $(MISC)/%.c .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : %.c - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.c @@ -389,7 +389,7 @@ $(SLO)/%.obj : %.c # Objective-C files $(OBJ)/%.obj : %.m - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(OS)"=="MACOSX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.m @@ -404,7 +404,7 @@ $(OBJ)/%.obj : %.m # Objective-C files $(OBJ)/%.obj : $(MISC)/%.m - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.m @@ -415,7 +415,7 @@ $(OBJ)/%.obj : $(MISC)/%.m # Objective-C files $(SLO)/%.obj : $(MISC)/%.m - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.m @@ -426,7 +426,7 @@ $(SLO)/%.obj : $(MISC)/%.m # Objective-C files $(SLO)/%.obj : %.m - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.m @@ -442,7 +442,7 @@ not_existing/o_%.dpcc : %.c;@noop $(assign all_local_obj+:=$<) # Objective-C++ files $(OBJ)/%.obj : %.mm - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(OS)"=="MACOSX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.mm @@ -461,7 +461,7 @@ $(OBJ)/%.obj : %.mm # Objective-C++ files $(OBJ)/%.obj : $(MISC)/%.mm - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.mm @@ -476,7 +476,7 @@ $(OBJ)/%.obj : $(MISC)/%.mm # Objective-C++ files $(SLO)/%.obj : $(MISC)/%.mm - @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.mm @@ -491,7 +491,7 @@ $(SLO)/%.obj : $(MISC)/%.mm # Objective-C++ files $(SLO)/%.obj : %.mm - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.mm @@ -639,7 +639,7 @@ $(MISC)/%.dpj : .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : %.asm - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(COM)"=="GCC" .IF "$(ASM)"=="ml" $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm @@ -666,7 +666,7 @@ $(SLO)/%.obj : %.asm .ENDIF $(OBJ)/%.obj : %.asm - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(COM)"=="GCC" .IF "$(ASM)"=="ml" $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(OBJ)/$*.obj $*.asm diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 49b9d2c8e755..ca0bcf0fef55 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -987,6 +987,8 @@ RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)/rsc ULFEX_VERBOSITY=-QQ .ENDIF .ENDIF # "$(VERBOSE)" == "TRUE" +COMPILE_ECHO_SWITCH= +COMPILE_ECHO_FILE=$(<:f) #new RSCUPDVER=$(RSCREVISION) diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk index 3d2750fd2dc6..1bb994f1ad6f 100644 --- a/solenv/inc/wntmsci11.mk +++ b/solenv/inc/wntmsci11.mk @@ -75,6 +75,11 @@ CXX+= /NMttNoLines NOLOGO*=-nologo .ENDIF +.IF "$(VERBOSE)" != "TRUE" +COMPILE_ECHO_SWITCH=-n +COMPILE_ECHO_FILE= +.ENDIF + # Flags for COMEX == 11 # disable "warning C4675: resolved overload was found by argument-dependent -- cgit From bdabdb4ac426f57388245aefc4ec856fd430c9a1 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Thu, 10 Dec 2009 09:11:35 +0100 Subject: merge --- solenv/inc/rules.mk | 62 +++++++++++------------------------------------------ 1 file changed, 13 insertions(+), 49 deletions(-) diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index eafb20306e96..7b8e6f2aaadd 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -32,7 +32,7 @@ MKFILENAME:=RULES.MK $(OBJ)/%.obj : %.cxx - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx @@ -56,7 +56,7 @@ $(OBJ)/%.obj : %.cxx .ENDIF # "$(nodep)"=="" $(OBJ)/%.obj : %.cpp - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp @@ -78,7 +78,7 @@ $(OBJ)/%.obj : %.cpp .ENDIF # "$(nodep)"=="" $(OBJ)/%.obj : %.cc - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cc @@ -159,7 +159,7 @@ $(SLO)/precompiled_ex.% .PHONY: .ENDIF # "$(ENABLE_PCH)"!="" $(SLO)/%.obj : %.cxx - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(ENABLE_PCH)"!="" && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" ) # just a helper var @noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS))) @@ -198,7 +198,7 @@ $(SLO)/%.obj : %.cxx .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : %.cpp - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(PWD)/$*.cpp @@ -224,11 +224,7 @@ $(SLO)/%.obj : %.cpp .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : $(MISC)/%.cxx -<<<<<<< local - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) -======= @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) ->>>>>>> other .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx @@ -253,11 +249,7 @@ $(SLO)/%.obj : $(MISC)/%.cxx .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : $(MISC)/%.cc -<<<<<<< local - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) -======= @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) ->>>>>>> other .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cc @@ -274,11 +266,7 @@ $(SLO)/%.obj : $(MISC)/%.cc .ENDIF $(OBJ)/%.obj : $(MISC)/%.cxx -<<<<<<< local - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) -======= @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) ->>>>>>> other .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx @@ -303,7 +291,7 @@ $(OBJ)/%.obj : $(MISC)/%.cxx .ENDIF # "$(nodep)"=="" $(OBJ)/%.obj : %.c - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c @@ -333,11 +321,7 @@ $(OBJ)/%.obj : %.c .ENDIF # "$(nodep)"=="" $(OBJ)/%.obj : $(MISC)/%.c -<<<<<<< local - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) -======= @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) ->>>>>>> other .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.c @@ -359,11 +343,7 @@ $(OBJ)/%.obj : $(MISC)/%.c .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : $(MISC)/%.c -<<<<<<< local - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) -======= @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) ->>>>>>> other .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.c @@ -386,7 +366,7 @@ $(SLO)/%.obj : $(MISC)/%.c .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : %.c - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.c @@ -409,7 +389,7 @@ $(SLO)/%.obj : %.c # Objective-C files $(OBJ)/%.obj : %.m - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(OS)"=="MACOSX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.m @@ -424,11 +404,7 @@ $(OBJ)/%.obj : %.m # Objective-C files $(OBJ)/%.obj : $(MISC)/%.m -<<<<<<< local - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) -======= @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) ->>>>>>> other .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.m @@ -439,11 +415,7 @@ $(OBJ)/%.obj : $(MISC)/%.m # Objective-C files $(SLO)/%.obj : $(MISC)/%.m -<<<<<<< local - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) -======= @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) ->>>>>>> other .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.m @@ -454,7 +426,7 @@ $(SLO)/%.obj : $(MISC)/%.m # Objective-C files $(SLO)/%.obj : %.m - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.m @@ -470,7 +442,7 @@ not_existing/o_%.dpcc : %.c;@noop $(assign all_local_obj+:=$<) # Objective-C++ files $(OBJ)/%.obj : %.mm - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(OS)"=="MACOSX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.mm @@ -489,11 +461,7 @@ $(OBJ)/%.obj : %.mm # Objective-C++ files $(OBJ)/%.obj : $(MISC)/%.mm -<<<<<<< local - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) -======= @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) ->>>>>>> other .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.mm @@ -508,11 +476,7 @@ $(OBJ)/%.obj : $(MISC)/%.mm # Objective-C++ files $(SLO)/%.obj : $(MISC)/%.mm -<<<<<<< local - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) -======= @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) ->>>>>>> other .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.mm @@ -527,7 +491,7 @@ $(SLO)/%.obj : $(MISC)/%.mm # Objective-C++ files $(SLO)/%.obj : %.mm - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.mm @@ -675,7 +639,7 @@ $(MISC)/%.dpj : .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : %.asm - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(COM)"=="GCC" .IF "$(ASM)"=="ml" $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm @@ -702,7 +666,7 @@ $(SLO)/%.obj : %.asm .ENDIF $(OBJ)/%.obj : %.asm - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< .IF "$(COM)"=="GCC" .IF "$(ASM)"=="ml" $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(OBJ)/$*.obj $*.asm -- cgit From 32f70a00d38905cac16be0c496ea6dd35c34c489 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Thu, 10 Dec 2009 09:16:30 +0100 Subject: merge --- solenv/inc/rules.mk | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 7b8e6f2aaadd..880136db253b 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -32,7 +32,7 @@ MKFILENAME:=RULES.MK $(OBJ)/%.obj : %.cxx - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx @@ -56,7 +56,7 @@ $(OBJ)/%.obj : %.cxx .ENDIF # "$(nodep)"=="" $(OBJ)/%.obj : %.cpp - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp @@ -78,7 +78,7 @@ $(OBJ)/%.obj : %.cpp .ENDIF # "$(nodep)"=="" $(OBJ)/%.obj : %.cc - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cc @@ -159,7 +159,7 @@ $(SLO)/precompiled_ex.% .PHONY: .ENDIF # "$(ENABLE_PCH)"!="" $(SLO)/%.obj : %.cxx - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(ENABLE_PCH)"!="" && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" ) # just a helper var @noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS))) @@ -198,7 +198,7 @@ $(SLO)/%.obj : %.cxx .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : %.cpp - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(PWD)/$*.cpp @@ -224,7 +224,7 @@ $(SLO)/%.obj : %.cpp .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : $(MISC)/%.cxx - @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx @@ -249,7 +249,7 @@ $(SLO)/%.obj : $(MISC)/%.cxx .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : $(MISC)/%.cc - @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cc @@ -266,7 +266,7 @@ $(SLO)/%.obj : $(MISC)/%.cc .ENDIF $(OBJ)/%.obj : $(MISC)/%.cxx - @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx @@ -291,7 +291,7 @@ $(OBJ)/%.obj : $(MISC)/%.cxx .ENDIF # "$(nodep)"=="" $(OBJ)/%.obj : %.c - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c @@ -321,7 +321,7 @@ $(OBJ)/%.obj : %.c .ENDIF # "$(nodep)"=="" $(OBJ)/%.obj : $(MISC)/%.c - @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.c @@ -343,7 +343,7 @@ $(OBJ)/%.obj : $(MISC)/%.c .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : $(MISC)/%.c - @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.c @@ -366,7 +366,7 @@ $(SLO)/%.obj : $(MISC)/%.c .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : %.c - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.c @@ -389,7 +389,7 @@ $(SLO)/%.obj : %.c # Objective-C files $(OBJ)/%.obj : %.m - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(OS)"=="MACOSX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.m @@ -404,7 +404,7 @@ $(OBJ)/%.obj : %.m # Objective-C files $(OBJ)/%.obj : $(MISC)/%.m - @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.m @@ -415,7 +415,7 @@ $(OBJ)/%.obj : $(MISC)/%.m # Objective-C files $(SLO)/%.obj : $(MISC)/%.m - @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.m @@ -426,7 +426,7 @@ $(SLO)/%.obj : $(MISC)/%.m # Objective-C files $(SLO)/%.obj : %.m - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.m @@ -442,7 +442,7 @@ not_existing/o_%.dpcc : %.c;@noop $(assign all_local_obj+:=$<) # Objective-C++ files $(OBJ)/%.obj : %.mm - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(OS)"=="MACOSX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.mm @@ -461,7 +461,7 @@ $(OBJ)/%.obj : %.mm # Objective-C++ files $(OBJ)/%.obj : $(MISC)/%.mm - @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.mm @@ -476,7 +476,7 @@ $(OBJ)/%.obj : $(MISC)/%.mm # Objective-C++ files $(SLO)/%.obj : $(MISC)/%.mm - @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.mm @@ -491,7 +491,7 @@ $(SLO)/%.obj : $(MISC)/%.mm # Objective-C++ files $(SLO)/%.obj : %.mm - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.mm @@ -639,7 +639,7 @@ $(MISC)/%.dpj : .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : %.asm - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(COM)"=="GCC" .IF "$(ASM)"=="ml" $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm @@ -666,7 +666,7 @@ $(SLO)/%.obj : %.asm .ENDIF $(OBJ)/%.obj : %.asm - @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE) .IF "$(COM)"=="GCC" .IF "$(ASM)"=="ml" $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(OBJ)/$*.obj $*.asm -- cgit