summaryrefslogtreecommitdiff
path: root/solenv/inc
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-21 18:27:57 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-21 18:27:57 +0200
commit5012e466ce473b27b4ff6dbfab53a6c97a4041ca (patch)
tree1430faa05e0e2b2fedda8022561cfbc15a6b74f8 /solenv/inc
parent6f0156d40c3f8269d9fd6410f614755dc1bb14f4 (diff)
parent649a3a418160979179ccdfd997edb8dbf83a6d25 (diff)
resyncing to master
Diffstat (limited to 'solenv/inc')
-rw-r--r--solenv/inc/_tg_app.mk80
-rw-r--r--solenv/inc/_tg_def.mk720
-rw-r--r--solenv/inc/_tg_shl.mk210
-rw-r--r--solenv/inc/installationtest.mk4
-rw-r--r--solenv/inc/libs.mk66
-rw-r--r--solenv/inc/minor.mk4
-rw-r--r--solenv/inc/productversion.mk2
-rw-r--r--solenv/inc/pstrules.mk4
-rw-r--r--solenv/inc/rules.mk4
-rw-r--r--solenv/inc/settings.mk33
-rw-r--r--solenv/inc/target.mk6
-rw-r--r--solenv/inc/tg_app.mk8
-rw-r--r--solenv/inc/tg_compv.mk11
-rw-r--r--solenv/inc/tg_def.mk72
-rw-r--r--solenv/inc/tg_shl.mk21
-rw-r--r--solenv/inc/unitools.mk7
-rw-r--r--solenv/inc/unxgcc.mk3
-rw-r--r--solenv/inc/unxiosr.mk8
-rw-r--r--solenv/inc/wnt.mk6
19 files changed, 613 insertions, 656 deletions
diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index cf56b9c31f9c..bb2dabe62a9a 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -76,7 +76,6 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd
@-$(RM) $(MISC)/$(@:b).strip
@@ -95,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"
@@ -103,7 +101,6 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
@macosx-create-bundle $@
.ENDIF # "$(TARGETTYPE)"=="GUI"
.ELSE # "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd
@echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP1OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_1.cmd
@@ -114,7 +111,6 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_1.cmd
.IF "$(VERBOSE)" == "TRUE"
- @ls -l $@
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
@@ -132,7 +128,6 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP1LINKRES:b).rc
.ENDIF # "$(APP1LINKRES)" != ""
.IF "$(COM)" == "GCC"
- @echo mingw
.IF "$(APP1LINKRES)" != "" || "$(APP1RES)" != ""
@cat $(APP1LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP1RES)) > $(MISC)/$(@:b)_all.res
$(WINDRES) $(MISC)/$(@:b)_all.res $(APP1RESO)
@@ -144,12 +139,11 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
$(APP_LINKTYPE) $(APP1LIBSALCPPRT) \
-Wl,--start-group $(APP1STDLIBS) -Wl,--end-group $(APP1STDLIB) \
$(STDLIB1) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_1.cmd
- # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
.IF "$(VERBOSE)" == "TRUE"
@$(TYPE) $(MISC)/$(TARGET).$(@:b)_1.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_1.cmd
- @ls -l $@
.ELSE # "$(COM)" == "GCC"
.IF "$(linkinc)" == ""
$(COMMAND_ECHO)$(APP1LINKER) @$(mktmp \
@@ -288,7 +282,6 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd
@-$(RM) $(MISC)/$(@:b).strip
@@ -307,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"
@@ -315,7 +307,6 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
@macosx-create-bundle $@
.ENDIF # "$(TARGETTYPE)"=="GUI"
.ELSE # "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd
@echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP2OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_2.cmd
@@ -326,7 +317,6 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_2.cmd
.IF "$(VERBOSE)" == "TRUE"
- @ls -l $@
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
@@ -344,7 +334,6 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP2LINKRES:b).rc
.ENDIF # "$(APP2LINKRES)" != ""
.IF "$(COM)" == "GCC"
- @echo mingw
.IF "$(APP2LINKRES)" != "" || "$(APP2RES)" != ""
@cat $(APP2LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP2RES)) > $(MISC)/$(@:b)_all.res
$(WINDRES) $(MISC)/$(@:b)_all.res $(APP2RESO)
@@ -356,12 +345,11 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
$(APP_LINKTYPE) $(APP2LIBSALCPPRT) \
-Wl,--start-group $(APP2STDLIBS) -Wl,--end-group $(APP2STDLIB) \
$(STDLIB2) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_2.cmd
- # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
.IF "$(VERBOSE)" == "TRUE"
@$(TYPE) $(MISC)/$(TARGET).$(@:b)_2.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_2.cmd
- @ls -l $@
.ELSE # "$(COM)" == "GCC"
.IF "$(linkinc)" == ""
$(COMMAND_ECHO)$(APP2LINKER) @$(mktmp \
@@ -500,7 +488,6 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd
@-$(RM) $(MISC)/$(@:b).strip
@@ -519,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"
@@ -527,7 +513,6 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
@macosx-create-bundle $@
.ENDIF # "$(TARGETTYPE)"=="GUI"
.ELSE # "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd
@echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP3OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_3.cmd
@@ -538,7 +523,6 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_3.cmd
.IF "$(VERBOSE)" == "TRUE"
- @ls -l $@
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
@@ -556,7 +540,6 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP3LINKRES:b).rc
.ENDIF # "$(APP3LINKRES)" != ""
.IF "$(COM)" == "GCC"
- @echo mingw
.IF "$(APP3LINKRES)" != "" || "$(APP3RES)" != ""
@cat $(APP3LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP3RES)) > $(MISC)/$(@:b)_all.res
$(WINDRES) $(MISC)/$(@:b)_all.res $(APP3RESO)
@@ -568,12 +551,11 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
$(APP_LINKTYPE) $(APP3LIBSALCPPRT) \
-Wl,--start-group $(APP3STDLIBS) -Wl,--end-group $(APP3STDLIB) \
$(STDLIB3) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_3.cmd
- # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
.IF "$(VERBOSE)" == "TRUE"
@$(TYPE) $(MISC)/$(TARGET).$(@:b)_3.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_3.cmd
- @ls -l $@
.ELSE # "$(COM)" == "GCC"
.IF "$(linkinc)" == ""
$(COMMAND_ECHO)$(APP3LINKER) @$(mktmp \
@@ -712,7 +694,6 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd
@-$(RM) $(MISC)/$(@:b).strip
@@ -731,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 +719,6 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
@macosx-create-bundle $@
.ENDIF # "$(TARGETTYPE)"=="GUI"
.ELSE # "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd
@echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP4OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_4.cmd
@@ -750,7 +729,6 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_4.cmd
.IF "$(VERBOSE)" == "TRUE"
- @ls -l $@
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
@@ -768,7 +746,6 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP4LINKRES:b).rc
.ENDIF # "$(APP4LINKRES)" != ""
.IF "$(COM)" == "GCC"
- @echo mingw
.IF "$(APP4LINKRES)" != "" || "$(APP4RES)" != ""
@cat $(APP4LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP4RES)) > $(MISC)/$(@:b)_all.res
$(WINDRES) $(MISC)/$(@:b)_all.res $(APP4RESO)
@@ -780,12 +757,11 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
$(APP_LINKTYPE) $(APP4LIBSALCPPRT) \
-Wl,--start-group $(APP4STDLIBS) -Wl,--end-group $(APP4STDLIB) \
$(STDLIB4) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_4.cmd
- # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
.IF "$(VERBOSE)" == "TRUE"
@$(TYPE) $(MISC)/$(TARGET).$(@:b)_4.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_4.cmd
- @ls -l $@
.ELSE # "$(COM)" == "GCC"
.IF "$(linkinc)" == ""
$(COMMAND_ECHO)$(APP4LINKER) @$(mktmp \
@@ -924,7 +900,6 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd
@-$(RM) $(MISC)/$(@:b).strip
@@ -943,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"
@@ -951,7 +925,6 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
@macosx-create-bundle $@
.ENDIF # "$(TARGETTYPE)"=="GUI"
.ELSE # "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd
@echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP5OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_5.cmd
@@ -962,7 +935,6 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_5.cmd
.IF "$(VERBOSE)" == "TRUE"
- @ls -l $@
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
@@ -980,7 +952,6 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP5LINKRES:b).rc
.ENDIF # "$(APP5LINKRES)" != ""
.IF "$(COM)" == "GCC"
- @echo mingw
.IF "$(APP5LINKRES)" != "" || "$(APP5RES)" != ""
@cat $(APP5LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP5RES)) > $(MISC)/$(@:b)_all.res
$(WINDRES) $(MISC)/$(@:b)_all.res $(APP5RESO)
@@ -992,12 +963,11 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
$(APP_LINKTYPE) $(APP5LIBSALCPPRT) \
-Wl,--start-group $(APP5STDLIBS) -Wl,--end-group $(APP5STDLIB) \
$(STDLIB5) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_5.cmd
- # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
.IF "$(VERBOSE)" == "TRUE"
@$(TYPE) $(MISC)/$(TARGET).$(@:b)_5.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_5.cmd
- @ls -l $@
.ELSE # "$(COM)" == "GCC"
.IF "$(linkinc)" == ""
$(COMMAND_ECHO)$(APP5LINKER) @$(mktmp \
@@ -1136,7 +1106,6 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd
@-$(RM) $(MISC)/$(@:b).strip
@@ -1155,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"
@@ -1163,7 +1131,6 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
@macosx-create-bundle $@
.ENDIF # "$(TARGETTYPE)"=="GUI"
.ELSE # "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd
@echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP6OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_6.cmd
@@ -1174,7 +1141,6 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_6.cmd
.IF "$(VERBOSE)" == "TRUE"
- @ls -l $@
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
@@ -1192,7 +1158,6 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP6LINKRES:b).rc
.ENDIF # "$(APP6LINKRES)" != ""
.IF "$(COM)" == "GCC"
- @echo mingw
.IF "$(APP6LINKRES)" != "" || "$(APP6RES)" != ""
@cat $(APP6LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP6RES)) > $(MISC)/$(@:b)_all.res
$(WINDRES) $(MISC)/$(@:b)_all.res $(APP6RESO)
@@ -1204,12 +1169,11 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
$(APP_LINKTYPE) $(APP6LIBSALCPPRT) \
-Wl,--start-group $(APP6STDLIBS) -Wl,--end-group $(APP6STDLIB) \
$(STDLIB6) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_6.cmd
- # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
.IF "$(VERBOSE)" == "TRUE"
@$(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 +1312,6 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd
@-$(RM) $(MISC)/$(@:b).strip
@@ -1367,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"
@@ -1375,7 +1337,6 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
@macosx-create-bundle $@
.ENDIF # "$(TARGETTYPE)"=="GUI"
.ELSE # "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd
@echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP7OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_7.cmd
@@ -1386,7 +1347,6 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_7.cmd
.IF "$(VERBOSE)" == "TRUE"
- @ls -l $@
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
@@ -1404,7 +1364,6 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP7LINKRES:b).rc
.ENDIF # "$(APP7LINKRES)" != ""
.IF "$(COM)" == "GCC"
- @echo mingw
.IF "$(APP7LINKRES)" != "" || "$(APP7RES)" != ""
@cat $(APP7LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP7RES)) > $(MISC)/$(@:b)_all.res
$(WINDRES) $(MISC)/$(@:b)_all.res $(APP7RESO)
@@ -1416,12 +1375,11 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
$(APP_LINKTYPE) $(APP7LIBSALCPPRT) \
-Wl,--start-group $(APP7STDLIBS) -Wl,--end-group $(APP7STDLIB) \
$(STDLIB7) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_7.cmd
- # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
.IF "$(VERBOSE)" == "TRUE"
@$(TYPE) $(MISC)/$(TARGET).$(@:b)_7.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_7.cmd
- @ls -l $@
.ELSE # "$(COM)" == "GCC"
.IF "$(linkinc)" == ""
$(COMMAND_ECHO)$(APP7LINKER) @$(mktmp \
@@ -1560,7 +1518,6 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd
@-$(RM) $(MISC)/$(@:b).strip
@@ -1579,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"
@@ -1587,7 +1543,6 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
@macosx-create-bundle $@
.ENDIF # "$(TARGETTYPE)"=="GUI"
.ELSE # "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd
@echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP8OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_8.cmd
@@ -1598,7 +1553,6 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_8.cmd
.IF "$(VERBOSE)" == "TRUE"
- @ls -l $@
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
@@ -1616,7 +1570,6 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP8LINKRES:b).rc
.ENDIF # "$(APP8LINKRES)" != ""
.IF "$(COM)" == "GCC"
- @echo mingw
.IF "$(APP8LINKRES)" != "" || "$(APP8RES)" != ""
@cat $(APP8LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP8RES)) > $(MISC)/$(@:b)_all.res
$(WINDRES) $(MISC)/$(@:b)_all.res $(APP8RESO)
@@ -1628,12 +1581,11 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
$(APP_LINKTYPE) $(APP8LIBSALCPPRT) \
-Wl,--start-group $(APP8STDLIBS) -Wl,--end-group $(APP8STDLIB) \
$(STDLIB8) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_8.cmd
- # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
.IF "$(VERBOSE)" == "TRUE"
@$(TYPE) $(MISC)/$(TARGET).$(@:b)_8.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_8.cmd
- @ls -l $@
.ELSE # "$(COM)" == "GCC"
.IF "$(linkinc)" == ""
$(COMMAND_ECHO)$(APP8LINKER) @$(mktmp \
@@ -1772,7 +1724,6 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd
@-$(RM) $(MISC)/$(@:b).strip
@@ -1791,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"
@@ -1799,7 +1749,6 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
@macosx-create-bundle $@
.ENDIF # "$(TARGETTYPE)"=="GUI"
.ELSE # "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd
@echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP9OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_9.cmd
@@ -1810,7 +1759,6 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_9.cmd
.IF "$(VERBOSE)" == "TRUE"
- @ls -l $@
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
@@ -1828,7 +1776,6 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP9LINKRES:b).rc
.ENDIF # "$(APP9LINKRES)" != ""
.IF "$(COM)" == "GCC"
- @echo mingw
.IF "$(APP9LINKRES)" != "" || "$(APP9RES)" != ""
@cat $(APP9LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP9RES)) > $(MISC)/$(@:b)_all.res
$(WINDRES) $(MISC)/$(@:b)_all.res $(APP9RESO)
@@ -1840,12 +1787,11 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
$(APP_LINKTYPE) $(APP9LIBSALCPPRT) \
-Wl,--start-group $(APP9STDLIBS) -Wl,--end-group $(APP9STDLIB) \
$(STDLIB9) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_9.cmd
- # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
.IF "$(VERBOSE)" == "TRUE"
@$(TYPE) $(MISC)/$(TARGET).$(@:b)_9.cmd
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_9.cmd
- @ls -l $@
.ELSE # "$(COM)" == "GCC"
.IF "$(linkinc)" == ""
$(COMMAND_ECHO)$(APP9LINKER) @$(mktmp \
@@ -1984,7 +1930,6 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd
@-$(RM) $(MISC)/$(@:b).strip
@@ -2003,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"
@@ -2011,7 +1955,6 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
@macosx-create-bundle $@
.ENDIF # "$(TARGETTYPE)"=="GUI"
.ELSE # "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(TARGET).$(@:b)_10.cmd
@echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP10OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_10.cmd
@@ -2022,7 +1965,6 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
.ENDIF
@+source $(MISC)/$(TARGET).$(@:b)_10.cmd
.IF "$(VERBOSE)" == "TRUE"
- @ls -l $@
.ENDIF
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF
@@ -2040,7 +1982,6 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP10LINKRES:b).rc
.ENDIF # "$(APP10LINKRES)" != ""
.IF "$(COM)" == "GCC"
- @echo mingw
.IF "$(APP10LINKRES)" != "" || "$(APP10RES)" != ""
@cat $(APP10LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP10RES)) > $(MISC)/$(@:b)_all.res
$(WINDRES) $(MISC)/$(@:b)_all.res $(APP10RESO)
@@ -2052,12 +1993,11 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
$(APP_LINKTYPE) $(APP10LIBSALCPPRT) \
-Wl,--start-group $(APP10STDLIBS) -Wl,--end-group $(APP10STDLIB) \
$(STDLIB10) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_10.cmd
- # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
.IF "$(VERBOSE)" == "TRUE"
@$(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_def.mk b/solenv/inc/_tg_def.mk
index ea9d53ed5ea2..b0b35d8d5c99 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)dlltool --output-def $(MISC)/$(SHL1TARGET).exp --export-all-symbols \
+ $(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)dlltool --output-def $(MISC)/$(SHL2TARGET).exp --export-all-symbols \
+ $(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)dlltool --output-def $(MISC)/$(SHL3TARGET).exp --export-all-symbols \
+ $(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)dlltool --output-def $(MISC)/$(SHL4TARGET).exp --export-all-symbols \
+ $(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)dlltool --output-def $(MISC)/$(SHL5TARGET).exp --export-all-symbols \
+ $(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)dlltool --output-def $(MISC)/$(SHL6TARGET).exp --export-all-symbols \
+ $(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)dlltool --output-def $(MISC)/$(SHL7TARGET).exp --export-all-symbols \
+ $(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)dlltool --output-def $(MISC)/$(SHL8TARGET).exp --export-all-symbols \
+ $(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)dlltool --output-def $(MISC)/$(SHL9TARGET).exp --export-all-symbols \
+ $(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)dlltool --output-def $(MISC)/$(SHL10TARGET).exp --export-all-symbols \
+ $(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_shl.mk b/solenv/inc/_tg_shl.mk
index 4f1d099dbdf8..a60f9cec8a47 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -66,13 +66,15 @@ SHL1IMPLIB=i$(TARGET)_t1
USE_1IMPLIB=-implib:$(LB)/$(SHL1IMPLIB).lib
SHL1IMPLIBN=$(LB)/$(SHL1IMPLIB).lib
.ELSE
-SHL1IMPLIBN=$(LB)/lib$(SHL1IMPLIB).dll.a
USE_1IMPLIB=-Wl,--out-implib=$(SHL1IMPLIBN)
+SHL1IMPLIBN=$(LB)/lib$(SHL1IMPLIB).dll.a
.ENDIF # "$(COM)" != "GCC"
ALLTAR : $(SHL1IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_1IMPLIB_DEPS=$(LB)/$(SHL1IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL1DEF=$(SHL1DEF)
@@ -241,6 +243,10 @@ $(MISC)/%linkinc.ls:
@echo . > $@
.ENDIF # "$(linkinc)"!=""
+.IF "$(COM)" == "GCC" && "$(SHL1IMPLIBN)" != ""
+$(SHL1IMPLIBN) : $(SHL1TARGETN)
+.ENDIF
+
$(SHL1TARGETN) : \
$(SHL1OBJS)\
$(SHL1LIBS)\
@@ -284,10 +290,10 @@ $(SHL1TARGETN) : \
$(WINDRES) $(SHL1LINKRES) $(SHL1LINKRESO)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(SHL1ALLRES)"!=""
-.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
# GNU ld since 2.17 supports @cmdfile syntax
.IF "$(USE_DEFFILE)"!=""
- @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+ $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL1LINKFLAGS) \
$(LINKFLAGSSHL) \
$(SOLARLIB) \
@@ -309,13 +315,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 \
- --dllname $(SHL1TARGET)$(DLLPOST) \
- --kill-at \
- --output-exp $(MISC)/$(@:b)_exp.o \
- $(SHL1VERSIONOBJ) \
- @(ALL1OBJLIST)
- )
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL1LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -323,7 +322,7 @@ $(SHL1TARGETN) : \
$(MINGWSSTDOBJ) \
-o $@ \
-Wl,-Map,$(MISC)/$(@:b).map \
- $(MISC)/$(@:b)_exp.o \
+ $(SHL1DEF) \
$(USE_1IMPLIB) \
$(STDOBJ) \
$(SHL1VERSIONOBJ) $(SHL1OBJS) \
@@ -571,13 +570,15 @@ SHL2IMPLIB=i$(TARGET)_t2
USE_2IMPLIB=-implib:$(LB)/$(SHL2IMPLIB).lib
SHL2IMPLIBN=$(LB)/$(SHL2IMPLIB).lib
.ELSE
-SHL2IMPLIBN=$(LB)/lib$(SHL2IMPLIB).dll.a
USE_2IMPLIB=-Wl,--out-implib=$(SHL2IMPLIBN)
+SHL2IMPLIBN=$(LB)/lib$(SHL2IMPLIB).dll.a
.ENDIF # "$(COM)" != "GCC"
ALLTAR : $(SHL2IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_2IMPLIB_DEPS=$(LB)/$(SHL2IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL2DEF=$(SHL2DEF)
@@ -746,6 +747,10 @@ $(MISC)/%linkinc.ls:
@echo . > $@
.ENDIF # "$(linkinc)"!=""
+.IF "$(COM)" == "GCC" && "$(SHL2IMPLIBN)" != ""
+$(SHL2IMPLIBN) : $(SHL2TARGETN)
+.ENDIF
+
$(SHL2TARGETN) : \
$(SHL2OBJS)\
$(SHL2LIBS)\
@@ -789,10 +794,10 @@ $(SHL2TARGETN) : \
$(WINDRES) $(SHL2LINKRES) $(SHL2LINKRESO)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(SHL2ALLRES)"!=""
-.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
# GNU ld since 2.17 supports @cmdfile syntax
.IF "$(USE_DEFFILE)"!=""
- @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+ $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL2LINKFLAGS) \
$(LINKFLAGSSHL) \
$(SOLARLIB) \
@@ -814,13 +819,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 \
- --dllname $(SHL2TARGET)$(DLLPOST) \
- --kill-at \
- --output-exp $(MISC)/$(@:b)_exp.o \
- $(SHL2VERSIONOBJ) \
- @(ALL2OBJLIST)
- )
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL2LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -828,7 +826,7 @@ $(SHL2TARGETN) : \
$(MINGWSSTDOBJ) \
-o $@ \
-Wl,-Map,$(MISC)/$(@:b).map \
- $(MISC)/$(@:b)_exp.o \
+ $(SHL2DEF) \
$(USE_2IMPLIB) \
$(STDOBJ) \
$(SHL2VERSIONOBJ) $(SHL2OBJS) \
@@ -1076,13 +1074,15 @@ SHL3IMPLIB=i$(TARGET)_t3
USE_3IMPLIB=-implib:$(LB)/$(SHL3IMPLIB).lib
SHL3IMPLIBN=$(LB)/$(SHL3IMPLIB).lib
.ELSE
-SHL3IMPLIBN=$(LB)/lib$(SHL3IMPLIB).dll.a
USE_3IMPLIB=-Wl,--out-implib=$(SHL3IMPLIBN)
+SHL3IMPLIBN=$(LB)/lib$(SHL3IMPLIB).dll.a
.ENDIF # "$(COM)" != "GCC"
ALLTAR : $(SHL3IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_3IMPLIB_DEPS=$(LB)/$(SHL3IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL3DEF=$(SHL3DEF)
@@ -1251,6 +1251,10 @@ $(MISC)/%linkinc.ls:
@echo . > $@
.ENDIF # "$(linkinc)"!=""
+.IF "$(COM)" == "GCC" && "$(SHL3IMPLIBN)" != ""
+$(SHL3IMPLIBN) : $(SHL3TARGETN)
+.ENDIF
+
$(SHL3TARGETN) : \
$(SHL3OBJS)\
$(SHL3LIBS)\
@@ -1294,10 +1298,10 @@ $(SHL3TARGETN) : \
$(WINDRES) $(SHL3LINKRES) $(SHL3LINKRESO)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(SHL3ALLRES)"!=""
-.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
# GNU ld since 2.17 supports @cmdfile syntax
.IF "$(USE_DEFFILE)"!=""
- @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+ $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL3LINKFLAGS) \
$(LINKFLAGSSHL) \
$(SOLARLIB) \
@@ -1319,13 +1323,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 \
- --dllname $(SHL3TARGET)$(DLLPOST) \
- --kill-at \
- --output-exp $(MISC)/$(@:b)_exp.o \
- $(SHL3VERSIONOBJ) \
- @(ALL3OBJLIST)
- )
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL3LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -1333,7 +1330,7 @@ $(SHL3TARGETN) : \
$(MINGWSSTDOBJ) \
-o $@ \
-Wl,-Map,$(MISC)/$(@:b).map \
- $(MISC)/$(@:b)_exp.o \
+ $(SHL3DEF) \
$(USE_3IMPLIB) \
$(STDOBJ) \
$(SHL3VERSIONOBJ) $(SHL3OBJS) \
@@ -1581,13 +1578,15 @@ SHL4IMPLIB=i$(TARGET)_t4
USE_4IMPLIB=-implib:$(LB)/$(SHL4IMPLIB).lib
SHL4IMPLIBN=$(LB)/$(SHL4IMPLIB).lib
.ELSE
-SHL4IMPLIBN=$(LB)/lib$(SHL4IMPLIB).dll.a
USE_4IMPLIB=-Wl,--out-implib=$(SHL4IMPLIBN)
+SHL4IMPLIBN=$(LB)/lib$(SHL4IMPLIB).dll.a
.ENDIF # "$(COM)" != "GCC"
ALLTAR : $(SHL4IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_4IMPLIB_DEPS=$(LB)/$(SHL4IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL4DEF=$(SHL4DEF)
@@ -1756,6 +1755,10 @@ $(MISC)/%linkinc.ls:
@echo . > $@
.ENDIF # "$(linkinc)"!=""
+.IF "$(COM)" == "GCC" && "$(SHL4IMPLIBN)" != ""
+$(SHL4IMPLIBN) : $(SHL4TARGETN)
+.ENDIF
+
$(SHL4TARGETN) : \
$(SHL4OBJS)\
$(SHL4LIBS)\
@@ -1799,10 +1802,10 @@ $(SHL4TARGETN) : \
$(WINDRES) $(SHL4LINKRES) $(SHL4LINKRESO)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(SHL4ALLRES)"!=""
-.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
# GNU ld since 2.17 supports @cmdfile syntax
.IF "$(USE_DEFFILE)"!=""
- @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+ $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL4LINKFLAGS) \
$(LINKFLAGSSHL) \
$(SOLARLIB) \
@@ -1824,13 +1827,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 \
- --dllname $(SHL4TARGET)$(DLLPOST) \
- --kill-at \
- --output-exp $(MISC)/$(@:b)_exp.o \
- $(SHL4VERSIONOBJ) \
- @(ALL4OBJLIST)
- )
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL4LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -1838,7 +1834,7 @@ $(SHL4TARGETN) : \
$(MINGWSSTDOBJ) \
-o $@ \
-Wl,-Map,$(MISC)/$(@:b).map \
- $(MISC)/$(@:b)_exp.o \
+ $(SHL4DEF) \
$(USE_4IMPLIB) \
$(STDOBJ) \
$(SHL4VERSIONOBJ) $(SHL4OBJS) \
@@ -2086,13 +2082,15 @@ SHL5IMPLIB=i$(TARGET)_t5
USE_5IMPLIB=-implib:$(LB)/$(SHL5IMPLIB).lib
SHL5IMPLIBN=$(LB)/$(SHL5IMPLIB).lib
.ELSE
-SHL5IMPLIBN=$(LB)/lib$(SHL5IMPLIB).dll.a
USE_5IMPLIB=-Wl,--out-implib=$(SHL5IMPLIBN)
+SHL5IMPLIBN=$(LB)/lib$(SHL5IMPLIB).dll.a
.ENDIF # "$(COM)" != "GCC"
ALLTAR : $(SHL5IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_5IMPLIB_DEPS=$(LB)/$(SHL5IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL5DEF=$(SHL5DEF)
@@ -2261,6 +2259,10 @@ $(MISC)/%linkinc.ls:
@echo . > $@
.ENDIF # "$(linkinc)"!=""
+.IF "$(COM)" == "GCC" && "$(SHL5IMPLIBN)" != ""
+$(SHL5IMPLIBN) : $(SHL5TARGETN)
+.ENDIF
+
$(SHL5TARGETN) : \
$(SHL5OBJS)\
$(SHL5LIBS)\
@@ -2304,10 +2306,10 @@ $(SHL5TARGETN) : \
$(WINDRES) $(SHL5LINKRES) $(SHL5LINKRESO)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(SHL5ALLRES)"!=""
-.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
# GNU ld since 2.17 supports @cmdfile syntax
.IF "$(USE_DEFFILE)"!=""
- @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+ $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL5LINKFLAGS) \
$(LINKFLAGSSHL) \
$(SOLARLIB) \
@@ -2329,13 +2331,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 \
- --dllname $(SHL5TARGET)$(DLLPOST) \
- --kill-at \
- --output-exp $(MISC)/$(@:b)_exp.o \
- $(SHL5VERSIONOBJ) \
- @(ALL5OBJLIST)
- )
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL5LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -2343,7 +2338,7 @@ $(SHL5TARGETN) : \
$(MINGWSSTDOBJ) \
-o $@ \
-Wl,-Map,$(MISC)/$(@:b).map \
- $(MISC)/$(@:b)_exp.o \
+ $(SHL5DEF) \
$(USE_5IMPLIB) \
$(STDOBJ) \
$(SHL5VERSIONOBJ) $(SHL5OBJS) \
@@ -2591,13 +2586,15 @@ SHL6IMPLIB=i$(TARGET)_t6
USE_6IMPLIB=-implib:$(LB)/$(SHL6IMPLIB).lib
SHL6IMPLIBN=$(LB)/$(SHL6IMPLIB).lib
.ELSE
-SHL6IMPLIBN=$(LB)/lib$(SHL6IMPLIB).dll.a
USE_6IMPLIB=-Wl,--out-implib=$(SHL6IMPLIBN)
+SHL6IMPLIBN=$(LB)/lib$(SHL6IMPLIB).dll.a
.ENDIF # "$(COM)" != "GCC"
ALLTAR : $(SHL6IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_6IMPLIB_DEPS=$(LB)/$(SHL6IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL6DEF=$(SHL6DEF)
@@ -2766,6 +2763,10 @@ $(MISC)/%linkinc.ls:
@echo . > $@
.ENDIF # "$(linkinc)"!=""
+.IF "$(COM)" == "GCC" && "$(SHL6IMPLIBN)" != ""
+$(SHL6IMPLIBN) : $(SHL6TARGETN)
+.ENDIF
+
$(SHL6TARGETN) : \
$(SHL6OBJS)\
$(SHL6LIBS)\
@@ -2809,10 +2810,10 @@ $(SHL6TARGETN) : \
$(WINDRES) $(SHL6LINKRES) $(SHL6LINKRESO)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(SHL6ALLRES)"!=""
-.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
# GNU ld since 2.17 supports @cmdfile syntax
.IF "$(USE_DEFFILE)"!=""
- @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+ $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL6LINKFLAGS) \
$(LINKFLAGSSHL) \
$(SOLARLIB) \
@@ -2834,13 +2835,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 \
- --dllname $(SHL6TARGET)$(DLLPOST) \
- --kill-at \
- --output-exp $(MISC)/$(@:b)_exp.o \
- $(SHL6VERSIONOBJ) \
- @(ALL6OBJLIST)
- )
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL6LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -2848,7 +2842,7 @@ $(SHL6TARGETN) : \
$(MINGWSSTDOBJ) \
-o $@ \
-Wl,-Map,$(MISC)/$(@:b).map \
- $(MISC)/$(@:b)_exp.o \
+ $(SHL6DEF) \
$(USE_6IMPLIB) \
$(STDOBJ) \
$(SHL6VERSIONOBJ) $(SHL6OBJS) \
@@ -3096,13 +3090,15 @@ SHL7IMPLIB=i$(TARGET)_t7
USE_7IMPLIB=-implib:$(LB)/$(SHL7IMPLIB).lib
SHL7IMPLIBN=$(LB)/$(SHL7IMPLIB).lib
.ELSE
-SHL7IMPLIBN=$(LB)/lib$(SHL7IMPLIB).dll.a
USE_7IMPLIB=-Wl,--out-implib=$(SHL7IMPLIBN)
+SHL7IMPLIBN=$(LB)/lib$(SHL7IMPLIB).dll.a
.ENDIF # "$(COM)" != "GCC"
ALLTAR : $(SHL7IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_7IMPLIB_DEPS=$(LB)/$(SHL7IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL7DEF=$(SHL7DEF)
@@ -3271,6 +3267,10 @@ $(MISC)/%linkinc.ls:
@echo . > $@
.ENDIF # "$(linkinc)"!=""
+.IF "$(COM)" == "GCC" && "$(SHL7IMPLIBN)" != ""
+$(SHL7IMPLIBN) : $(SHL7TARGETN)
+.ENDIF
+
$(SHL7TARGETN) : \
$(SHL7OBJS)\
$(SHL7LIBS)\
@@ -3314,10 +3314,10 @@ $(SHL7TARGETN) : \
$(WINDRES) $(SHL7LINKRES) $(SHL7LINKRESO)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(SHL7ALLRES)"!=""
-.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
# GNU ld since 2.17 supports @cmdfile syntax
.IF "$(USE_DEFFILE)"!=""
- @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+ $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL7LINKFLAGS) \
$(LINKFLAGSSHL) \
$(SOLARLIB) \
@@ -3339,13 +3339,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 \
- --dllname $(SHL7TARGET)$(DLLPOST) \
- --kill-at \
- --output-exp $(MISC)/$(@:b)_exp.o \
- $(SHL7VERSIONOBJ) \
- @(ALL7OBJLIST)
- )
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL7LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -3353,7 +3346,7 @@ $(SHL7TARGETN) : \
$(MINGWSSTDOBJ) \
-o $@ \
-Wl,-Map,$(MISC)/$(@:b).map \
- $(MISC)/$(@:b)_exp.o \
+ $(SHL7DEF) \
$(USE_7IMPLIB) \
$(STDOBJ) \
$(SHL7VERSIONOBJ) $(SHL7OBJS) \
@@ -3601,13 +3594,15 @@ SHL8IMPLIB=i$(TARGET)_t8
USE_8IMPLIB=-implib:$(LB)/$(SHL8IMPLIB).lib
SHL8IMPLIBN=$(LB)/$(SHL8IMPLIB).lib
.ELSE
-SHL8IMPLIBN=$(LB)/lib$(SHL8IMPLIB).dll.a
USE_8IMPLIB=-Wl,--out-implib=$(SHL8IMPLIBN)
+SHL8IMPLIBN=$(LB)/lib$(SHL8IMPLIB).dll.a
.ENDIF # "$(COM)" != "GCC"
ALLTAR : $(SHL8IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_8IMPLIB_DEPS=$(LB)/$(SHL8IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL8DEF=$(SHL8DEF)
@@ -3776,6 +3771,10 @@ $(MISC)/%linkinc.ls:
@echo . > $@
.ENDIF # "$(linkinc)"!=""
+.IF "$(COM)" == "GCC" && "$(SHL8IMPLIBN)" != ""
+$(SHL8IMPLIBN) : $(SHL8TARGETN)
+.ENDIF
+
$(SHL8TARGETN) : \
$(SHL8OBJS)\
$(SHL8LIBS)\
@@ -3819,10 +3818,10 @@ $(SHL8TARGETN) : \
$(WINDRES) $(SHL8LINKRES) $(SHL8LINKRESO)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(SHL8ALLRES)"!=""
-.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
# GNU ld since 2.17 supports @cmdfile syntax
.IF "$(USE_DEFFILE)"!=""
- @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+ $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL8LINKFLAGS) \
$(LINKFLAGSSHL) \
$(SOLARLIB) \
@@ -3844,13 +3843,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 \
- --dllname $(SHL8TARGET)$(DLLPOST) \
- --kill-at \
- --output-exp $(MISC)/$(@:b)_exp.o \
- $(SHL8VERSIONOBJ) \
- @(ALL8OBJLIST)
- )
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL8LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -3858,7 +3850,7 @@ $(SHL8TARGETN) : \
$(MINGWSSTDOBJ) \
-o $@ \
-Wl,-Map,$(MISC)/$(@:b).map \
- $(MISC)/$(@:b)_exp.o \
+ $(SHL8DEF) \
$(USE_8IMPLIB) \
$(STDOBJ) \
$(SHL8VERSIONOBJ) $(SHL8OBJS) \
@@ -4106,13 +4098,15 @@ SHL9IMPLIB=i$(TARGET)_t9
USE_9IMPLIB=-implib:$(LB)/$(SHL9IMPLIB).lib
SHL9IMPLIBN=$(LB)/$(SHL9IMPLIB).lib
.ELSE
-SHL9IMPLIBN=$(LB)/lib$(SHL9IMPLIB).dll.a
USE_9IMPLIB=-Wl,--out-implib=$(SHL9IMPLIBN)
+SHL9IMPLIBN=$(LB)/lib$(SHL9IMPLIB).dll.a
.ENDIF # "$(COM)" != "GCC"
ALLTAR : $(SHL9IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_9IMPLIB_DEPS=$(LB)/$(SHL9IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL9DEF=$(SHL9DEF)
@@ -4281,6 +4275,10 @@ $(MISC)/%linkinc.ls:
@echo . > $@
.ENDIF # "$(linkinc)"!=""
+.IF "$(COM)" == "GCC" && "$(SHL9IMPLIBN)" != ""
+$(SHL9IMPLIBN) : $(SHL9TARGETN)
+.ENDIF
+
$(SHL9TARGETN) : \
$(SHL9OBJS)\
$(SHL9LIBS)\
@@ -4324,10 +4322,10 @@ $(SHL9TARGETN) : \
$(WINDRES) $(SHL9LINKRES) $(SHL9LINKRESO)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(SHL9ALLRES)"!=""
-.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
# GNU ld since 2.17 supports @cmdfile syntax
.IF "$(USE_DEFFILE)"!=""
- @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+ $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL9LINKFLAGS) \
$(LINKFLAGSSHL) \
$(SOLARLIB) \
@@ -4349,13 +4347,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 \
- --dllname $(SHL9TARGET)$(DLLPOST) \
- --kill-at \
- --output-exp $(MISC)/$(@:b)_exp.o \
- $(SHL9VERSIONOBJ) \
- @(ALL9OBJLIST)
- )
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL9LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -4363,7 +4354,7 @@ $(SHL9TARGETN) : \
$(MINGWSSTDOBJ) \
-o $@ \
-Wl,-Map,$(MISC)/$(@:b).map \
- $(MISC)/$(@:b)_exp.o \
+ $(SHL9DEF) \
$(USE_9IMPLIB) \
$(STDOBJ) \
$(SHL9VERSIONOBJ) $(SHL9OBJS) \
@@ -4611,13 +4602,15 @@ SHL10IMPLIB=i$(TARGET)_t10
USE_10IMPLIB=-implib:$(LB)/$(SHL10IMPLIB).lib
SHL10IMPLIBN=$(LB)/$(SHL10IMPLIB).lib
.ELSE
-SHL10IMPLIBN=$(LB)/lib$(SHL10IMPLIB).dll.a
USE_10IMPLIB=-Wl,--out-implib=$(SHL10IMPLIBN)
+SHL10IMPLIBN=$(LB)/lib$(SHL10IMPLIB).dll.a
.ENDIF # "$(COM)" != "GCC"
ALLTAR : $(SHL10IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_10IMPLIB_DEPS=$(LB)/$(SHL10IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL10DEF=$(SHL10DEF)
@@ -4786,6 +4779,10 @@ $(MISC)/%linkinc.ls:
@echo . > $@
.ENDIF # "$(linkinc)"!=""
+.IF "$(COM)" == "GCC" && "$(SHL10IMPLIBN)" != ""
+$(SHL10IMPLIBN) : $(SHL10TARGETN)
+.ENDIF
+
$(SHL10TARGETN) : \
$(SHL10OBJS)\
$(SHL10LIBS)\
@@ -4829,10 +4826,10 @@ $(SHL10TARGETN) : \
$(WINDRES) $(SHL10LINKRES) $(SHL10LINKRESO)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(SHL10ALLRES)"!=""
-.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
# GNU ld since 2.17 supports @cmdfile syntax
.IF "$(USE_DEFFILE)"!=""
- @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
+ $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL10LINKFLAGS) \
$(LINKFLAGSSHL) \
$(SOLARLIB) \
@@ -4854,13 +4851,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 \
- --dllname $(SHL10TARGET)$(DLLPOST) \
- --kill-at \
- --output-exp $(MISC)/$(@:b)_exp.o \
- $(SHL10VERSIONOBJ) \
- @(ALL10OBJLIST)
- )
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL10LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -4868,7 +4858,7 @@ $(SHL10TARGETN) : \
$(MINGWSSTDOBJ) \
-o $@ \
-Wl,-Map,$(MISC)/$(@:b).map \
- $(MISC)/$(@:b)_exp.o \
+ $(SHL10DEF) \
$(USE_10IMPLIB) \
$(STDOBJ) \
$(SHL10VERSIONOBJ) $(SHL10OBJS) \
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index bc4baa85bb12..69e57381da1c 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -46,10 +46,10 @@ my_file = file://
.END
# The following conditional is an approximation of: UPDATER set to YES and
-# SHIPDRIVE set and CWS_WORK_STAMP not set and either SOL_TMP not set or
+# SHIPDRIVE set and either SOL_TMP not set or
# SOLARENV set to a pathname of which SOL_TMP is not a prefix:
.IF "$(UPDATER)" == "YES" && "$(SHIPDRIVE)" != "" && \
- "$(CWS_WORK_STAMP)" == "" && "$(SOLARENV:s/$(SOL_TMP)//" == "$(SOLARENV)"
+ "$(SOLARENV:s/$(SOL_TMP)//" == "$(SOLARENV)"
my_instsets = $(shell ls -dt \
$(SHIPDRIVE)/$(INPATH)/LibreOffice/archive/$(WORK_STAMP)_$(LAST_MINOR)_native_packed-*_$(defaultlangiso).$(BUILD))
installationtest_instset = $(my_instsets:1)
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 0d1a7b00e334..baa847365f6d 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -34,17 +34,14 @@ LIBSMKREV!:="$$Revision: 1.134.2.3 $$"
.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
-# No ODMA on UNX
-ODMA_LIB_LIB=
+.IF "$(GUI)" == "WNT"
+ODMA_LIB_LIB=-lodma_lib
+.ENDIF
#
#externe libs in plattform.mk
#
-.IF "$(GUI)$(COM)"=="WNTGCC"
-AWTLIB*=$(JAVA_HOME)/lib/jawt.lib
-.ELSE # "$(GUI)$(COM)"=="WNTGCC"
AWTLIB*=-ljawt
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
AVMEDIALIB=-lavmedia$(DLLPOSTFIX)
.IF "$(GUI)$(COM)"=="WNTGCC" && "$(SYSTEM_ICU)"!="YES"
ICUINLIB=-licuin$(ICU_MAJOR)$(ICU_MINOR)
@@ -69,13 +66,8 @@ LDAPBERLIB=-lldapber
TOOLSLIBST=-latools
BPICONVLIB=-lbpiconv
TOOLSLIB=-ltl$(DLLPOSTFIX)
-.IF "$(GUI)$(COM)"=="WNTGCC"
-CPPULIB=-lcppu$(UDK_MAJOR)
-CPPUHELPERLIB=-lcppuhelper$(UDK_MAJOR)$(COMID)
-.ELSE # "$(GUI)$(COM)"=="WNTGCC"
CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID)
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
UCBHELPERLIB=-lucbhelper4$(COMID)
.IF "$(SYSTEM_OPENSSL)" == "YES"
OPENSSLLIB=$(OPENSSL_LIBS)
@@ -88,20 +80,11 @@ OPENSSLLIBST=-lssl_static -lcrypto_static
OPENSSLLIBST=$(STATIC) -lssl -lcrypto $(DYNAMIC)
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
.ENDIF # "$(SYSTEM_OPENSSL)" == "YES"
-.IF "$(GUI)$(COM)"=="WNTGCC"
-REGLIB=-lreg$(UDK_MAJOR)
-.ELSE # "$(GUI)$(COM)"=="WNTGCC"
REGLIB=-lreg
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
XMLOFFLIB=-lxo$(DLLPOSTFIX)
XMLOFFLLIB=-lxol
-.IF "$(GUI)$(COM)"=="WNTGCC"
-STORELIB=-lstore$(UDK_MAJOR)
-SALLIB=-luno_sal$(UDK_MAJOR)
-.ELSE # "$(GUI)$(COM)"=="WNTGCC"
STORELIB=-lstore
SALLIB=-luno_sal
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
ODBCLIB=-lodbc$(DLLPOSTFIX)
ODBCBASELIB=-lodbcbase$(DLLPOSTFIX)
DBFILELIB=-lfile$(DLLPOSTFIX)
@@ -248,30 +231,18 @@ ISCLIB=-lsc$(DLLPOSTFIX)
ISDLIB=-lsd$(DLLPOSTFIX)
PKGCHKLIB=-lpkgchk$(DLLPOSTFIX)
HELPLINKERLIB=-lhelplinker$(DLLPOSTFIX)
-.IF "$(GUI)$(COM)"=="WNTGCC"
-JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID)
-.ELSE # "$(GUI)$(COM)"=="WNTGCC"
JVMACCESSLIB = -ljvmaccess$(COMID)
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
-.IF "$(OS)" == "WNT"
-CPPUNITLIB = -lcygcppunit-1-12-1
-.ELSE
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CPPUNITLIB = $(CPPUNIT_LIBS)
.ELSE
CPPUNITLIB = -lcppunit
.ENDIF
-.ENDIF
.IF "$(SYSTEM_LIBXSLT)"=="YES"
XSLTLIB=$(LIBXSLT_LIBS)
.ELSE
XSLTLIB=-lxslt $(LIBXML2LIB)
.ENDIF
-.IF "$(GUI)$(COM)"=="WNTGCC"
-JVMFWKLIB = -ljvmfwk$(UDK_MAJOR)
-.ELSE # "$(GUI)$(COM)"=="WNTGCC"
JVMFWKLIB = -ljvmfwk
-.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
.IF "$(SYSTEM_REDLAND)"=="YES"
REDLANDLIB=$(REDLAND_LIBS)
.ELSE
@@ -327,7 +298,7 @@ ULINGULIB=-lulingu
.IF "$(SYSTEM_HUNSPELL)" == "YES"
HUNSPELLLIB=$(HUNSPELL_LIBS)
.ELSE
-HUNSPELLLIB=-lhunspell-1.2
+HUNSPELLLIB=-lhunspell-1.3
.ENDIF
.IF "$(SYSTEM_MYTHES)" == "YES"
MYTHESLIB=$(MYTHES_LIBS)
@@ -341,6 +312,35 @@ UNOPKGAPPLIB=-lunopkgapp
TESTLIB=-ltest
XMLREADERLIB=-lxmlreader
+.IF "$(OS)" == "IOS"
+
+# As we build static libraries for iOS, we append to each library its
+# dependencies, recursively. Start from the bottom of the dependency
+# stack. This is experimental and obviously incomplete.
+
+UCBHELPERLIB+=$(SALHELPERLIB)
+
+UNOTOOLSLIB+=$(I18NISOLANGLIB)
+UNOTOOLSLIB+=$(UCBHELPERLIB)
+
+TOOLSLIB+=$(BASEGFXLIB)
+TOOLSLIB+=$(ZLIB3RDLIB)
+
+VCLLIB+=$(ICUUCLIB)
+
+.ENDIF
+
+.IF "$(OS)" == "ANDROID"
+
+# Some of the external libraries get built as static libraries for
+# Android, mostly by accident, because we haven't bothered fixing up
+# their configury to realize that it would work to build shared
+# libraries.
+
+CURLLIB+=$(ZLIB3RDLIB)
+
+.ENDIF
+
.ELSE # ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
ODMA_LIB_LIB=odma_lib.lib
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 38646f16b5b3..c4403f37ae39 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=350
-RSCREVISION=350m1(Build:1)
-BUILD=1
+RSCREVISION=350m1(Build:0)
+BUILD=0
LAST_MINOR=m1
SOURCEVERSION=OOO350
diff --git a/solenv/inc/productversion.mk b/solenv/inc/productversion.mk
index 15ea3085f0e7..fc5ffcdd5382 100644
--- a/solenv/inc/productversion.mk
+++ b/solenv/inc/productversion.mk
@@ -28,5 +28,5 @@
PRODUCTLIST = libreoffice oxygenoffice
# default values to minimize maintainance effort
-PRODUCTVERSION = 3.4
+PRODUCTVERSION = 3.5
PRODUCTVERSIONSHORT = 3
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk
index 9dd6cc1963c4..1669a2511d7a 100644
--- a/solenv/inc/pstrules.mk
+++ b/solenv/inc/pstrules.mk
@@ -135,7 +135,11 @@ $(PAR)/%.par :
@echo "Making: " $@
@@-$(MKDIR) $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}
.IF "$(GUI)"=="WNT"
+.IF "$(CROSS_COMPILING)" == "NO"
$(COMMAND_ECHO)$(CPPLCC) -+ -P $(INCLUDE) $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
+.ELSE
+ $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I#$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre
+.ENDIF
.ENDIF
# YD: INCLUDE macro too long, include only few items (scp2 compile)
.IF "$(GUI)"=="UNX"
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 0ff659c7ec1b..ca816d8e664b 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -97,8 +97,8 @@ $(OBJ)/%.obj : %.cc
PCHOUTDIR=$(SLO)/pch
PCHEXOUTDIR=$(SLO)/pch_ex
.ELSE # "$(NETWORK_BUILD)"==""
-PCHOUTDIR=$(TMP)/$(BUILD)$(CWS_WORK_STAMP)$(PRJNAME)$(PROEXT)
-PCHEXOUTDIR=$(TMP)/$(BUILD)$(CWS_WORK_STAMP)$(PRJNAME)_ex$(PROEXT)
+PCHOUTDIR=$(TMP)/$(BUILD)$(PRJNAME)$(PROEXT)
+PCHEXOUTDIR=$(TMP)/$(BUILD)$(PRJNAME)_ex$(PROEXT)
.ENDIF # "$(NETWORK_BUILD)"==""
$(SLO)/precompiled.% .PHONY:
-$(MKDIRHIER) $(SLO)/pch
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index e44458fc99a7..352b8503b5ec 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -57,7 +57,7 @@ NETWORK_BUILD:=TRUE
PLATFORMID = $(RTL_OS:l)_$(RTL_ARCH:l)
EXTNAME*=$(EXTENSIONNAME)_in
-.IF "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!=""
+.IF "$(UPDATER)"!=""
.IF "$(SOURCEVERSION)"!="$(WORK_STAMP)"
.ERROR : ; @echo Forced error: minor.mk in solenv/inc does not match your version!
@@ -69,7 +69,7 @@ WRONG_SOURCEVERSION
@@-$(MKDIRHIER) $(SOLARVERSION)/$(INPATH)/inc
@@$(COPY) $(SOLARENV)/inc/minor.mk $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk
@@$(TOUCH) $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg
-.ENDIF # "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!=""
+.ENDIF # "$(UPDATER)"!=""
# Force creation of $(SOLARVERSION)/$(INPATH)/inc/
# $(UPD)minor.mk could be empty as it's contents were already included from minor.mk
@@ -1005,16 +1005,32 @@ LNTFLAGSOUTOBJ=-os
DLLPOSTFIX=lo
+.IF "$(CROSS_COMPILING)" == "YES"
+# Assume always cross-compiling from Unix
+EXECPOST_FOR_BUILD=
+.ELSE
+EXECPOST_FOR_BUILD=$(EXECPOST)
+.ENDIF
+
.IF "$(OOO_LIBRARY_PATH_VAR)" != ""
# Add SOLARLIBDIR at the begin of a (potentially previously undefined) library
# path (LD_LIBRARY_PATH, PATH, etc.; prepending avoids fetching libraries from
# 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
@@ -1032,6 +1048,8 @@ VALGRINDTOOL=valgrind --tool=$(VALGRIND) --num-callers=50
VALGRINDTOOL+=--leak-check=yes
G_SLICE*:=always-malloc
.EXPORT : G_SLICE
+GLIBCXX_FORCE_NEW*:=1
+.EXPORT : GLIBCXX_FORCE_NEW
.ENDIF
.ENDIF
@@ -1053,7 +1071,11 @@ CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/climaker
GDBCPPUNITTRACE=$(GDBTRACE)
.ENDIF
+.IF "$(CROSS_COMPILING)" == "YES"
+CPPUNITTESTER=\#
+.ELSE
CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBCPPUNITTRACE) $(VALGRINDTOOL) $(SOLARBINDIR)/cppunit/cppunittester
+.ENDIF
HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/helpex
LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/lngconvex
HELPLINKER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/HelpLinker
@@ -1070,7 +1092,14 @@ JAVA*:=$(JAVAINTERPRETER)
SCPCOMP=$(PERL) $(SOLARENV)/bin/pre2par.pl
SCPLINK=$(PERL) $(SOLARENV)/bin/par2script.pl
LZIP*=lzip
+
+# Note that $(CPPLCC) is oddly enough only used when $(OS)==WNT, see pstrules.mk.
+# For the BUILD platform when cross-compiling (always Unix), it is called cpp.lcc
+.IF "$(CROSS_COMPILING)" == "YES"
+CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc
+.ELSE
CPPLCC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpplcc
+.ENDIF
.IF "$(DISABLE_ENHANCED_COMID)"==""
.INCLUDE : tg_compv.mk
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index ed4a7b9c7566..4ef0a232a1f7 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -49,7 +49,7 @@ INCEXT*=.
INCPRE*=.
INCPOST*=.
.IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
-UNOINCLUDES=$(SOLARINCDIR)/offuh
+UNOINCLUDES=$(SOLARINCDIR)/udkapi -I$(SOLARINCDIR)/offapi -I$(SOLARINCDIR)/oovbaapi
.ENDIF # "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
SOLARINC+=$(JDKINCS)
# make sure INCLUDE isn't set
@@ -1417,7 +1417,7 @@ $(SCP_PRODUCT_TYPE):
$(TOUCH) $@
.IF "$(COMPVERMK)"!=""
-.IF "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!=""
+.IF "$(UPDATER)"!=""
.IF "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)"
COMPVERMK_PHONY:=.PHONY
.ENDIF # "$(COMPATH:s!\!/!)"!="$(COMPATH_STORED)"
@@ -1444,7 +1444,7 @@ COMPVTMP:=$(mktmp iii)
.ENDIF # "$(CCNUMVER)"!=""
.ENDIF # "$(COMPVERMK)"!=""
-.ENDIF # "$(UPDATER)"!="" || "$(CWS_WORK_STAMP)"!=""
+.ENDIF # "$(UPDATER)"!=""
.IF "$(JAVAVERMK)"!=""
.IF "$(JAVALOCATION)"!="$(JAVA_HOME)"
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index cd9d44424369..a6fb32df1ac0 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -105,7 +105,6 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
@echo "Making: " $(@:f)
.IF "$(GUI)"=="UNX"
.IF "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(@:b).list
@-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
@-$(RM) $(MISC)/$(@:b).strip
@@ -124,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"
@@ -132,7 +130,6 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
@macosx-create-bundle $@
.ENDIF # "$(TARGETTYPE)"=="GUI"
.ELSE # "$(OS)"=="MACOSX"
- @echo unx
@-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
@echo $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP$(TNR)OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
@@ -143,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
@@ -161,7 +157,6 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
$(COMMAND_ECHO)$(RC) -DWIN32 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP$(TNR)LINKRES:b).rc
.ENDIF # "$(APP$(TNR)LINKRES)" != ""
.IF "$(COM)" == "GCC"
- @echo mingw
.IF "$(APP$(TNR)LINKRES)" != "" || "$(APP$(TNR)RES)" != ""
@cat $(APP$(TNR)LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP$(TNR)RES)) > $(MISC)/$(@:b)_all.res
$(WINDRES) $(MISC)/$(@:b)_all.res $(APP$(TNR)RESO)
@@ -173,12 +168,11 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
$(APP_LINKTYPE) $(APP$(TNR)LIBSALCPPRT) \
-Wl,--start-group $(APP$(TNR)STDLIBS) -Wl,--end-group $(APP$(TNR)STDLIB) \
$(STDLIB$(TNR)) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
- # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
+# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
.IF "$(VERBOSE)" == "TRUE"
@$(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 \
diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index a9fc9202ea2c..2eb256d5f478 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -53,12 +53,6 @@ CFLAGSVERSION_CMD= -V $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk
CFLAGSNUMVERSION_CMD= -V $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
.ENDIF
-.IF "$(COM)"=="C730"
-CFLAGSVERSION= -version
-CFLAGSVERSION_CMD= -version |& cut -d" " -f4-
-CFLAGSNUMVERSION_CMD= -version |& cut -d" " -f4-
-.ENDIF
-
# that's the version known by the specific
# compiler
CCVER:=$(shell @-$(CXX) $(CFLAGSVERSION_CMD))
@@ -130,11 +124,6 @@ COMNAME=sunpro5
.ENDIF
.ENDIF
-.IF "$(COM)"=="C730"
-COMID=C730
-COMNAME=MipsPro
-.ENDIF
-
.IF "$(COMNAME)"==""
# "EXCEPTIONSFILES" get compiled before this, but shouldn't
diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk
index 763ad26e5021..0e677e681493 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)dlltool --output-def $(MISC)/$(SHL$(TNR)TARGET).exp --export-all-symbols \
+ $(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)"!=""
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index e8c2b7596a16..d6bcbc82511b 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -95,13 +95,15 @@ SHL$(TNR)IMPLIB=i$(TARGET)_t$(TNR)
USE_$(TNR)IMPLIB=-implib:$(LB)/$(SHL$(TNR)IMPLIB).lib
SHL$(TNR)IMPLIBN=$(LB)/$(SHL$(TNR)IMPLIB).lib
.ELSE
-SHL$(TNR)IMPLIBN=$(LB)/lib$(SHL$(TNR)IMPLIB).dll.a
USE_$(TNR)IMPLIB=-Wl,--out-implib=$(SHL$(TNR)IMPLIBN)
+SHL$(TNR)IMPLIBN=$(LB)/lib$(SHL$(TNR)IMPLIB).dll.a
.ENDIF # "$(COM)" != "GCC"
ALLTAR : $(SHL$(TNR)IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_$(TNR)IMPLIB_DEPS=$(LB)/$(SHL$(TNR)IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL$(TNR)DEF=$(SHL$(TNR)DEF)
@@ -270,6 +272,10 @@ $(MISC)/%linkinc.ls:
@echo . > $@
.ENDIF # "$(linkinc)"!=""
+.IF "$(COM)" == "GCC" && "$(SHL$(TNR)IMPLIBN)" != ""
+$(SHL$(TNR)IMPLIBN) : $(SHL$(TNR)TARGETN)
+.ENDIF
+
$(SHL$(TNR)TARGETN) : \
$(SHL$(TNR)OBJS)\
$(SHL$(TNR)LIBS)\
@@ -313,10 +319,10 @@ $(SHL$(TNR)TARGETN) : \
$(WINDRES) $(SHL$(TNR)LINKRES) $(SHL$(TNR)LINKRESO)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(SHL$(TNR)ALLRES)"!=""
-.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
+.IF "$(COM)"=="GCC"
# 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) \
@@ -338,13 +344,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 \
- --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) \
@@ -352,7 +351,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) \
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index 893340e9125f..c07e5c36f6cc 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -87,7 +87,9 @@ COPYUPDATE=-u
ECHON=echo -n
ECHONL=echo
FIND*=find
+.IF "$(OS_FOR_BUILD)"=="WNT"
FLIPCMD*=$(PERL) $(SOLARENV)/bin/slfl.pl
+.ENDIF
GNUCOPY*=cp
GNUMAKE*=make
GREP*=grep
@@ -115,9 +117,10 @@ COPYRECURSE=-r
.ENDIF
.IF "$(OS)"=="SOLARIS"
AWK*=nawk
-GNUCOPY*=gnucp
-GNUPATCH*=gnupatch
+GNUCOPY*=/usr/gnu/bin/cp
+GNUPATCH*=/usr/gnu/bin/patch
GNUTAR*=/usr/sfw/bin/gtar
+GNUMAKE=/usr/sfw/bin/make
DEREFERENCE=
.ELIF "$(OS)"=="AIX"
AWK*=/opt/freeware/bin/awk
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 752de80c7b36..79d10d274fc0 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -90,6 +90,9 @@ CFLAGSCXX+=-fvisibility-inlines-hidden
.IF "$(HAVE_CXX0X)" == "TRUE"
CFLAGSCXX+=-std=c++0x -Wno-deprecated-declarations
.ENDIF # "$(HAVE_CXX0X)" == "TRUE"
+.IF "$(ENABLE_DEBUG_STL)" == "TRUE"
+CFLAGSCXX += -D_GLIBCXX_DEBUG
+.ENDIF
CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
diff --git a/solenv/inc/unxiosr.mk b/solenv/inc/unxiosr.mk
index 3235026c9846..2e7599e1010a 100644
--- a/solenv/inc/unxiosr.mk
+++ b/solenv/inc/unxiosr.mk
@@ -32,10 +32,10 @@ CFLAGS=-c $(EXTRA_CFLAGS)
LINKC*=$(CC)
LINK*=$(CXX)
-STDLIBCUIMT=-framework CoreFoundation
-STDLIBGUIMT=-framework CoreFoundation
-STDSHLCUIMT=-framework CoreFoundation
-STDSHLGUIMT=-framework CoreFoundation
+STDLIBCUIMT=-framework UIKit -framework Foundation -framework CoreFoundation -Xlinker -objc_abi_version -Xlinker 2
+STDLIBGUIMT=$(STDLIBCUIMT)
+STDSHLCUIMT=
+STDSHLGUIMT=
LIBMGR*=ar
LIBFLAGS=-r
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk
index 8b65c5f393e3..dd3e0c8ce6f7 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