[Libreoffice-commits] .: 5 commits - solenv/inc
Tor Lillqvist
tml at kemper.freedesktop.org
Fri Jun 17 14:36:29 PDT 2011
solenv/inc/_tg_app.mk | 30 --
solenv/inc/_tg_def.mk | 700 ++++++++++++++++++++++++-------------------------
solenv/inc/_tg_shl.mk | 110 +------
solenv/inc/settings.mk | 9
solenv/inc/tg_app.mk | 3
solenv/inc/tg_def.mk | 70 ++--
solenv/inc/tg_shl.mk | 11
solenv/inc/wnt.mk | 6
8 files changed, 422 insertions(+), 517 deletions(-)
New commits:
commit baf8c2b75ab7cf24cb62df821d2a756ca082d137
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sat Jun 18 00:25:56 2011 +0300
Need to special-case AUGMENT_LIBRARY_PATH for cross-compilation to Windows, sigh
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 8c94eef..44b1ff7 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1011,10 +1011,19 @@ DLLPOSTFIX=lo
# an existing office/URE installation; the ": &&" enables this to work at the
# start of a recipe line that is not prefixed by "+" as well as in the middle of
# an existing && chain:
+.IF "$(CROSS_COMPILING)"=="YES" && "$(OS)"=="WNT"
+# Sigh, special-case cross-compiling to Windows. Here OOO_LIBRARY_PATH_VAR is the correct one
+# for the BUILD platform but SOLARSHAREDBIN is the one for Windows, i.e. "foo/bin".
+AUGMENT_LIBRARY_PATH = : && \
+ $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(SOLARLIBDIR_FOR_BUILD))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}}
+AUGMENT_LIBRARY_PATH_LOCAL = : && \
+ $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}}
+.ELSE
AUGMENT_LIBRARY_PATH = : && \
$(OOO_LIBRARY_PATH_VAR)=$(normpath, $(SOLARSHAREDBIN))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}}
AUGMENT_LIBRARY_PATH_LOCAL = : && \
$(OOO_LIBRARY_PATH_VAR)=$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}}
+.ENDIF
.END
# for multiprocess building in external modules
commit c29cc6d973a26824fa28024fc7d34e2aaf1d4b82
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sat Jun 18 00:25:21 2011 +0300
Set OOO_LIBRARY_PATH_VAR as for the BUILD platform when cross-compiling
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk
index 8b65c5f..dd3e0c8 100644
--- a/solenv/inc/wnt.mk
+++ b/solenv/inc/wnt.mk
@@ -66,4 +66,10 @@ JAVA_RUNTIME=javai_g.lib
.ENDIF
.ENDIF
+.IF "$(CROSS_COMPILING)"!="YES"
OOO_LIBRARY_PATH_VAR = PATH
+.ELIF "$(OS_FOR_BUILD)"=="MACOSX"
+OOO_LIBRARY_PATH_VAR = DYLD_LIBRARY_PATH
+.ELSE
+OOO_LIBRARY_PATH_VAR = LD_LIBRARY_PATH
+.ENDIF
commit e6f25568cc216a76c8fe9c6889cf5b7e2b5d1b73
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sat Jun 18 00:01:32 2011 +0300
Use COMMAND_ECHO
diff --git a/solenv/inc/_tg_def.mk b/solenv/inc/_tg_def.mk
index ea9d53e..8099a64 100644
--- a/solenv/inc/_tg_def.mk
+++ b/solenv/inc/_tg_def.mk
@@ -56,95 +56,95 @@ $(DEF1TARGETN) : \
.ELSE # "$(link_always)"==""
$(DEF1TARGETN) .PHONY :
.ENDIF # "$(link_always)"==""
- @-$(RM) $@.tmpfile
+ $(COMMAND_ECHO)-$(RM) $@.tmpfile
@echo "Making: module definition file" $(@:f)
- @echo LIBRARY $(EMQ)"$(SHL1TARGETN:f)$(EMQ)" >$@.tmpfile
+ $(COMMAND_ECHO)echo LIBRARY $(EMQ)"$(SHL1TARGETN:f)$(EMQ)" >$@.tmpfile
.IF "$(COM)"!="GCC"
- @echo HEAPSIZE 0 >>$@.tmpfile
+ $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
- @echo EXPORTS >>$@.tmpfile
+ $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
- @echo GetVersionInfo >>$@.tmpfile
+ $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB1NAME)"!=""
.IF "$(COM)"=="GCC"
- @-$(RM) $(MISC)/$(SHL1TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL1TARGET).exp
$(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL1TARGET).exp --export-all-symbols \
`$(TYPE) $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
$(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL1TARGET).exp | sed '/^;/d' >>$@.tmpfile
- @-$(RM) $(MISC)/$(SHL1TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL1TARGET).exp
.ELSE
.IF "$(SHL1USE_EXPORTS)"==""
- @-$(RMHACK1) $(MISC)/$(SHL1TARGET).exp
- @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL1TARGET).exp $(SLB)/$(DEFLIB1NAME).lib
- @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL1TARGET).flt $(MISC)/$(SHL1TARGET).exp >>$@.tmpfile
+ $(COMMAND_ECHO)-$(RMHACK1) $(MISC)/$(SHL1TARGET).exp
+ $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL1TARGET).exp $(SLB)/$(DEFLIB1NAME).lib
+ $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL1TARGET).flt $(MISC)/$(SHL1TARGET).exp >>$@.tmpfile
$(COMMAND_ECHO)$(RMHACK1) $(MISC)/$(SHL1TARGET).exp
.ELSE # "$(SHL1USE_EXPORTS)"==""
- @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL1TARGET).direct
- @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF1FILTER) $(MISC)/$(SHL1TARGET).direct >>$@.tmpfile
+ $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL1TARGET).direct
+ $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF1FILTER) $(MISC)/$(SHL1TARGET).direct >>$@.tmpfile
.ENDIF # "$(SHL1USE_EXPORTS)"==""
.ENDIF
.ENDIF # "$(DEFLIB1NAME)"!=""
.IF "$(DEF1EXPORT1)"!=""
- @echo $(DEF1EXPORT1) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF1EXPORT1) >>$@.tmpfile
.ENDIF
.IF "$(DEF1EXPORT2)"!=""
- @echo $(DEF1EXPORT2) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF1EXPORT2) >>$@.tmpfile
.ENDIF
.IF "$(DEF1EXPORT3)"!=""
- @echo $(DEF1EXPORT3) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF1EXPORT3) >>$@.tmpfile
.ENDIF
.IF "$(DEF1EXPORT4)"!=""
- @echo $(DEF1EXPORT4) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF1EXPORT4) >>$@.tmpfile
.ENDIF
.IF "$(DEF1EXPORT5)"!=""
- @echo $(DEF1EXPORT5) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF1EXPORT5) >>$@.tmpfile
.ENDIF
.IF "$(DEF1EXPORT6)"!=""
- @echo $(DEF1EXPORT6) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF1EXPORT6) >>$@.tmpfile
.ENDIF
.IF "$(DEF1EXPORT7)"!=""
- @echo $(DEF1EXPORT7) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF1EXPORT7) >>$@.tmpfile
.ENDIF
.IF "$(DEF1EXPORT8)"!=""
- @echo $(DEF1EXPORT8) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF1EXPORT8) >>$@.tmpfile
.ENDIF
.IF "$(DEF1EXPORT9)"!=""
- @echo $(DEF1EXPORT9) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF1EXPORT9) >>$@.tmpfile
.ENDIF
.IF "$(DEF1EXPORT10)"!=""
- @echo $(DEF1EXPORT10) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF1EXPORT10) >>$@.tmpfile
.ENDIF
.IF "$(DEF1EXPORT11)"!=""
- @echo $(DEF1EXPORT11) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF1EXPORT11) >>$@.tmpfile
.ENDIF
.IF "$(DEF1EXPORT12)"!=""
- @echo $(DEF1EXPORT12) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF1EXPORT12) >>$@.tmpfile
.ENDIF
.IF "$(DEF1EXPORT13)"!=""
- @echo $(DEF1EXPORT13) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF1EXPORT13) >>$@.tmpfile
.ENDIF
.IF "$(DEF1EXPORT14)"!=""
- @echo $(DEF1EXPORT14) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF1EXPORT14) >>$@.tmpfile
.ENDIF
.IF "$(DEF1EXPORT15)"!=""
- @echo $(DEF1EXPORT15) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF1EXPORT15) >>$@.tmpfile
.ENDIF
.IF "$(DEF1EXPORT16)"!=""
- @echo $(DEF1EXPORT16) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF1EXPORT16) >>$@.tmpfile
.ENDIF
.IF "$(DEF1EXPORT17)"!=""
- @echo $(DEF1EXPORT17) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF1EXPORT17) >>$@.tmpfile
.ENDIF
.IF "$(DEF1EXPORT18)"!=""
- @echo $(DEF1EXPORT18) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF1EXPORT18) >>$@.tmpfile
.ENDIF
.IF "$(DEF1EXPORT19)"!=""
- @echo $(DEF1EXPORT19) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF1EXPORT19) >>$@.tmpfile
.ENDIF
.IF "$(DEF1EXPORT20)"!=""
- @echo $(DEF1EXPORT20) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF1EXPORT20) >>$@.tmpfile
.ENDIF
.IF "$(DEF1EXPORTFILE)"!=""
.IF "$(COM)"=="GCC"
@@ -153,15 +153,15 @@ $(DEF1TARGETN) .PHONY :
$(COMMAND_ECHO)$(TYPE) $(DEF1EXPORTFILE) >> $@.tmpfile
.ENDIF
.ENDIF
- @-$(RM) $@
- @$(RENAME) $@.tmpfile $@
+ $(COMMAND_ECHO)-$(RM) $@
+ $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
.ENDIF # "$(GUI)"=="WNT"
.IF "$(GUI)"=="UNX"
$(DEF1TARGETN): \
$(DEF1DEPN) \
$(DEF1EXPORTFILE)
- @echo just a dummy for UNIX > $@
+ $(COMMAND_ECHO)echo just a dummy for UNIX > $@
.ENDIF
.ENDIF # "$(DEF1TARGETN)"!=""
@@ -225,95 +225,95 @@ $(DEF2TARGETN) : \
.ELSE # "$(link_always)"==""
$(DEF2TARGETN) .PHONY :
.ENDIF # "$(link_always)"==""
- @-$(RM) $@.tmpfile
+ $(COMMAND_ECHO)-$(RM) $@.tmpfile
@echo "Making: module definition file" $(@:f)
- @echo LIBRARY $(EMQ)"$(SHL2TARGETN:f)$(EMQ)" >$@.tmpfile
+ $(COMMAND_ECHO)echo LIBRARY $(EMQ)"$(SHL2TARGETN:f)$(EMQ)" >$@.tmpfile
.IF "$(COM)"!="GCC"
- @echo HEAPSIZE 0 >>$@.tmpfile
+ $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
- @echo EXPORTS >>$@.tmpfile
+ $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
- @echo GetVersionInfo >>$@.tmpfile
+ $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB2NAME)"!=""
.IF "$(COM)"=="GCC"
- @-$(RM) $(MISC)/$(SHL2TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL2TARGET).exp
$(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL2TARGET).exp --export-all-symbols \
`$(TYPE) $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
$(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL2TARGET).exp | sed '/^;/d' >>$@.tmpfile
- @-$(RM) $(MISC)/$(SHL2TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL2TARGET).exp
.ELSE
.IF "$(SHL2USE_EXPORTS)"==""
- @-$(RMHACK2) $(MISC)/$(SHL2TARGET).exp
- @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL2TARGET).exp $(SLB)/$(DEFLIB2NAME).lib
- @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL2TARGET).flt $(MISC)/$(SHL2TARGET).exp >>$@.tmpfile
+ $(COMMAND_ECHO)-$(RMHACK2) $(MISC)/$(SHL2TARGET).exp
+ $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL2TARGET).exp $(SLB)/$(DEFLIB2NAME).lib
+ $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL2TARGET).flt $(MISC)/$(SHL2TARGET).exp >>$@.tmpfile
$(COMMAND_ECHO)$(RMHACK2) $(MISC)/$(SHL2TARGET).exp
.ELSE # "$(SHL2USE_EXPORTS)"==""
- @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL2TARGET).direct
- @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF2FILTER) $(MISC)/$(SHL2TARGET).direct >>$@.tmpfile
+ $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL2TARGET).direct
+ $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF2FILTER) $(MISC)/$(SHL2TARGET).direct >>$@.tmpfile
.ENDIF # "$(SHL2USE_EXPORTS)"==""
.ENDIF
.ENDIF # "$(DEFLIB2NAME)"!=""
.IF "$(DEF2EXPORT1)"!=""
- @echo $(DEF2EXPORT1) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF2EXPORT1) >>$@.tmpfile
.ENDIF
.IF "$(DEF2EXPORT2)"!=""
- @echo $(DEF2EXPORT2) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF2EXPORT2) >>$@.tmpfile
.ENDIF
.IF "$(DEF2EXPORT3)"!=""
- @echo $(DEF2EXPORT3) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF2EXPORT3) >>$@.tmpfile
.ENDIF
.IF "$(DEF2EXPORT4)"!=""
- @echo $(DEF2EXPORT4) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF2EXPORT4) >>$@.tmpfile
.ENDIF
.IF "$(DEF2EXPORT5)"!=""
- @echo $(DEF2EXPORT5) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF2EXPORT5) >>$@.tmpfile
.ENDIF
.IF "$(DEF2EXPORT6)"!=""
- @echo $(DEF2EXPORT6) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF2EXPORT6) >>$@.tmpfile
.ENDIF
.IF "$(DEF2EXPORT7)"!=""
- @echo $(DEF2EXPORT7) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF2EXPORT7) >>$@.tmpfile
.ENDIF
.IF "$(DEF2EXPORT8)"!=""
- @echo $(DEF2EXPORT8) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF2EXPORT8) >>$@.tmpfile
.ENDIF
.IF "$(DEF2EXPORT9)"!=""
- @echo $(DEF2EXPORT9) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF2EXPORT9) >>$@.tmpfile
.ENDIF
.IF "$(DEF2EXPORT10)"!=""
- @echo $(DEF2EXPORT10) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF2EXPORT10) >>$@.tmpfile
.ENDIF
.IF "$(DEF2EXPORT11)"!=""
- @echo $(DEF2EXPORT11) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF2EXPORT11) >>$@.tmpfile
.ENDIF
.IF "$(DEF2EXPORT12)"!=""
- @echo $(DEF2EXPORT12) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF2EXPORT12) >>$@.tmpfile
.ENDIF
.IF "$(DEF2EXPORT13)"!=""
- @echo $(DEF2EXPORT13) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF2EXPORT13) >>$@.tmpfile
.ENDIF
.IF "$(DEF2EXPORT14)"!=""
- @echo $(DEF2EXPORT14) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF2EXPORT14) >>$@.tmpfile
.ENDIF
.IF "$(DEF2EXPORT15)"!=""
- @echo $(DEF2EXPORT15) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF2EXPORT15) >>$@.tmpfile
.ENDIF
.IF "$(DEF2EXPORT16)"!=""
- @echo $(DEF2EXPORT16) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF2EXPORT16) >>$@.tmpfile
.ENDIF
.IF "$(DEF2EXPORT17)"!=""
- @echo $(DEF2EXPORT17) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF2EXPORT17) >>$@.tmpfile
.ENDIF
.IF "$(DEF2EXPORT18)"!=""
- @echo $(DEF2EXPORT18) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF2EXPORT18) >>$@.tmpfile
.ENDIF
.IF "$(DEF2EXPORT19)"!=""
- @echo $(DEF2EXPORT19) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF2EXPORT19) >>$@.tmpfile
.ENDIF
.IF "$(DEF2EXPORT20)"!=""
- @echo $(DEF2EXPORT20) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF2EXPORT20) >>$@.tmpfile
.ENDIF
.IF "$(DEF2EXPORTFILE)"!=""
.IF "$(COM)"=="GCC"
@@ -322,15 +322,15 @@ $(DEF2TARGETN) .PHONY :
$(COMMAND_ECHO)$(TYPE) $(DEF2EXPORTFILE) >> $@.tmpfile
.ENDIF
.ENDIF
- @-$(RM) $@
- @$(RENAME) $@.tmpfile $@
+ $(COMMAND_ECHO)-$(RM) $@
+ $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
.ENDIF # "$(GUI)"=="WNT"
.IF "$(GUI)"=="UNX"
$(DEF2TARGETN): \
$(DEF2DEPN) \
$(DEF2EXPORTFILE)
- @echo just a dummy for UNIX > $@
+ $(COMMAND_ECHO)echo just a dummy for UNIX > $@
.ENDIF
.ENDIF # "$(DEF2TARGETN)"!=""
@@ -394,95 +394,95 @@ $(DEF3TARGETN) : \
.ELSE # "$(link_always)"==""
$(DEF3TARGETN) .PHONY :
.ENDIF # "$(link_always)"==""
- @-$(RM) $@.tmpfile
+ $(COMMAND_ECHO)-$(RM) $@.tmpfile
@echo "Making: module definition file" $(@:f)
- @echo LIBRARY $(EMQ)"$(SHL3TARGETN:f)$(EMQ)" >$@.tmpfile
+ $(COMMAND_ECHO)echo LIBRARY $(EMQ)"$(SHL3TARGETN:f)$(EMQ)" >$@.tmpfile
.IF "$(COM)"!="GCC"
- @echo HEAPSIZE 0 >>$@.tmpfile
+ $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
- @echo EXPORTS >>$@.tmpfile
+ $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
- @echo GetVersionInfo >>$@.tmpfile
+ $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB3NAME)"!=""
.IF "$(COM)"=="GCC"
- @-$(RM) $(MISC)/$(SHL3TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL3TARGET).exp
$(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL3TARGET).exp --export-all-symbols \
`$(TYPE) $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
$(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL3TARGET).exp | sed '/^;/d' >>$@.tmpfile
- @-$(RM) $(MISC)/$(SHL3TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL3TARGET).exp
.ELSE
.IF "$(SHL3USE_EXPORTS)"==""
- @-$(RMHACK3) $(MISC)/$(SHL3TARGET).exp
- @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL3TARGET).exp $(SLB)/$(DEFLIB3NAME).lib
- @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL3TARGET).flt $(MISC)/$(SHL3TARGET).exp >>$@.tmpfile
+ $(COMMAND_ECHO)-$(RMHACK3) $(MISC)/$(SHL3TARGET).exp
+ $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL3TARGET).exp $(SLB)/$(DEFLIB3NAME).lib
+ $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL3TARGET).flt $(MISC)/$(SHL3TARGET).exp >>$@.tmpfile
$(COMMAND_ECHO)$(RMHACK3) $(MISC)/$(SHL3TARGET).exp
.ELSE # "$(SHL3USE_EXPORTS)"==""
- @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL3TARGET).direct
- @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF3FILTER) $(MISC)/$(SHL3TARGET).direct >>$@.tmpfile
+ $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL3TARGET).direct
+ $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF3FILTER) $(MISC)/$(SHL3TARGET).direct >>$@.tmpfile
.ENDIF # "$(SHL3USE_EXPORTS)"==""
.ENDIF
.ENDIF # "$(DEFLIB3NAME)"!=""
.IF "$(DEF3EXPORT1)"!=""
- @echo $(DEF3EXPORT1) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF3EXPORT1) >>$@.tmpfile
.ENDIF
.IF "$(DEF3EXPORT2)"!=""
- @echo $(DEF3EXPORT2) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF3EXPORT2) >>$@.tmpfile
.ENDIF
.IF "$(DEF3EXPORT3)"!=""
- @echo $(DEF3EXPORT3) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF3EXPORT3) >>$@.tmpfile
.ENDIF
.IF "$(DEF3EXPORT4)"!=""
- @echo $(DEF3EXPORT4) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF3EXPORT4) >>$@.tmpfile
.ENDIF
.IF "$(DEF3EXPORT5)"!=""
- @echo $(DEF3EXPORT5) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF3EXPORT5) >>$@.tmpfile
.ENDIF
.IF "$(DEF3EXPORT6)"!=""
- @echo $(DEF3EXPORT6) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF3EXPORT6) >>$@.tmpfile
.ENDIF
.IF "$(DEF3EXPORT7)"!=""
- @echo $(DEF3EXPORT7) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF3EXPORT7) >>$@.tmpfile
.ENDIF
.IF "$(DEF3EXPORT8)"!=""
- @echo $(DEF3EXPORT8) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF3EXPORT8) >>$@.tmpfile
.ENDIF
.IF "$(DEF3EXPORT9)"!=""
- @echo $(DEF3EXPORT9) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF3EXPORT9) >>$@.tmpfile
.ENDIF
.IF "$(DEF3EXPORT10)"!=""
- @echo $(DEF3EXPORT10) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF3EXPORT10) >>$@.tmpfile
.ENDIF
.IF "$(DEF3EXPORT11)"!=""
- @echo $(DEF3EXPORT11) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF3EXPORT11) >>$@.tmpfile
.ENDIF
.IF "$(DEF3EXPORT12)"!=""
- @echo $(DEF3EXPORT12) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF3EXPORT12) >>$@.tmpfile
.ENDIF
.IF "$(DEF3EXPORT13)"!=""
- @echo $(DEF3EXPORT13) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF3EXPORT13) >>$@.tmpfile
.ENDIF
.IF "$(DEF3EXPORT14)"!=""
- @echo $(DEF3EXPORT14) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF3EXPORT14) >>$@.tmpfile
.ENDIF
.IF "$(DEF3EXPORT15)"!=""
- @echo $(DEF3EXPORT15) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF3EXPORT15) >>$@.tmpfile
.ENDIF
.IF "$(DEF3EXPORT16)"!=""
- @echo $(DEF3EXPORT16) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF3EXPORT16) >>$@.tmpfile
.ENDIF
.IF "$(DEF3EXPORT17)"!=""
- @echo $(DEF3EXPORT17) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF3EXPORT17) >>$@.tmpfile
.ENDIF
.IF "$(DEF3EXPORT18)"!=""
- @echo $(DEF3EXPORT18) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF3EXPORT18) >>$@.tmpfile
.ENDIF
.IF "$(DEF3EXPORT19)"!=""
- @echo $(DEF3EXPORT19) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF3EXPORT19) >>$@.tmpfile
.ENDIF
.IF "$(DEF3EXPORT20)"!=""
- @echo $(DEF3EXPORT20) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF3EXPORT20) >>$@.tmpfile
.ENDIF
.IF "$(DEF3EXPORTFILE)"!=""
.IF "$(COM)"=="GCC"
@@ -491,15 +491,15 @@ $(DEF3TARGETN) .PHONY :
$(COMMAND_ECHO)$(TYPE) $(DEF3EXPORTFILE) >> $@.tmpfile
.ENDIF
.ENDIF
- @-$(RM) $@
- @$(RENAME) $@.tmpfile $@
+ $(COMMAND_ECHO)-$(RM) $@
+ $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
.ENDIF # "$(GUI)"=="WNT"
.IF "$(GUI)"=="UNX"
$(DEF3TARGETN): \
$(DEF3DEPN) \
$(DEF3EXPORTFILE)
- @echo just a dummy for UNIX > $@
+ $(COMMAND_ECHO)echo just a dummy for UNIX > $@
.ENDIF
.ENDIF # "$(DEF3TARGETN)"!=""
@@ -563,95 +563,95 @@ $(DEF4TARGETN) : \
.ELSE # "$(link_always)"==""
$(DEF4TARGETN) .PHONY :
.ENDIF # "$(link_always)"==""
- @-$(RM) $@.tmpfile
+ $(COMMAND_ECHO)-$(RM) $@.tmpfile
@echo "Making: module definition file" $(@:f)
- @echo LIBRARY $(EMQ)"$(SHL4TARGETN:f)$(EMQ)" >$@.tmpfile
+ $(COMMAND_ECHO)echo LIBRARY $(EMQ)"$(SHL4TARGETN:f)$(EMQ)" >$@.tmpfile
.IF "$(COM)"!="GCC"
- @echo HEAPSIZE 0 >>$@.tmpfile
+ $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
- @echo EXPORTS >>$@.tmpfile
+ $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
- @echo GetVersionInfo >>$@.tmpfile
+ $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB4NAME)"!=""
.IF "$(COM)"=="GCC"
- @-$(RM) $(MISC)/$(SHL4TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL4TARGET).exp
$(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL4TARGET).exp --export-all-symbols \
`$(TYPE) $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
$(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL4TARGET).exp | sed '/^;/d' >>$@.tmpfile
- @-$(RM) $(MISC)/$(SHL4TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL4TARGET).exp
.ELSE
.IF "$(SHL4USE_EXPORTS)"==""
- @-$(RMHACK4) $(MISC)/$(SHL4TARGET).exp
- @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL4TARGET).exp $(SLB)/$(DEFLIB4NAME).lib
- @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL4TARGET).flt $(MISC)/$(SHL4TARGET).exp >>$@.tmpfile
+ $(COMMAND_ECHO)-$(RMHACK4) $(MISC)/$(SHL4TARGET).exp
+ $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL4TARGET).exp $(SLB)/$(DEFLIB4NAME).lib
+ $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL4TARGET).flt $(MISC)/$(SHL4TARGET).exp >>$@.tmpfile
$(COMMAND_ECHO)$(RMHACK4) $(MISC)/$(SHL4TARGET).exp
.ELSE # "$(SHL4USE_EXPORTS)"==""
- @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL4TARGET).direct
- @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF4FILTER) $(MISC)/$(SHL4TARGET).direct >>$@.tmpfile
+ $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL4TARGET).direct
+ $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF4FILTER) $(MISC)/$(SHL4TARGET).direct >>$@.tmpfile
.ENDIF # "$(SHL4USE_EXPORTS)"==""
.ENDIF
.ENDIF # "$(DEFLIB4NAME)"!=""
.IF "$(DEF4EXPORT1)"!=""
- @echo $(DEF4EXPORT1) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF4EXPORT1) >>$@.tmpfile
.ENDIF
.IF "$(DEF4EXPORT2)"!=""
- @echo $(DEF4EXPORT2) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF4EXPORT2) >>$@.tmpfile
.ENDIF
.IF "$(DEF4EXPORT3)"!=""
- @echo $(DEF4EXPORT3) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF4EXPORT3) >>$@.tmpfile
.ENDIF
.IF "$(DEF4EXPORT4)"!=""
- @echo $(DEF4EXPORT4) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF4EXPORT4) >>$@.tmpfile
.ENDIF
.IF "$(DEF4EXPORT5)"!=""
- @echo $(DEF4EXPORT5) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF4EXPORT5) >>$@.tmpfile
.ENDIF
.IF "$(DEF4EXPORT6)"!=""
- @echo $(DEF4EXPORT6) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF4EXPORT6) >>$@.tmpfile
.ENDIF
.IF "$(DEF4EXPORT7)"!=""
- @echo $(DEF4EXPORT7) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF4EXPORT7) >>$@.tmpfile
.ENDIF
.IF "$(DEF4EXPORT8)"!=""
- @echo $(DEF4EXPORT8) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF4EXPORT8) >>$@.tmpfile
.ENDIF
.IF "$(DEF4EXPORT9)"!=""
- @echo $(DEF4EXPORT9) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF4EXPORT9) >>$@.tmpfile
.ENDIF
.IF "$(DEF4EXPORT10)"!=""
- @echo $(DEF4EXPORT10) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF4EXPORT10) >>$@.tmpfile
.ENDIF
.IF "$(DEF4EXPORT11)"!=""
- @echo $(DEF4EXPORT11) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF4EXPORT11) >>$@.tmpfile
.ENDIF
.IF "$(DEF4EXPORT12)"!=""
- @echo $(DEF4EXPORT12) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF4EXPORT12) >>$@.tmpfile
.ENDIF
.IF "$(DEF4EXPORT13)"!=""
- @echo $(DEF4EXPORT13) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF4EXPORT13) >>$@.tmpfile
.ENDIF
.IF "$(DEF4EXPORT14)"!=""
- @echo $(DEF4EXPORT14) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF4EXPORT14) >>$@.tmpfile
.ENDIF
.IF "$(DEF4EXPORT15)"!=""
- @echo $(DEF4EXPORT15) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF4EXPORT15) >>$@.tmpfile
.ENDIF
.IF "$(DEF4EXPORT16)"!=""
- @echo $(DEF4EXPORT16) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF4EXPORT16) >>$@.tmpfile
.ENDIF
.IF "$(DEF4EXPORT17)"!=""
- @echo $(DEF4EXPORT17) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF4EXPORT17) >>$@.tmpfile
.ENDIF
.IF "$(DEF4EXPORT18)"!=""
- @echo $(DEF4EXPORT18) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF4EXPORT18) >>$@.tmpfile
.ENDIF
.IF "$(DEF4EXPORT19)"!=""
- @echo $(DEF4EXPORT19) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF4EXPORT19) >>$@.tmpfile
.ENDIF
.IF "$(DEF4EXPORT20)"!=""
- @echo $(DEF4EXPORT20) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF4EXPORT20) >>$@.tmpfile
.ENDIF
.IF "$(DEF4EXPORTFILE)"!=""
.IF "$(COM)"=="GCC"
@@ -660,15 +660,15 @@ $(DEF4TARGETN) .PHONY :
$(COMMAND_ECHO)$(TYPE) $(DEF4EXPORTFILE) >> $@.tmpfile
.ENDIF
.ENDIF
- @-$(RM) $@
- @$(RENAME) $@.tmpfile $@
+ $(COMMAND_ECHO)-$(RM) $@
+ $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
.ENDIF # "$(GUI)"=="WNT"
.IF "$(GUI)"=="UNX"
$(DEF4TARGETN): \
$(DEF4DEPN) \
$(DEF4EXPORTFILE)
- @echo just a dummy for UNIX > $@
+ $(COMMAND_ECHO)echo just a dummy for UNIX > $@
.ENDIF
.ENDIF # "$(DEF4TARGETN)"!=""
@@ -732,95 +732,95 @@ $(DEF5TARGETN) : \
.ELSE # "$(link_always)"==""
$(DEF5TARGETN) .PHONY :
.ENDIF # "$(link_always)"==""
- @-$(RM) $@.tmpfile
+ $(COMMAND_ECHO)-$(RM) $@.tmpfile
@echo "Making: module definition file" $(@:f)
- @echo LIBRARY $(EMQ)"$(SHL5TARGETN:f)$(EMQ)" >$@.tmpfile
+ $(COMMAND_ECHO)echo LIBRARY $(EMQ)"$(SHL5TARGETN:f)$(EMQ)" >$@.tmpfile
.IF "$(COM)"!="GCC"
- @echo HEAPSIZE 0 >>$@.tmpfile
+ $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
- @echo EXPORTS >>$@.tmpfile
+ $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
- @echo GetVersionInfo >>$@.tmpfile
+ $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB5NAME)"!=""
.IF "$(COM)"=="GCC"
- @-$(RM) $(MISC)/$(SHL5TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL5TARGET).exp
$(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL5TARGET).exp --export-all-symbols \
`$(TYPE) $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
$(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL5TARGET).exp | sed '/^;/d' >>$@.tmpfile
- @-$(RM) $(MISC)/$(SHL5TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL5TARGET).exp
.ELSE
.IF "$(SHL5USE_EXPORTS)"==""
- @-$(RMHACK5) $(MISC)/$(SHL5TARGET).exp
- @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL5TARGET).exp $(SLB)/$(DEFLIB5NAME).lib
- @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL5TARGET).flt $(MISC)/$(SHL5TARGET).exp >>$@.tmpfile
+ $(COMMAND_ECHO)-$(RMHACK5) $(MISC)/$(SHL5TARGET).exp
+ $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL5TARGET).exp $(SLB)/$(DEFLIB5NAME).lib
+ $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL5TARGET).flt $(MISC)/$(SHL5TARGET).exp >>$@.tmpfile
$(COMMAND_ECHO)$(RMHACK5) $(MISC)/$(SHL5TARGET).exp
.ELSE # "$(SHL5USE_EXPORTS)"==""
- @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL5TARGET).direct
- @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF5FILTER) $(MISC)/$(SHL5TARGET).direct >>$@.tmpfile
+ $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL5TARGET).direct
+ $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF5FILTER) $(MISC)/$(SHL5TARGET).direct >>$@.tmpfile
.ENDIF # "$(SHL5USE_EXPORTS)"==""
.ENDIF
.ENDIF # "$(DEFLIB5NAME)"!=""
.IF "$(DEF5EXPORT1)"!=""
- @echo $(DEF5EXPORT1) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF5EXPORT1) >>$@.tmpfile
.ENDIF
.IF "$(DEF5EXPORT2)"!=""
- @echo $(DEF5EXPORT2) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF5EXPORT2) >>$@.tmpfile
.ENDIF
.IF "$(DEF5EXPORT3)"!=""
- @echo $(DEF5EXPORT3) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF5EXPORT3) >>$@.tmpfile
.ENDIF
.IF "$(DEF5EXPORT4)"!=""
- @echo $(DEF5EXPORT4) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF5EXPORT4) >>$@.tmpfile
.ENDIF
.IF "$(DEF5EXPORT5)"!=""
- @echo $(DEF5EXPORT5) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF5EXPORT5) >>$@.tmpfile
.ENDIF
.IF "$(DEF5EXPORT6)"!=""
- @echo $(DEF5EXPORT6) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF5EXPORT6) >>$@.tmpfile
.ENDIF
.IF "$(DEF5EXPORT7)"!=""
- @echo $(DEF5EXPORT7) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF5EXPORT7) >>$@.tmpfile
.ENDIF
.IF "$(DEF5EXPORT8)"!=""
- @echo $(DEF5EXPORT8) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF5EXPORT8) >>$@.tmpfile
.ENDIF
.IF "$(DEF5EXPORT9)"!=""
- @echo $(DEF5EXPORT9) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF5EXPORT9) >>$@.tmpfile
.ENDIF
.IF "$(DEF5EXPORT10)"!=""
- @echo $(DEF5EXPORT10) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF5EXPORT10) >>$@.tmpfile
.ENDIF
.IF "$(DEF5EXPORT11)"!=""
- @echo $(DEF5EXPORT11) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF5EXPORT11) >>$@.tmpfile
.ENDIF
.IF "$(DEF5EXPORT12)"!=""
- @echo $(DEF5EXPORT12) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF5EXPORT12) >>$@.tmpfile
.ENDIF
.IF "$(DEF5EXPORT13)"!=""
- @echo $(DEF5EXPORT13) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF5EXPORT13) >>$@.tmpfile
.ENDIF
.IF "$(DEF5EXPORT14)"!=""
- @echo $(DEF5EXPORT14) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF5EXPORT14) >>$@.tmpfile
.ENDIF
.IF "$(DEF5EXPORT15)"!=""
- @echo $(DEF5EXPORT15) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF5EXPORT15) >>$@.tmpfile
.ENDIF
.IF "$(DEF5EXPORT16)"!=""
- @echo $(DEF5EXPORT16) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF5EXPORT16) >>$@.tmpfile
.ENDIF
.IF "$(DEF5EXPORT17)"!=""
- @echo $(DEF5EXPORT17) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF5EXPORT17) >>$@.tmpfile
.ENDIF
.IF "$(DEF5EXPORT18)"!=""
- @echo $(DEF5EXPORT18) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF5EXPORT18) >>$@.tmpfile
.ENDIF
.IF "$(DEF5EXPORT19)"!=""
- @echo $(DEF5EXPORT19) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF5EXPORT19) >>$@.tmpfile
.ENDIF
.IF "$(DEF5EXPORT20)"!=""
- @echo $(DEF5EXPORT20) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF5EXPORT20) >>$@.tmpfile
.ENDIF
.IF "$(DEF5EXPORTFILE)"!=""
.IF "$(COM)"=="GCC"
@@ -829,15 +829,15 @@ $(DEF5TARGETN) .PHONY :
$(COMMAND_ECHO)$(TYPE) $(DEF5EXPORTFILE) >> $@.tmpfile
.ENDIF
.ENDIF
- @-$(RM) $@
- @$(RENAME) $@.tmpfile $@
+ $(COMMAND_ECHO)-$(RM) $@
+ $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
.ENDIF # "$(GUI)"=="WNT"
.IF "$(GUI)"=="UNX"
$(DEF5TARGETN): \
$(DEF5DEPN) \
$(DEF5EXPORTFILE)
- @echo just a dummy for UNIX > $@
+ $(COMMAND_ECHO)echo just a dummy for UNIX > $@
.ENDIF
.ENDIF # "$(DEF5TARGETN)"!=""
@@ -901,95 +901,95 @@ $(DEF6TARGETN) : \
.ELSE # "$(link_always)"==""
$(DEF6TARGETN) .PHONY :
.ENDIF # "$(link_always)"==""
- @-$(RM) $@.tmpfile
+ $(COMMAND_ECHO)-$(RM) $@.tmpfile
@echo "Making: module definition file" $(@:f)
- @echo LIBRARY $(EMQ)"$(SHL6TARGETN:f)$(EMQ)" >$@.tmpfile
+ $(COMMAND_ECHO)echo LIBRARY $(EMQ)"$(SHL6TARGETN:f)$(EMQ)" >$@.tmpfile
.IF "$(COM)"!="GCC"
- @echo HEAPSIZE 0 >>$@.tmpfile
+ $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
- @echo EXPORTS >>$@.tmpfile
+ $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
- @echo GetVersionInfo >>$@.tmpfile
+ $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB6NAME)"!=""
.IF "$(COM)"=="GCC"
- @-$(RM) $(MISC)/$(SHL6TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL6TARGET).exp
$(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL6TARGET).exp --export-all-symbols \
`$(TYPE) $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
$(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL6TARGET).exp | sed '/^;/d' >>$@.tmpfile
- @-$(RM) $(MISC)/$(SHL6TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL6TARGET).exp
.ELSE
.IF "$(SHL6USE_EXPORTS)"==""
- @-$(RMHACK6) $(MISC)/$(SHL6TARGET).exp
- @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL6TARGET).exp $(SLB)/$(DEFLIB6NAME).lib
- @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL6TARGET).flt $(MISC)/$(SHL6TARGET).exp >>$@.tmpfile
+ $(COMMAND_ECHO)-$(RMHACK6) $(MISC)/$(SHL6TARGET).exp
+ $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL6TARGET).exp $(SLB)/$(DEFLIB6NAME).lib
+ $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL6TARGET).flt $(MISC)/$(SHL6TARGET).exp >>$@.tmpfile
$(COMMAND_ECHO)$(RMHACK6) $(MISC)/$(SHL6TARGET).exp
.ELSE # "$(SHL6USE_EXPORTS)"==""
- @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL6TARGET).direct
- @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF6FILTER) $(MISC)/$(SHL6TARGET).direct >>$@.tmpfile
+ $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL6TARGET).direct
+ $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF6FILTER) $(MISC)/$(SHL6TARGET).direct >>$@.tmpfile
.ENDIF # "$(SHL6USE_EXPORTS)"==""
.ENDIF
.ENDIF # "$(DEFLIB6NAME)"!=""
.IF "$(DEF6EXPORT1)"!=""
- @echo $(DEF6EXPORT1) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF6EXPORT1) >>$@.tmpfile
.ENDIF
.IF "$(DEF6EXPORT2)"!=""
- @echo $(DEF6EXPORT2) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF6EXPORT2) >>$@.tmpfile
.ENDIF
.IF "$(DEF6EXPORT3)"!=""
- @echo $(DEF6EXPORT3) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF6EXPORT3) >>$@.tmpfile
.ENDIF
.IF "$(DEF6EXPORT4)"!=""
- @echo $(DEF6EXPORT4) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF6EXPORT4) >>$@.tmpfile
.ENDIF
.IF "$(DEF6EXPORT5)"!=""
- @echo $(DEF6EXPORT5) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF6EXPORT5) >>$@.tmpfile
.ENDIF
.IF "$(DEF6EXPORT6)"!=""
- @echo $(DEF6EXPORT6) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF6EXPORT6) >>$@.tmpfile
.ENDIF
.IF "$(DEF6EXPORT7)"!=""
- @echo $(DEF6EXPORT7) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF6EXPORT7) >>$@.tmpfile
.ENDIF
.IF "$(DEF6EXPORT8)"!=""
- @echo $(DEF6EXPORT8) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF6EXPORT8) >>$@.tmpfile
.ENDIF
.IF "$(DEF6EXPORT9)"!=""
- @echo $(DEF6EXPORT9) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF6EXPORT9) >>$@.tmpfile
.ENDIF
.IF "$(DEF6EXPORT10)"!=""
- @echo $(DEF6EXPORT10) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF6EXPORT10) >>$@.tmpfile
.ENDIF
.IF "$(DEF6EXPORT11)"!=""
- @echo $(DEF6EXPORT11) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF6EXPORT11) >>$@.tmpfile
.ENDIF
.IF "$(DEF6EXPORT12)"!=""
- @echo $(DEF6EXPORT12) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF6EXPORT12) >>$@.tmpfile
.ENDIF
.IF "$(DEF6EXPORT13)"!=""
- @echo $(DEF6EXPORT13) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF6EXPORT13) >>$@.tmpfile
.ENDIF
.IF "$(DEF6EXPORT14)"!=""
- @echo $(DEF6EXPORT14) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF6EXPORT14) >>$@.tmpfile
.ENDIF
.IF "$(DEF6EXPORT15)"!=""
- @echo $(DEF6EXPORT15) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF6EXPORT15) >>$@.tmpfile
.ENDIF
.IF "$(DEF6EXPORT16)"!=""
- @echo $(DEF6EXPORT16) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF6EXPORT16) >>$@.tmpfile
.ENDIF
.IF "$(DEF6EXPORT17)"!=""
- @echo $(DEF6EXPORT17) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF6EXPORT17) >>$@.tmpfile
.ENDIF
.IF "$(DEF6EXPORT18)"!=""
- @echo $(DEF6EXPORT18) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF6EXPORT18) >>$@.tmpfile
.ENDIF
.IF "$(DEF6EXPORT19)"!=""
- @echo $(DEF6EXPORT19) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF6EXPORT19) >>$@.tmpfile
.ENDIF
.IF "$(DEF6EXPORT20)"!=""
- @echo $(DEF6EXPORT20) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF6EXPORT20) >>$@.tmpfile
.ENDIF
.IF "$(DEF6EXPORTFILE)"!=""
.IF "$(COM)"=="GCC"
@@ -998,15 +998,15 @@ $(DEF6TARGETN) .PHONY :
$(COMMAND_ECHO)$(TYPE) $(DEF6EXPORTFILE) >> $@.tmpfile
.ENDIF
.ENDIF
- @-$(RM) $@
- @$(RENAME) $@.tmpfile $@
+ $(COMMAND_ECHO)-$(RM) $@
+ $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
.ENDIF # "$(GUI)"=="WNT"
.IF "$(GUI)"=="UNX"
$(DEF6TARGETN): \
$(DEF6DEPN) \
$(DEF6EXPORTFILE)
- @echo just a dummy for UNIX > $@
+ $(COMMAND_ECHO)echo just a dummy for UNIX > $@
.ENDIF
.ENDIF # "$(DEF6TARGETN)"!=""
@@ -1070,95 +1070,95 @@ $(DEF7TARGETN) : \
.ELSE # "$(link_always)"==""
$(DEF7TARGETN) .PHONY :
.ENDIF # "$(link_always)"==""
- @-$(RM) $@.tmpfile
+ $(COMMAND_ECHO)-$(RM) $@.tmpfile
@echo "Making: module definition file" $(@:f)
- @echo LIBRARY $(EMQ)"$(SHL7TARGETN:f)$(EMQ)" >$@.tmpfile
+ $(COMMAND_ECHO)echo LIBRARY $(EMQ)"$(SHL7TARGETN:f)$(EMQ)" >$@.tmpfile
.IF "$(COM)"!="GCC"
- @echo HEAPSIZE 0 >>$@.tmpfile
+ $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
- @echo EXPORTS >>$@.tmpfile
+ $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
- @echo GetVersionInfo >>$@.tmpfile
+ $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB7NAME)"!=""
.IF "$(COM)"=="GCC"
- @-$(RM) $(MISC)/$(SHL7TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL7TARGET).exp
$(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL7TARGET).exp --export-all-symbols \
`$(TYPE) $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
$(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL7TARGET).exp | sed '/^;/d' >>$@.tmpfile
- @-$(RM) $(MISC)/$(SHL7TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL7TARGET).exp
.ELSE
.IF "$(SHL7USE_EXPORTS)"==""
- @-$(RMHACK7) $(MISC)/$(SHL7TARGET).exp
- @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL7TARGET).exp $(SLB)/$(DEFLIB7NAME).lib
- @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL7TARGET).flt $(MISC)/$(SHL7TARGET).exp >>$@.tmpfile
+ $(COMMAND_ECHO)-$(RMHACK7) $(MISC)/$(SHL7TARGET).exp
+ $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL7TARGET).exp $(SLB)/$(DEFLIB7NAME).lib
+ $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL7TARGET).flt $(MISC)/$(SHL7TARGET).exp >>$@.tmpfile
$(COMMAND_ECHO)$(RMHACK7) $(MISC)/$(SHL7TARGET).exp
.ELSE # "$(SHL7USE_EXPORTS)"==""
- @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL7TARGET).direct
- @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF7FILTER) $(MISC)/$(SHL7TARGET).direct >>$@.tmpfile
+ $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL7TARGET).direct
+ $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF7FILTER) $(MISC)/$(SHL7TARGET).direct >>$@.tmpfile
.ENDIF # "$(SHL7USE_EXPORTS)"==""
.ENDIF
.ENDIF # "$(DEFLIB7NAME)"!=""
.IF "$(DEF7EXPORT1)"!=""
- @echo $(DEF7EXPORT1) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF7EXPORT1) >>$@.tmpfile
.ENDIF
.IF "$(DEF7EXPORT2)"!=""
- @echo $(DEF7EXPORT2) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF7EXPORT2) >>$@.tmpfile
.ENDIF
.IF "$(DEF7EXPORT3)"!=""
- @echo $(DEF7EXPORT3) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF7EXPORT3) >>$@.tmpfile
.ENDIF
.IF "$(DEF7EXPORT4)"!=""
- @echo $(DEF7EXPORT4) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF7EXPORT4) >>$@.tmpfile
.ENDIF
.IF "$(DEF7EXPORT5)"!=""
- @echo $(DEF7EXPORT5) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF7EXPORT5) >>$@.tmpfile
.ENDIF
.IF "$(DEF7EXPORT6)"!=""
- @echo $(DEF7EXPORT6) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF7EXPORT6) >>$@.tmpfile
.ENDIF
.IF "$(DEF7EXPORT7)"!=""
- @echo $(DEF7EXPORT7) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF7EXPORT7) >>$@.tmpfile
.ENDIF
.IF "$(DEF7EXPORT8)"!=""
- @echo $(DEF7EXPORT8) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF7EXPORT8) >>$@.tmpfile
.ENDIF
.IF "$(DEF7EXPORT9)"!=""
- @echo $(DEF7EXPORT9) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF7EXPORT9) >>$@.tmpfile
.ENDIF
.IF "$(DEF7EXPORT10)"!=""
- @echo $(DEF7EXPORT10) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF7EXPORT10) >>$@.tmpfile
.ENDIF
.IF "$(DEF7EXPORT11)"!=""
- @echo $(DEF7EXPORT11) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF7EXPORT11) >>$@.tmpfile
.ENDIF
.IF "$(DEF7EXPORT12)"!=""
- @echo $(DEF7EXPORT12) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF7EXPORT12) >>$@.tmpfile
.ENDIF
.IF "$(DEF7EXPORT13)"!=""
- @echo $(DEF7EXPORT13) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF7EXPORT13) >>$@.tmpfile
.ENDIF
.IF "$(DEF7EXPORT14)"!=""
- @echo $(DEF7EXPORT14) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF7EXPORT14) >>$@.tmpfile
.ENDIF
.IF "$(DEF7EXPORT15)"!=""
- @echo $(DEF7EXPORT15) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF7EXPORT15) >>$@.tmpfile
.ENDIF
.IF "$(DEF7EXPORT16)"!=""
- @echo $(DEF7EXPORT16) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF7EXPORT16) >>$@.tmpfile
.ENDIF
.IF "$(DEF7EXPORT17)"!=""
- @echo $(DEF7EXPORT17) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF7EXPORT17) >>$@.tmpfile
.ENDIF
.IF "$(DEF7EXPORT18)"!=""
- @echo $(DEF7EXPORT18) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF7EXPORT18) >>$@.tmpfile
.ENDIF
.IF "$(DEF7EXPORT19)"!=""
- @echo $(DEF7EXPORT19) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF7EXPORT19) >>$@.tmpfile
.ENDIF
.IF "$(DEF7EXPORT20)"!=""
- @echo $(DEF7EXPORT20) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF7EXPORT20) >>$@.tmpfile
.ENDIF
.IF "$(DEF7EXPORTFILE)"!=""
.IF "$(COM)"=="GCC"
@@ -1167,15 +1167,15 @@ $(DEF7TARGETN) .PHONY :
$(COMMAND_ECHO)$(TYPE) $(DEF7EXPORTFILE) >> $@.tmpfile
.ENDIF
.ENDIF
- @-$(RM) $@
- @$(RENAME) $@.tmpfile $@
+ $(COMMAND_ECHO)-$(RM) $@
+ $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
.ENDIF # "$(GUI)"=="WNT"
.IF "$(GUI)"=="UNX"
$(DEF7TARGETN): \
$(DEF7DEPN) \
$(DEF7EXPORTFILE)
- @echo just a dummy for UNIX > $@
+ $(COMMAND_ECHO)echo just a dummy for UNIX > $@
.ENDIF
.ENDIF # "$(DEF7TARGETN)"!=""
@@ -1239,95 +1239,95 @@ $(DEF8TARGETN) : \
.ELSE # "$(link_always)"==""
$(DEF8TARGETN) .PHONY :
.ENDIF # "$(link_always)"==""
- @-$(RM) $@.tmpfile
+ $(COMMAND_ECHO)-$(RM) $@.tmpfile
@echo "Making: module definition file" $(@:f)
- @echo LIBRARY $(EMQ)"$(SHL8TARGETN:f)$(EMQ)" >$@.tmpfile
+ $(COMMAND_ECHO)echo LIBRARY $(EMQ)"$(SHL8TARGETN:f)$(EMQ)" >$@.tmpfile
.IF "$(COM)"!="GCC"
- @echo HEAPSIZE 0 >>$@.tmpfile
+ $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
- @echo EXPORTS >>$@.tmpfile
+ $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
- @echo GetVersionInfo >>$@.tmpfile
+ $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB8NAME)"!=""
.IF "$(COM)"=="GCC"
- @-$(RM) $(MISC)/$(SHL8TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL8TARGET).exp
$(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL8TARGET).exp --export-all-symbols \
`$(TYPE) $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
$(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL8TARGET).exp | sed '/^;/d' >>$@.tmpfile
- @-$(RM) $(MISC)/$(SHL8TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL8TARGET).exp
.ELSE
.IF "$(SHL8USE_EXPORTS)"==""
- @-$(RMHACK8) $(MISC)/$(SHL8TARGET).exp
- @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL8TARGET).exp $(SLB)/$(DEFLIB8NAME).lib
- @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL8TARGET).flt $(MISC)/$(SHL8TARGET).exp >>$@.tmpfile
+ $(COMMAND_ECHO)-$(RMHACK8) $(MISC)/$(SHL8TARGET).exp
+ $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL8TARGET).exp $(SLB)/$(DEFLIB8NAME).lib
+ $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL8TARGET).flt $(MISC)/$(SHL8TARGET).exp >>$@.tmpfile
$(COMMAND_ECHO)$(RMHACK8) $(MISC)/$(SHL8TARGET).exp
.ELSE # "$(SHL8USE_EXPORTS)"==""
- @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL8TARGET).direct
- @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF8FILTER) $(MISC)/$(SHL8TARGET).direct >>$@.tmpfile
+ $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL8TARGET).direct
+ $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF8FILTER) $(MISC)/$(SHL8TARGET).direct >>$@.tmpfile
.ENDIF # "$(SHL8USE_EXPORTS)"==""
.ENDIF
.ENDIF # "$(DEFLIB8NAME)"!=""
.IF "$(DEF8EXPORT1)"!=""
- @echo $(DEF8EXPORT1) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF8EXPORT1) >>$@.tmpfile
.ENDIF
.IF "$(DEF8EXPORT2)"!=""
- @echo $(DEF8EXPORT2) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF8EXPORT2) >>$@.tmpfile
.ENDIF
.IF "$(DEF8EXPORT3)"!=""
- @echo $(DEF8EXPORT3) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF8EXPORT3) >>$@.tmpfile
.ENDIF
.IF "$(DEF8EXPORT4)"!=""
- @echo $(DEF8EXPORT4) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF8EXPORT4) >>$@.tmpfile
.ENDIF
.IF "$(DEF8EXPORT5)"!=""
- @echo $(DEF8EXPORT5) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF8EXPORT5) >>$@.tmpfile
.ENDIF
.IF "$(DEF8EXPORT6)"!=""
- @echo $(DEF8EXPORT6) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF8EXPORT6) >>$@.tmpfile
.ENDIF
.IF "$(DEF8EXPORT7)"!=""
- @echo $(DEF8EXPORT7) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF8EXPORT7) >>$@.tmpfile
.ENDIF
.IF "$(DEF8EXPORT8)"!=""
- @echo $(DEF8EXPORT8) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF8EXPORT8) >>$@.tmpfile
.ENDIF
.IF "$(DEF8EXPORT9)"!=""
- @echo $(DEF8EXPORT9) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF8EXPORT9) >>$@.tmpfile
.ENDIF
.IF "$(DEF8EXPORT10)"!=""
- @echo $(DEF8EXPORT10) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF8EXPORT10) >>$@.tmpfile
.ENDIF
.IF "$(DEF8EXPORT11)"!=""
- @echo $(DEF8EXPORT11) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF8EXPORT11) >>$@.tmpfile
.ENDIF
.IF "$(DEF8EXPORT12)"!=""
- @echo $(DEF8EXPORT12) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF8EXPORT12) >>$@.tmpfile
.ENDIF
.IF "$(DEF8EXPORT13)"!=""
- @echo $(DEF8EXPORT13) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF8EXPORT13) >>$@.tmpfile
.ENDIF
.IF "$(DEF8EXPORT14)"!=""
- @echo $(DEF8EXPORT14) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF8EXPORT14) >>$@.tmpfile
.ENDIF
.IF "$(DEF8EXPORT15)"!=""
- @echo $(DEF8EXPORT15) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF8EXPORT15) >>$@.tmpfile
.ENDIF
.IF "$(DEF8EXPORT16)"!=""
- @echo $(DEF8EXPORT16) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF8EXPORT16) >>$@.tmpfile
.ENDIF
.IF "$(DEF8EXPORT17)"!=""
- @echo $(DEF8EXPORT17) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF8EXPORT17) >>$@.tmpfile
.ENDIF
.IF "$(DEF8EXPORT18)"!=""
- @echo $(DEF8EXPORT18) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF8EXPORT18) >>$@.tmpfile
.ENDIF
.IF "$(DEF8EXPORT19)"!=""
- @echo $(DEF8EXPORT19) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF8EXPORT19) >>$@.tmpfile
.ENDIF
.IF "$(DEF8EXPORT20)"!=""
- @echo $(DEF8EXPORT20) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF8EXPORT20) >>$@.tmpfile
.ENDIF
.IF "$(DEF8EXPORTFILE)"!=""
.IF "$(COM)"=="GCC"
@@ -1336,15 +1336,15 @@ $(DEF8TARGETN) .PHONY :
$(COMMAND_ECHO)$(TYPE) $(DEF8EXPORTFILE) >> $@.tmpfile
.ENDIF
.ENDIF
- @-$(RM) $@
- @$(RENAME) $@.tmpfile $@
+ $(COMMAND_ECHO)-$(RM) $@
+ $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
.ENDIF # "$(GUI)"=="WNT"
.IF "$(GUI)"=="UNX"
$(DEF8TARGETN): \
$(DEF8DEPN) \
$(DEF8EXPORTFILE)
- @echo just a dummy for UNIX > $@
+ $(COMMAND_ECHO)echo just a dummy for UNIX > $@
.ENDIF
.ENDIF # "$(DEF8TARGETN)"!=""
@@ -1408,95 +1408,95 @@ $(DEF9TARGETN) : \
.ELSE # "$(link_always)"==""
$(DEF9TARGETN) .PHONY :
.ENDIF # "$(link_always)"==""
- @-$(RM) $@.tmpfile
+ $(COMMAND_ECHO)-$(RM) $@.tmpfile
@echo "Making: module definition file" $(@:f)
- @echo LIBRARY $(EMQ)"$(SHL9TARGETN:f)$(EMQ)" >$@.tmpfile
+ $(COMMAND_ECHO)echo LIBRARY $(EMQ)"$(SHL9TARGETN:f)$(EMQ)" >$@.tmpfile
.IF "$(COM)"!="GCC"
- @echo HEAPSIZE 0 >>$@.tmpfile
+ $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
- @echo EXPORTS >>$@.tmpfile
+ $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
- @echo GetVersionInfo >>$@.tmpfile
+ $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB9NAME)"!=""
.IF "$(COM)"=="GCC"
- @-$(RM) $(MISC)/$(SHL9TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL9TARGET).exp
$(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL9TARGET).exp --export-all-symbols \
`$(TYPE) $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
$(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL9TARGET).exp | sed '/^;/d' >>$@.tmpfile
- @-$(RM) $(MISC)/$(SHL9TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL9TARGET).exp
.ELSE
.IF "$(SHL9USE_EXPORTS)"==""
- @-$(RMHACK9) $(MISC)/$(SHL9TARGET).exp
- @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL9TARGET).exp $(SLB)/$(DEFLIB9NAME).lib
- @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL9TARGET).flt $(MISC)/$(SHL9TARGET).exp >>$@.tmpfile
+ $(COMMAND_ECHO)-$(RMHACK9) $(MISC)/$(SHL9TARGET).exp
+ $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL9TARGET).exp $(SLB)/$(DEFLIB9NAME).lib
+ $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL9TARGET).flt $(MISC)/$(SHL9TARGET).exp >>$@.tmpfile
$(COMMAND_ECHO)$(RMHACK9) $(MISC)/$(SHL9TARGET).exp
.ELSE # "$(SHL9USE_EXPORTS)"==""
- @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL9TARGET).direct
- @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF9FILTER) $(MISC)/$(SHL9TARGET).direct >>$@.tmpfile
+ $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL9TARGET).direct
+ $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF9FILTER) $(MISC)/$(SHL9TARGET).direct >>$@.tmpfile
.ENDIF # "$(SHL9USE_EXPORTS)"==""
.ENDIF
.ENDIF # "$(DEFLIB9NAME)"!=""
.IF "$(DEF9EXPORT1)"!=""
- @echo $(DEF9EXPORT1) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF9EXPORT1) >>$@.tmpfile
.ENDIF
.IF "$(DEF9EXPORT2)"!=""
- @echo $(DEF9EXPORT2) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF9EXPORT2) >>$@.tmpfile
.ENDIF
.IF "$(DEF9EXPORT3)"!=""
- @echo $(DEF9EXPORT3) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF9EXPORT3) >>$@.tmpfile
.ENDIF
.IF "$(DEF9EXPORT4)"!=""
- @echo $(DEF9EXPORT4) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF9EXPORT4) >>$@.tmpfile
.ENDIF
.IF "$(DEF9EXPORT5)"!=""
- @echo $(DEF9EXPORT5) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF9EXPORT5) >>$@.tmpfile
.ENDIF
.IF "$(DEF9EXPORT6)"!=""
- @echo $(DEF9EXPORT6) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF9EXPORT6) >>$@.tmpfile
.ENDIF
.IF "$(DEF9EXPORT7)"!=""
- @echo $(DEF9EXPORT7) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF9EXPORT7) >>$@.tmpfile
.ENDIF
.IF "$(DEF9EXPORT8)"!=""
- @echo $(DEF9EXPORT8) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF9EXPORT8) >>$@.tmpfile
.ENDIF
.IF "$(DEF9EXPORT9)"!=""
- @echo $(DEF9EXPORT9) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF9EXPORT9) >>$@.tmpfile
.ENDIF
.IF "$(DEF9EXPORT10)"!=""
- @echo $(DEF9EXPORT10) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF9EXPORT10) >>$@.tmpfile
.ENDIF
.IF "$(DEF9EXPORT11)"!=""
- @echo $(DEF9EXPORT11) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF9EXPORT11) >>$@.tmpfile
.ENDIF
.IF "$(DEF9EXPORT12)"!=""
- @echo $(DEF9EXPORT12) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF9EXPORT12) >>$@.tmpfile
.ENDIF
.IF "$(DEF9EXPORT13)"!=""
- @echo $(DEF9EXPORT13) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF9EXPORT13) >>$@.tmpfile
.ENDIF
.IF "$(DEF9EXPORT14)"!=""
- @echo $(DEF9EXPORT14) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF9EXPORT14) >>$@.tmpfile
.ENDIF
.IF "$(DEF9EXPORT15)"!=""
- @echo $(DEF9EXPORT15) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF9EXPORT15) >>$@.tmpfile
.ENDIF
.IF "$(DEF9EXPORT16)"!=""
- @echo $(DEF9EXPORT16) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF9EXPORT16) >>$@.tmpfile
.ENDIF
.IF "$(DEF9EXPORT17)"!=""
- @echo $(DEF9EXPORT17) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF9EXPORT17) >>$@.tmpfile
.ENDIF
.IF "$(DEF9EXPORT18)"!=""
- @echo $(DEF9EXPORT18) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF9EXPORT18) >>$@.tmpfile
.ENDIF
.IF "$(DEF9EXPORT19)"!=""
- @echo $(DEF9EXPORT19) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF9EXPORT19) >>$@.tmpfile
.ENDIF
.IF "$(DEF9EXPORT20)"!=""
- @echo $(DEF9EXPORT20) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF9EXPORT20) >>$@.tmpfile
.ENDIF
.IF "$(DEF9EXPORTFILE)"!=""
.IF "$(COM)"=="GCC"
@@ -1505,15 +1505,15 @@ $(DEF9TARGETN) .PHONY :
$(COMMAND_ECHO)$(TYPE) $(DEF9EXPORTFILE) >> $@.tmpfile
.ENDIF
.ENDIF
- @-$(RM) $@
- @$(RENAME) $@.tmpfile $@
+ $(COMMAND_ECHO)-$(RM) $@
+ $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
.ENDIF # "$(GUI)"=="WNT"
.IF "$(GUI)"=="UNX"
$(DEF9TARGETN): \
$(DEF9DEPN) \
$(DEF9EXPORTFILE)
- @echo just a dummy for UNIX > $@
+ $(COMMAND_ECHO)echo just a dummy for UNIX > $@
.ENDIF
.ENDIF # "$(DEF9TARGETN)"!=""
@@ -1577,95 +1577,95 @@ $(DEF10TARGETN) : \
.ELSE # "$(link_always)"==""
$(DEF10TARGETN) .PHONY :
.ENDIF # "$(link_always)"==""
- @-$(RM) $@.tmpfile
+ $(COMMAND_ECHO)-$(RM) $@.tmpfile
@echo "Making: module definition file" $(@:f)
- @echo LIBRARY $(EMQ)"$(SHL10TARGETN:f)$(EMQ)" >$@.tmpfile
+ $(COMMAND_ECHO)echo LIBRARY $(EMQ)"$(SHL10TARGETN:f)$(EMQ)" >$@.tmpfile
.IF "$(COM)"!="GCC"
- @echo HEAPSIZE 0 >>$@.tmpfile
+ $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
- @echo EXPORTS >>$@.tmpfile
+ $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
- @echo GetVersionInfo >>$@.tmpfile
+ $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB10NAME)"!=""
.IF "$(COM)"=="GCC"
- @-$(RM) $(MISC)/$(SHL10TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL10TARGET).exp
$(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL10TARGET).exp --export-all-symbols \
`$(TYPE) $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
$(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL10TARGET).exp | sed '/^;/d' >>$@.tmpfile
- @-$(RM) $(MISC)/$(SHL10TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL10TARGET).exp
.ELSE
.IF "$(SHL10USE_EXPORTS)"==""
- @-$(RMHACK10) $(MISC)/$(SHL10TARGET).exp
- @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL10TARGET).exp $(SLB)/$(DEFLIB10NAME).lib
- @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL10TARGET).flt $(MISC)/$(SHL10TARGET).exp >>$@.tmpfile
+ $(COMMAND_ECHO)-$(RMHACK10) $(MISC)/$(SHL10TARGET).exp
+ $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL10TARGET).exp $(SLB)/$(DEFLIB10NAME).lib
+ $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL10TARGET).flt $(MISC)/$(SHL10TARGET).exp >>$@.tmpfile
$(COMMAND_ECHO)$(RMHACK10) $(MISC)/$(SHL10TARGET).exp
.ELSE # "$(SHL10USE_EXPORTS)"==""
- @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL10TARGET).direct
- @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF10FILTER) $(MISC)/$(SHL10TARGET).direct >>$@.tmpfile
+ $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL10TARGET).direct
+ $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF10FILTER) $(MISC)/$(SHL10TARGET).direct >>$@.tmpfile
.ENDIF # "$(SHL10USE_EXPORTS)"==""
.ENDIF
.ENDIF # "$(DEFLIB10NAME)"!=""
.IF "$(DEF10EXPORT1)"!=""
- @echo $(DEF10EXPORT1) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF10EXPORT1) >>$@.tmpfile
.ENDIF
.IF "$(DEF10EXPORT2)"!=""
- @echo $(DEF10EXPORT2) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF10EXPORT2) >>$@.tmpfile
.ENDIF
.IF "$(DEF10EXPORT3)"!=""
- @echo $(DEF10EXPORT3) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF10EXPORT3) >>$@.tmpfile
.ENDIF
.IF "$(DEF10EXPORT4)"!=""
- @echo $(DEF10EXPORT4) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF10EXPORT4) >>$@.tmpfile
.ENDIF
.IF "$(DEF10EXPORT5)"!=""
- @echo $(DEF10EXPORT5) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF10EXPORT5) >>$@.tmpfile
.ENDIF
.IF "$(DEF10EXPORT6)"!=""
- @echo $(DEF10EXPORT6) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF10EXPORT6) >>$@.tmpfile
.ENDIF
.IF "$(DEF10EXPORT7)"!=""
- @echo $(DEF10EXPORT7) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF10EXPORT7) >>$@.tmpfile
.ENDIF
.IF "$(DEF10EXPORT8)"!=""
- @echo $(DEF10EXPORT8) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF10EXPORT8) >>$@.tmpfile
.ENDIF
.IF "$(DEF10EXPORT9)"!=""
- @echo $(DEF10EXPORT9) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF10EXPORT9) >>$@.tmpfile
.ENDIF
.IF "$(DEF10EXPORT10)"!=""
- @echo $(DEF10EXPORT10) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF10EXPORT10) >>$@.tmpfile
.ENDIF
.IF "$(DEF10EXPORT11)"!=""
- @echo $(DEF10EXPORT11) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF10EXPORT11) >>$@.tmpfile
.ENDIF
.IF "$(DEF10EXPORT12)"!=""
- @echo $(DEF10EXPORT12) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF10EXPORT12) >>$@.tmpfile
.ENDIF
.IF "$(DEF10EXPORT13)"!=""
- @echo $(DEF10EXPORT13) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF10EXPORT13) >>$@.tmpfile
.ENDIF
.IF "$(DEF10EXPORT14)"!=""
- @echo $(DEF10EXPORT14) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF10EXPORT14) >>$@.tmpfile
.ENDIF
.IF "$(DEF10EXPORT15)"!=""
- @echo $(DEF10EXPORT15) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF10EXPORT15) >>$@.tmpfile
.ENDIF
.IF "$(DEF10EXPORT16)"!=""
- @echo $(DEF10EXPORT16) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF10EXPORT16) >>$@.tmpfile
.ENDIF
.IF "$(DEF10EXPORT17)"!=""
- @echo $(DEF10EXPORT17) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF10EXPORT17) >>$@.tmpfile
.ENDIF
.IF "$(DEF10EXPORT18)"!=""
- @echo $(DEF10EXPORT18) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF10EXPORT18) >>$@.tmpfile
.ENDIF
.IF "$(DEF10EXPORT19)"!=""
- @echo $(DEF10EXPORT19) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF10EXPORT19) >>$@.tmpfile
.ENDIF
.IF "$(DEF10EXPORT20)"!=""
- @echo $(DEF10EXPORT20) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF10EXPORT20) >>$@.tmpfile
.ENDIF
.IF "$(DEF10EXPORTFILE)"!=""
.IF "$(COM)"=="GCC"
@@ -1674,15 +1674,15 @@ $(DEF10TARGETN) .PHONY :
$(COMMAND_ECHO)$(TYPE) $(DEF10EXPORTFILE) >> $@.tmpfile
.ENDIF
.ENDIF
- @-$(RM) $@
- @$(RENAME) $@.tmpfile $@
+ $(COMMAND_ECHO)-$(RM) $@
+ $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
.ENDIF # "$(GUI)"=="WNT"
.IF "$(GUI)"=="UNX"
$(DEF10TARGETN): \
$(DEF10DEPN) \
$(DEF10EXPORTFILE)
- @echo just a dummy for UNIX > $@
+ $(COMMAND_ECHO)echo just a dummy for UNIX > $@
.ENDIF
.ENDIF # "$(DEF10TARGETN)"!=""
diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk
index 763ad26..fdc78c2 100644
--- a/solenv/inc/tg_def.mk
+++ b/solenv/inc/tg_def.mk
@@ -85,95 +85,95 @@ $(DEF$(TNR)TARGETN) : \
.ELSE # "$(link_always)"==""
$(DEF$(TNR)TARGETN) .PHONY :
.ENDIF # "$(link_always)"==""
- @-$(RM) $@.tmpfile
+ $(COMMAND_ECHO)-$(RM) $@.tmpfile
@echo "Making: module definition file" $(@:f)
- @echo LIBRARY $(EMQ)"$(SHL$(TNR)TARGETN:f)$(EMQ)" >$@.tmpfile
+ $(COMMAND_ECHO)echo LIBRARY $(EMQ)"$(SHL$(TNR)TARGETN:f)$(EMQ)" >$@.tmpfile
.IF "$(COM)"!="GCC"
- @echo HEAPSIZE 0 >>$@.tmpfile
+ $(COMMAND_ECHO)echo HEAPSIZE 0 >>$@.tmpfile
.ENDIF
- @echo EXPORTS >>$@.tmpfile
+ $(COMMAND_ECHO)echo EXPORTS >>$@.tmpfile
.IF "$(VERSIONOBJ)"!=""
# getversioninfo fuer alle!!
- @echo GetVersionInfo >>$@.tmpfile
+ $(COMMAND_ECHO)echo GetVersionInfo >>$@.tmpfile
.ENDIF
.IF "$(DEFLIB$(TNR)NAME)"!=""
.IF "$(COM)"=="GCC"
- @-$(RM) $(MISC)/$(SHL$(TNR)TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL$(TNR)TARGET).exp
$(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL$(TNR)TARGET).exp --export-all-symbols \
`$(TYPE) $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
$(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL$(TNR)TARGET).exp | sed '/^;/d' >>$@.tmpfile
- @-$(RM) $(MISC)/$(SHL$(TNR)TARGET).exp
+ $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL$(TNR)TARGET).exp
.ELSE
.IF "$(SHL$(TNR)USE_EXPORTS)"==""
- @-$(RMHACK$(TNR)) $(MISC)/$(SHL$(TNR)TARGET).exp
- @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL$(TNR)TARGET).exp $(SLB)/$(DEFLIB$(TNR)NAME).lib
- @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL$(TNR)TARGET).flt $(MISC)/$(SHL$(TNR)TARGET).exp >>$@.tmpfile
+ $(COMMAND_ECHO)-$(RMHACK$(TNR)) $(MISC)/$(SHL$(TNR)TARGET).exp
+ $(COMMAND_ECHO)$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL$(TNR)TARGET).exp $(SLB)/$(DEFLIB$(TNR)NAME).lib
+ $(COMMAND_ECHO)$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL$(TNR)TARGET).flt $(MISC)/$(SHL$(TNR)TARGET).exp >>$@.tmpfile
$(COMMAND_ECHO)$(RMHACK$(TNR)) $(MISC)/$(SHL$(TNR)TARGET).exp
.ELSE # "$(SHL$(TNR)USE_EXPORTS)"==""
- @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL$(TNR)TARGET).direct
- @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF$(TNR)FILTER) $(MISC)/$(SHL$(TNR)TARGET).direct >>$@.tmpfile
+ $(COMMAND_ECHO)$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL$(TNR)TARGET).direct
+ $(COMMAND_ECHO)$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF$(TNR)FILTER) $(MISC)/$(SHL$(TNR)TARGET).direct >>$@.tmpfile
.ENDIF # "$(SHL$(TNR)USE_EXPORTS)"==""
.ENDIF
.ENDIF # "$(DEFLIB$(TNR)NAME)"!=""
.IF "$(DEF$(TNR)EXPORT1)"!=""
- @echo $(DEF$(TNR)EXPORT1) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT1) >>$@.tmpfile
.ENDIF
.IF "$(DEF$(TNR)EXPORT2)"!=""
- @echo $(DEF$(TNR)EXPORT2) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT2) >>$@.tmpfile
.ENDIF
.IF "$(DEF$(TNR)EXPORT3)"!=""
- @echo $(DEF$(TNR)EXPORT3) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT3) >>$@.tmpfile
.ENDIF
.IF "$(DEF$(TNR)EXPORT4)"!=""
- @echo $(DEF$(TNR)EXPORT4) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT4) >>$@.tmpfile
.ENDIF
.IF "$(DEF$(TNR)EXPORT5)"!=""
- @echo $(DEF$(TNR)EXPORT5) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT5) >>$@.tmpfile
.ENDIF
.IF "$(DEF$(TNR)EXPORT6)"!=""
- @echo $(DEF$(TNR)EXPORT6) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT6) >>$@.tmpfile
.ENDIF
.IF "$(DEF$(TNR)EXPORT7)"!=""
- @echo $(DEF$(TNR)EXPORT7) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT7) >>$@.tmpfile
.ENDIF
.IF "$(DEF$(TNR)EXPORT8)"!=""
- @echo $(DEF$(TNR)EXPORT8) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT8) >>$@.tmpfile
.ENDIF
.IF "$(DEF$(TNR)EXPORT9)"!=""
- @echo $(DEF$(TNR)EXPORT9) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT9) >>$@.tmpfile
.ENDIF
.IF "$(DEF$(TNR)EXPORT10)"!=""
- @echo $(DEF$(TNR)EXPORT10) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT10) >>$@.tmpfile
.ENDIF
.IF "$(DEF$(TNR)EXPORT11)"!=""
- @echo $(DEF$(TNR)EXPORT11) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT11) >>$@.tmpfile
.ENDIF
.IF "$(DEF$(TNR)EXPORT12)"!=""
- @echo $(DEF$(TNR)EXPORT12) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT12) >>$@.tmpfile
.ENDIF
.IF "$(DEF$(TNR)EXPORT13)"!=""
- @echo $(DEF$(TNR)EXPORT13) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT13) >>$@.tmpfile
.ENDIF
.IF "$(DEF$(TNR)EXPORT14)"!=""
- @echo $(DEF$(TNR)EXPORT14) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT14) >>$@.tmpfile
.ENDIF
.IF "$(DEF$(TNR)EXPORT15)"!=""
- @echo $(DEF$(TNR)EXPORT15) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT15) >>$@.tmpfile
.ENDIF
.IF "$(DEF$(TNR)EXPORT16)"!=""
- @echo $(DEF$(TNR)EXPORT16) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT16) >>$@.tmpfile
.ENDIF
.IF "$(DEF$(TNR)EXPORT17)"!=""
- @echo $(DEF$(TNR)EXPORT17) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT17) >>$@.tmpfile
.ENDIF
.IF "$(DEF$(TNR)EXPORT18)"!=""
- @echo $(DEF$(TNR)EXPORT18) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT18) >>$@.tmpfile
.ENDIF
.IF "$(DEF$(TNR)EXPORT19)"!=""
- @echo $(DEF$(TNR)EXPORT19) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT19) >>$@.tmpfile
.ENDIF
.IF "$(DEF$(TNR)EXPORT20)"!=""
- @echo $(DEF$(TNR)EXPORT20) >>$@.tmpfile
+ $(COMMAND_ECHO)echo $(DEF$(TNR)EXPORT20) >>$@.tmpfile
.ENDIF
.IF "$(DEF$(TNR)EXPORTFILE)"!=""
.IF "$(COM)"=="GCC"
@@ -182,15 +182,15 @@ $(DEF$(TNR)TARGETN) .PHONY :
$(COMMAND_ECHO)$(TYPE) $(DEF$(TNR)EXPORTFILE) >> $@.tmpfile
.ENDIF
.ENDIF
- @-$(RM) $@
- @$(RENAME) $@.tmpfile $@
+ $(COMMAND_ECHO)-$(RM) $@
+ $(COMMAND_ECHO)$(RENAME) $@.tmpfile $@
.ENDIF # "$(GUI)"=="WNT"
.IF "$(GUI)"=="UNX"
$(DEF$(TNR)TARGETN): \
$(DEF$(TNR)DEPN) \
$(DEF$(TNR)EXPORTFILE)
- @echo just a dummy for UNIX > $@
+ $(COMMAND_ECHO)echo just a dummy for UNIX > $@
.ENDIF
.ENDIF # "$(DEF$(TNR)TARGETN)"!=""
commit eeb0ab19eaa04945dc14aaa6428e5cd3c074a455
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sat Jun 18 00:00:20 2011 +0300
Attempt to fix MinGW build, dlltool not needed it seems
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index de7b836..c7ad1ba 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -289,7 +289,7 @@ $(SHL1TARGETN) : \
.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
# GNU ld since 2.17 supports @cmdfile syntax
.IF "$(USE_DEFFILE)"!=""
- @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+ $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL1LINKFLAGS) \
$(LINKFLAGSSHL) \
$(SOLARLIB) \
@@ -311,13 +311,6 @@ $(SHL1TARGETN) : \
@noop $(assign DEF1OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
@noop $(foreach,i,$(DEF1OBJLIST) $(assign ALL1OBJLIST:=$(ALL1OBJLIST:s?$i??)))
.ENDIF # "$(DEFLIB1NAME)"!=""
- $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
- --dllname $(SHL1TARGET)$(DLLPOST) \
- --kill-at \
- --output-exp $(MISC)/$(@:b)_exp.o \
- $(SHL1VERSIONOBJ) \
- $(ALL1OBJLIST) \
- ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL1LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -325,7 +318,7 @@ $(SHL1TARGETN) : \
$(MINGWSSTDOBJ) \
-o $@ \
-Wl,-Map,$(MISC)/$(@:b).map \
- $(MISC)/$(@:b)_exp.o \
+ $(SHL1DEF) \
$(USE_1IMPLIB) \
$(STDOBJ) \
$(SHL1VERSIONOBJ) $(SHL1OBJS) \
@@ -796,7 +789,7 @@ $(SHL2TARGETN) : \
.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
# GNU ld since 2.17 supports @cmdfile syntax
.IF "$(USE_DEFFILE)"!=""
- @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+ $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL2LINKFLAGS) \
$(LINKFLAGSSHL) \
$(SOLARLIB) \
@@ -818,13 +811,6 @@ $(SHL2TARGETN) : \
@noop $(assign DEF2OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
@noop $(foreach,i,$(DEF2OBJLIST) $(assign ALL2OBJLIST:=$(ALL2OBJLIST:s?$i??)))
.ENDIF # "$(DEFLIB2NAME)"!=""
- $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
- --dllname $(SHL2TARGET)$(DLLPOST) \
- --kill-at \
- --output-exp $(MISC)/$(@:b)_exp.o \
- $(SHL2VERSIONOBJ) \
- $(ALL2OBJLIST) \
- ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL2LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -832,7 +818,7 @@ $(SHL2TARGETN) : \
$(MINGWSSTDOBJ) \
-o $@ \
-Wl,-Map,$(MISC)/$(@:b).map \
- $(MISC)/$(@:b)_exp.o \
+ $(SHL2DEF) \
$(USE_2IMPLIB) \
$(STDOBJ) \
$(SHL2VERSIONOBJ) $(SHL2OBJS) \
@@ -1303,7 +1289,7 @@ $(SHL3TARGETN) : \
.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
# GNU ld since 2.17 supports @cmdfile syntax
.IF "$(USE_DEFFILE)"!=""
- @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+ $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL3LINKFLAGS) \
$(LINKFLAGSSHL) \
$(SOLARLIB) \
@@ -1325,13 +1311,6 @@ $(SHL3TARGETN) : \
@noop $(assign DEF3OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
@noop $(foreach,i,$(DEF3OBJLIST) $(assign ALL3OBJLIST:=$(ALL3OBJLIST:s?$i??)))
.ENDIF # "$(DEFLIB3NAME)"!=""
- $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
- --dllname $(SHL3TARGET)$(DLLPOST) \
- --kill-at \
- --output-exp $(MISC)/$(@:b)_exp.o \
- $(SHL3VERSIONOBJ) \
- $(ALL3OBJLIST) \
- ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL3LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -1339,7 +1318,7 @@ $(SHL3TARGETN) : \
$(MINGWSSTDOBJ) \
-o $@ \
-Wl,-Map,$(MISC)/$(@:b).map \
- $(MISC)/$(@:b)_exp.o \
+ $(SHL3DEF) \
$(USE_3IMPLIB) \
$(STDOBJ) \
$(SHL3VERSIONOBJ) $(SHL3OBJS) \
@@ -1810,7 +1789,7 @@ $(SHL4TARGETN) : \
.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
# GNU ld since 2.17 supports @cmdfile syntax
.IF "$(USE_DEFFILE)"!=""
- @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+ $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL4LINKFLAGS) \
$(LINKFLAGSSHL) \
$(SOLARLIB) \
@@ -1832,13 +1811,6 @@ $(SHL4TARGETN) : \
@noop $(assign DEF4OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
@noop $(foreach,i,$(DEF4OBJLIST) $(assign ALL4OBJLIST:=$(ALL4OBJLIST:s?$i??)))
.ENDIF # "$(DEFLIB4NAME)"!=""
- $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
- --dllname $(SHL4TARGET)$(DLLPOST) \
- --kill-at \
- --output-exp $(MISC)/$(@:b)_exp.o \
- $(SHL4VERSIONOBJ) \
- $(ALL4OBJLIST) \
- ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL4LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -1846,7 +1818,7 @@ $(SHL4TARGETN) : \
$(MINGWSSTDOBJ) \
-o $@ \
-Wl,-Map,$(MISC)/$(@:b).map \
- $(MISC)/$(@:b)_exp.o \
+ $(SHL4DEF) \
$(USE_4IMPLIB) \
$(STDOBJ) \
$(SHL4VERSIONOBJ) $(SHL4OBJS) \
@@ -2317,7 +2289,7 @@ $(SHL5TARGETN) : \
.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
# GNU ld since 2.17 supports @cmdfile syntax
.IF "$(USE_DEFFILE)"!=""
- @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+ $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL5LINKFLAGS) \
$(LINKFLAGSSHL) \
$(SOLARLIB) \
@@ -2339,13 +2311,6 @@ $(SHL5TARGETN) : \
@noop $(assign DEF5OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
@noop $(foreach,i,$(DEF5OBJLIST) $(assign ALL5OBJLIST:=$(ALL5OBJLIST:s?$i??)))
.ENDIF # "$(DEFLIB5NAME)"!=""
- $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
- --dllname $(SHL5TARGET)$(DLLPOST) \
- --kill-at \
- --output-exp $(MISC)/$(@:b)_exp.o \
- $(SHL5VERSIONOBJ) \
- $(ALL5OBJLIST) \
- ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL5LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -2353,7 +2318,7 @@ $(SHL5TARGETN) : \
$(MINGWSSTDOBJ) \
-o $@ \
-Wl,-Map,$(MISC)/$(@:b).map \
- $(MISC)/$(@:b)_exp.o \
+ $(SHL5DEF) \
$(USE_5IMPLIB) \
$(STDOBJ) \
$(SHL5VERSIONOBJ) $(SHL5OBJS) \
@@ -2824,7 +2789,7 @@ $(SHL6TARGETN) : \
.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
# GNU ld since 2.17 supports @cmdfile syntax
.IF "$(USE_DEFFILE)"!=""
- @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+ $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL6LINKFLAGS) \
$(LINKFLAGSSHL) \
$(SOLARLIB) \
@@ -2846,13 +2811,6 @@ $(SHL6TARGETN) : \
@noop $(assign DEF6OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
@noop $(foreach,i,$(DEF6OBJLIST) $(assign ALL6OBJLIST:=$(ALL6OBJLIST:s?$i??)))
.ENDIF # "$(DEFLIB6NAME)"!=""
- $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
- --dllname $(SHL6TARGET)$(DLLPOST) \
- --kill-at \
- --output-exp $(MISC)/$(@:b)_exp.o \
- $(SHL6VERSIONOBJ) \
- $(ALL6OBJLIST) \
- ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL6LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -2860,7 +2818,7 @@ $(SHL6TARGETN) : \
$(MINGWSSTDOBJ) \
-o $@ \
-Wl,-Map,$(MISC)/$(@:b).map \
- $(MISC)/$(@:b)_exp.o \
+ $(SHL6DEF) \
$(USE_6IMPLIB) \
$(STDOBJ) \
$(SHL6VERSIONOBJ) $(SHL6OBJS) \
@@ -3331,7 +3289,7 @@ $(SHL7TARGETN) : \
.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
# GNU ld since 2.17 supports @cmdfile syntax
.IF "$(USE_DEFFILE)"!=""
- @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+ $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL7LINKFLAGS) \
$(LINKFLAGSSHL) \
$(SOLARLIB) \
@@ -3353,13 +3311,6 @@ $(SHL7TARGETN) : \
@noop $(assign DEF7OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
@noop $(foreach,i,$(DEF7OBJLIST) $(assign ALL7OBJLIST:=$(ALL7OBJLIST:s?$i??)))
.ENDIF # "$(DEFLIB7NAME)"!=""
- $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
- --dllname $(SHL7TARGET)$(DLLPOST) \
- --kill-at \
- --output-exp $(MISC)/$(@:b)_exp.o \
- $(SHL7VERSIONOBJ) \
- $(ALL7OBJLIST) \
- ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL7LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -3367,7 +3318,7 @@ $(SHL7TARGETN) : \
$(MINGWSSTDOBJ) \
-o $@ \
-Wl,-Map,$(MISC)/$(@:b).map \
- $(MISC)/$(@:b)_exp.o \
+ $(SHL7DEF) \
$(USE_7IMPLIB) \
$(STDOBJ) \
$(SHL7VERSIONOBJ) $(SHL7OBJS) \
@@ -3838,7 +3789,7 @@ $(SHL8TARGETN) : \
.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
# GNU ld since 2.17 supports @cmdfile syntax
.IF "$(USE_DEFFILE)"!=""
- @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+ $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL8LINKFLAGS) \
$(LINKFLAGSSHL) \
$(SOLARLIB) \
@@ -3860,13 +3811,6 @@ $(SHL8TARGETN) : \
@noop $(assign DEF8OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
@noop $(foreach,i,$(DEF8OBJLIST) $(assign ALL8OBJLIST:=$(ALL8OBJLIST:s?$i??)))
.ENDIF # "$(DEFLIB8NAME)"!=""
- $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
- --dllname $(SHL8TARGET)$(DLLPOST) \
- --kill-at \
- --output-exp $(MISC)/$(@:b)_exp.o \
- $(SHL8VERSIONOBJ) \
- $(ALL8OBJLIST) \
- ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL8LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -3874,7 +3818,7 @@ $(SHL8TARGETN) : \
$(MINGWSSTDOBJ) \
-o $@ \
-Wl,-Map,$(MISC)/$(@:b).map \
- $(MISC)/$(@:b)_exp.o \
+ $(SHL8DEF) \
$(USE_8IMPLIB) \
$(STDOBJ) \
$(SHL8VERSIONOBJ) $(SHL8OBJS) \
@@ -4345,7 +4289,7 @@ $(SHL9TARGETN) : \
.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
# GNU ld since 2.17 supports @cmdfile syntax
.IF "$(USE_DEFFILE)"!=""
- @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+ $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL9LINKFLAGS) \
$(LINKFLAGSSHL) \
$(SOLARLIB) \
@@ -4367,13 +4311,6 @@ $(SHL9TARGETN) : \
@noop $(assign DEF9OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
@noop $(foreach,i,$(DEF9OBJLIST) $(assign ALL9OBJLIST:=$(ALL9OBJLIST:s?$i??)))
.ENDIF # "$(DEFLIB9NAME)"!=""
- $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
- --dllname $(SHL9TARGET)$(DLLPOST) \
- --kill-at \
- --output-exp $(MISC)/$(@:b)_exp.o \
- $(SHL9VERSIONOBJ) \
- $(ALL9OBJLIST) \
- ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL9LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -4381,7 +4318,7 @@ $(SHL9TARGETN) : \
$(MINGWSSTDOBJ) \
-o $@ \
-Wl,-Map,$(MISC)/$(@:b).map \
- $(MISC)/$(@:b)_exp.o \
+ $(SHL9DEF) \
$(USE_9IMPLIB) \
$(STDOBJ) \
$(SHL9VERSIONOBJ) $(SHL9OBJS) \
@@ -4852,7 +4789,7 @@ $(SHL10TARGETN) : \
.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
# GNU ld since 2.17 supports @cmdfile syntax
.IF "$(USE_DEFFILE)"!=""
- @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+ $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL10LINKFLAGS) \
$(LINKFLAGSSHL) \
$(SOLARLIB) \
@@ -4874,13 +4811,6 @@ $(SHL10TARGETN) : \
@noop $(assign DEF10OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
@noop $(foreach,i,$(DEF10OBJLIST) $(assign ALL10OBJLIST:=$(ALL10OBJLIST:s?$i??)))
.ENDIF # "$(DEFLIB10NAME)"!=""
- $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
- --dllname $(SHL10TARGET)$(DLLPOST) \
- --kill-at \
- --output-exp $(MISC)/$(@:b)_exp.o \
- $(SHL10VERSIONOBJ) \
- $(ALL10OBJLIST) \
- ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL10LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -4888,7 +4818,7 @@ $(SHL10TARGETN) : \
$(MINGWSSTDOBJ) \
-o $@ \
-Wl,-Map,$(MISC)/$(@:b).map \
- $(MISC)/$(@:b)_exp.o \
+ $(SHL10DEF) \
$(USE_10IMPLIB) \
$(STDOBJ) \
$(SHL10VERSIONOBJ) $(SHL10OBJS) \
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index f4a0f17..4e10c6b 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -318,7 +318,7 @@ $(SHL$(TNR)TARGETN) : \
.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
# GNU ld since 2.17 supports @cmdfile syntax
.IF "$(USE_DEFFILE)"!=""
- @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+ $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL$(TNR)LINKFLAGS) \
$(LINKFLAGSSHL) \
$(SOLARLIB) \
@@ -340,13 +340,6 @@ $(SHL$(TNR)TARGETN) : \
@noop $(assign DEF$(TNR)OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
@noop $(foreach,i,$(DEF$(TNR)OBJLIST) $(assign ALL$(TNR)OBJLIST:=$(ALL$(TNR)OBJLIST:s?$i??)))
.ENDIF # "$(DEFLIB$(TNR)NAME)"!=""
- $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
- --dllname $(SHL$(TNR)TARGET)$(DLLPOST) \
- --kill-at \
- --output-exp $(MISC)/$(@:b)_exp.o \
- $(SHL$(TNR)VERSIONOBJ) \
- $(ALL$(TNR)OBJLIST) \
- ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL$(TNR)LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -354,7 +347,7 @@ $(SHL$(TNR)TARGETN) : \
$(MINGWSSTDOBJ) \
-o $@ \
-Wl,-Map,$(MISC)/$(@:b).map \
- $(MISC)/$(@:b)_exp.o \
+ $(SHL$(TNR)DEF) \
$(USE_$(TNR)IMPLIB) \
$(STDOBJ) \
$(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)OBJS) \
commit ba491a59e6a4273b77df38565b2094a8799bd10b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jun 17 23:57:17 2011 +0300
Bin pointless verbiage
diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index d474257..bb2dabe 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -94,7 +94,6 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
# libraries at runtime
@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
@strip -i -R $(MISC)/$(@:b).strip -X $@
- @ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP1RPATH) $@
.IF "$(TARGETTYPE)"=="GUI"
@@ -112,7 +111,6 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_1.cmd
.IF "$(VERBOSE)" == "TRUE"
- @ls -l $@
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
@@ -146,7 +144,6 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
@$(TYPE) $(MISC)/$(TARGET).$(@:b)_1.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_1.cmd
- @ls -l $@
.ELSE # "$(COM)" == "GCC"
.IF "$(linkinc)" == ""
$(COMMAND_ECHO)$(APP1LINKER) @$(mktmp \
@@ -303,7 +300,6 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
# libraries at runtime
@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
@strip -i -R $(MISC)/$(@:b).strip -X $@
- @ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP2RPATH) $@
.IF "$(TARGETTYPE)"=="GUI"
@@ -321,7 +317,6 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_2.cmd
.IF "$(VERBOSE)" == "TRUE"
- @ls -l $@
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
@@ -355,7 +350,6 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
@$(TYPE) $(MISC)/$(TARGET).$(@:b)_2.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_2.cmd
- @ls -l $@
.ELSE # "$(COM)" == "GCC"
.IF "$(linkinc)" == ""
$(COMMAND_ECHO)$(APP2LINKER) @$(mktmp \
@@ -512,7 +506,6 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
# libraries at runtime
@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
@strip -i -R $(MISC)/$(@:b).strip -X $@
- @ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP3RPATH) $@
.IF "$(TARGETTYPE)"=="GUI"
@@ -530,7 +523,6 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_3.cmd
.IF "$(VERBOSE)" == "TRUE"
- @ls -l $@
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
@@ -564,7 +556,6 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
@$(TYPE) $(MISC)/$(TARGET).$(@:b)_3.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_3.cmd
- @ls -l $@
.ELSE # "$(COM)" == "GCC"
.IF "$(linkinc)" == ""
$(COMMAND_ECHO)$(APP3LINKER) @$(mktmp \
@@ -721,7 +712,6 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
# libraries at runtime
@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
@strip -i -R $(MISC)/$(@:b).strip -X $@
- @ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP4RPATH) $@
.IF "$(TARGETTYPE)"=="GUI"
@@ -739,7 +729,6 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_4.cmd
.IF "$(VERBOSE)" == "TRUE"
- @ls -l $@
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
@@ -773,7 +762,6 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
@$(TYPE) $(MISC)/$(TARGET).$(@:b)_4.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_4.cmd
- @ls -l $@
.ELSE # "$(COM)" == "GCC"
.IF "$(linkinc)" == ""
$(COMMAND_ECHO)$(APP4LINKER) @$(mktmp \
@@ -930,7 +918,6 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
# libraries at runtime
@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
@strip -i -R $(MISC)/$(@:b).strip -X $@
- @ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP5RPATH) $@
.IF "$(TARGETTYPE)"=="GUI"
@@ -948,7 +935,6 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_5.cmd
.IF "$(VERBOSE)" == "TRUE"
- @ls -l $@
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
@@ -982,7 +968,6 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
@$(TYPE) $(MISC)/$(TARGET).$(@:b)_5.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_5.cmd
- @ls -l $@
.ELSE # "$(COM)" == "GCC"
.IF "$(linkinc)" == ""
$(COMMAND_ECHO)$(APP5LINKER) @$(mktmp \
@@ -1139,7 +1124,6 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
# libraries at runtime
@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
@strip -i -R $(MISC)/$(@:b).strip -X $@
- @ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP6RPATH) $@
.IF "$(TARGETTYPE)"=="GUI"
@@ -1157,7 +1141,6 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_6.cmd
.IF "$(VERBOSE)" == "TRUE"
- @ls -l $@
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
@@ -1191,7 +1174,6 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
@$(TYPE) $(MISC)/$(TARGET).$(@:b)_6.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_6.cmd
- @ls -l $@
.ELSE # "$(COM)" == "GCC"
.IF "$(linkinc)" == ""
$(COMMAND_ECHO)$(APP6LINKER) @$(mktmp \
@@ -1348,7 +1330,6 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
# libraries at runtime
@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
@strip -i -R $(MISC)/$(@:b).strip -X $@
- @ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP7RPATH) $@
.IF "$(TARGETTYPE)"=="GUI"
@@ -1366,7 +1347,6 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_7.cmd
.IF "$(VERBOSE)" == "TRUE"
- @ls -l $@
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
@@ -1400,7 +1380,6 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
@$(TYPE) $(MISC)/$(TARGET).$(@:b)_7.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_7.cmd
- @ls -l $@
.ELSE # "$(COM)" == "GCC"
.IF "$(linkinc)" == ""
$(COMMAND_ECHO)$(APP7LINKER) @$(mktmp \
@@ -1557,7 +1536,6 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
# libraries at runtime
@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
@strip -i -R $(MISC)/$(@:b).strip -X $@
- @ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP8RPATH) $@
.IF "$(TARGETTYPE)"=="GUI"
@@ -1575,7 +1553,6 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_8.cmd
.IF "$(VERBOSE)" == "TRUE"
- @ls -l $@
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
@@ -1609,7 +1586,6 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
@$(TYPE) $(MISC)/$(TARGET).$(@:b)_8.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_8.cmd
- @ls -l $@
.ELSE # "$(COM)" == "GCC"
.IF "$(linkinc)" == ""
$(COMMAND_ECHO)$(APP8LINKER) @$(mktmp \
@@ -1766,7 +1742,6 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
# libraries at runtime
@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
@strip -i -R $(MISC)/$(@:b).strip -X $@
- @ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP9RPATH) $@
.IF "$(TARGETTYPE)"=="GUI"
@@ -1784,7 +1759,6 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_9.cmd
.IF "$(VERBOSE)" == "TRUE"
- @ls -l $@
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
@@ -1818,7 +1792,6 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
@$(TYPE) $(MISC)/$(TARGET).$(@:b)_9.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_9.cmd
- @ls -l $@
.ELSE # "$(COM)" == "GCC"
.IF "$(linkinc)" == ""
$(COMMAND_ECHO)$(APP9LINKER) @$(mktmp \
@@ -1975,7 +1948,6 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
# libraries at runtime
@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
@strip -i -R $(MISC)/$(@:b).strip -X $@
- @ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP10RPATH) $@
.IF "$(TARGETTYPE)"=="GUI"
@@ -1993,7 +1965,6 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_10.cmd
.IF "$(VERBOSE)" == "TRUE"
- @ls -l $@
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
@@ -2027,7 +1998,6 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
@$(TYPE) $(MISC)/$(TARGET).$(@:b)_10.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_10.cmd
- @ls -l $@
.ELSE # "$(COM)" == "GCC"
.IF "$(linkinc)" == ""
$(COMMAND_ECHO)$(APP10LINKER) @$(mktmp \
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index bff1cb2..a6fb32d 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -123,7 +123,6 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
# libraries at runtime
@-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
@strip -i -R $(MISC)/$(@:b).strip -X $@
- @ls -l $@
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
app $(APP$(TNR)RPATH) $@
.IF "$(TARGETTYPE)"=="GUI"
@@ -141,7 +140,6 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
.IF "$(VERBOSE)" == "TRUE"
- @ls -l $@
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
@@ -175,7 +173,6 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
@$(TYPE) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
- @ls -l $@
.ELSE # "$(COM)" == "GCC"
.IF "$(linkinc)" == ""
$(COMMAND_ECHO)$(APP$(TNR)LINKER) @$(mktmp \
More information about the Libreoffice-commits
mailing list