[Libreoffice-commits] .: 4 commits - solenv/inc
Tor Lillqvist
tml at kemper.freedesktop.org
Fri Jun 17 08:13:32 PDT 2011
solenv/inc/_tg_app.mk | 50 ++++++-------------------------
solenv/inc/_tg_shl.mk | 80 +++++++++++++++++++++++++++++++-------------------
solenv/inc/libs.mk | 4 --
solenv/inc/tg_app.mk | 5 ---
solenv/inc/tg_shl.mk | 8 +++--
5 files changed, 66 insertions(+), 81 deletions(-)
New commits:
commit d5ca43e161e75bbce5fede3fdaf11a23522535ab
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jun 17 18:07:40 2011 +0300
The line that unconfuses dmake can be a makefile comment line, but huh?
diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index 2570877..d474257 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -141,7 +141,7 @@ $(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
@@ -350,7 +350,7 @@ $(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
@@ -559,7 +559,7 @@ $(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
@@ -768,7 +768,7 @@ $(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
@@ -977,7 +977,7 @@ $(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
@@ -1186,7 +1186,7 @@ $(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
@@ -1395,7 +1395,7 @@ $(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
@@ -1604,7 +1604,7 @@ $(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
@@ -1813,7 +1813,7 @@ $(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
@@ -2022,7 +2022,7 @@ $(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
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index 4e2512c..bff1cb2 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -170,7 +170,7 @@ $(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
commit fd0497d0c75b4098763ff91f5531306c1abd0e06
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jun 17 17:59:44 2011 +0300
Drop pointless verbiage
diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index cf56b9c..2570877 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
@@ -103,7 +102,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
@@ -132,7 +130,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)
@@ -288,7 +285,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
@@ -315,7 +311,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
@@ -344,7 +339,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)
@@ -500,7 +494,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
@@ -527,7 +520,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
@@ -556,7 +548,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)
@@ -712,7 +703,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
@@ -739,7 +729,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
@@ -768,7 +757,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)
@@ -924,7 +912,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
@@ -951,7 +938,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
@@ -980,7 +966,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)
@@ -1136,7 +1121,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
@@ -1163,7 +1147,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
@@ -1192,7 +1175,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)
@@ -1348,7 +1330,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
@@ -1375,7 +1356,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
@@ -1404,7 +1384,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)
@@ -1560,7 +1539,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
@@ -1587,7 +1565,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
@@ -1616,7 +1593,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)
@@ -1772,7 +1748,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
@@ -1799,7 +1774,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
@@ -1828,7 +1802,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)
@@ -1984,7 +1957,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
@@ -2011,7 +1983,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
@@ -2040,7 +2011,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)
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index cd9d444..4e2512c 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
@@ -132,7 +131,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
@@ -161,7 +159,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)
commit b81e54ba1163641c3ea7153b6141e1649acaad15
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jun 17 17:52:28 2011 +0300
Just use -lreg for WNTGCC, too
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index f9f9b2a..a687ee6 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -87,11 +87,7 @@ 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"
commit 7dab7eea6edf8ea119f1f5384523dc3462262075
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Jun 17 17:44:33 2011 +0300
Fix some WNTGCC typos and thinkos
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index 4f1d099..de7b836 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -72,7 +72,9 @@ USE_1IMPLIB=-Wl,--out-implib=$(SHL1IMPLIBN)
ALLTAR : $(SHL1IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_1IMPLIB_DEPS=$(LB)/$(SHL1IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL1DEF=$(SHL1DEF)
@@ -309,13 +311,13 @@ $(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 \
+ $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
--dllname $(SHL1TARGET)$(DLLPOST) \
--kill-at \
--output-exp $(MISC)/$(@:b)_exp.o \
$(SHL1VERSIONOBJ) \
- @(ALL1OBJLIST)
- )
+ $(ALL1OBJLIST) \
+ ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL1LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -577,7 +579,9 @@ USE_2IMPLIB=-Wl,--out-implib=$(SHL2IMPLIBN)
ALLTAR : $(SHL2IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_2IMPLIB_DEPS=$(LB)/$(SHL2IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL2DEF=$(SHL2DEF)
@@ -814,13 +818,13 @@ $(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 \
+ $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
--dllname $(SHL2TARGET)$(DLLPOST) \
--kill-at \
--output-exp $(MISC)/$(@:b)_exp.o \
$(SHL2VERSIONOBJ) \
- @(ALL2OBJLIST)
- )
+ $(ALL2OBJLIST) \
+ ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL2LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -1082,7 +1086,9 @@ USE_3IMPLIB=-Wl,--out-implib=$(SHL3IMPLIBN)
ALLTAR : $(SHL3IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_3IMPLIB_DEPS=$(LB)/$(SHL3IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL3DEF=$(SHL3DEF)
@@ -1319,13 +1325,13 @@ $(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 \
+ $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
--dllname $(SHL3TARGET)$(DLLPOST) \
--kill-at \
--output-exp $(MISC)/$(@:b)_exp.o \
$(SHL3VERSIONOBJ) \
- @(ALL3OBJLIST)
- )
+ $(ALL3OBJLIST) \
+ ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL3LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -1587,7 +1593,9 @@ USE_4IMPLIB=-Wl,--out-implib=$(SHL4IMPLIBN)
ALLTAR : $(SHL4IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_4IMPLIB_DEPS=$(LB)/$(SHL4IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL4DEF=$(SHL4DEF)
@@ -1824,13 +1832,13 @@ $(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 \
+ $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
--dllname $(SHL4TARGET)$(DLLPOST) \
--kill-at \
--output-exp $(MISC)/$(@:b)_exp.o \
$(SHL4VERSIONOBJ) \
- @(ALL4OBJLIST)
- )
+ $(ALL4OBJLIST) \
+ ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL4LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -2092,7 +2100,9 @@ USE_5IMPLIB=-Wl,--out-implib=$(SHL5IMPLIBN)
ALLTAR : $(SHL5IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_5IMPLIB_DEPS=$(LB)/$(SHL5IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL5DEF=$(SHL5DEF)
@@ -2329,13 +2339,13 @@ $(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 \
+ $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
--dllname $(SHL5TARGET)$(DLLPOST) \
--kill-at \
--output-exp $(MISC)/$(@:b)_exp.o \
$(SHL5VERSIONOBJ) \
- @(ALL5OBJLIST)
- )
+ $(ALL5OBJLIST) \
+ ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL5LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -2597,7 +2607,9 @@ USE_6IMPLIB=-Wl,--out-implib=$(SHL6IMPLIBN)
ALLTAR : $(SHL6IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_6IMPLIB_DEPS=$(LB)/$(SHL6IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL6DEF=$(SHL6DEF)
@@ -2834,13 +2846,13 @@ $(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 \
+ $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
--dllname $(SHL6TARGET)$(DLLPOST) \
--kill-at \
--output-exp $(MISC)/$(@:b)_exp.o \
$(SHL6VERSIONOBJ) \
- @(ALL6OBJLIST)
- )
+ $(ALL6OBJLIST) \
+ ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL6LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -3102,7 +3114,9 @@ USE_7IMPLIB=-Wl,--out-implib=$(SHL7IMPLIBN)
ALLTAR : $(SHL7IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_7IMPLIB_DEPS=$(LB)/$(SHL7IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL7DEF=$(SHL7DEF)
@@ -3339,13 +3353,13 @@ $(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 \
+ $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
--dllname $(SHL7TARGET)$(DLLPOST) \
--kill-at \
--output-exp $(MISC)/$(@:b)_exp.o \
$(SHL7VERSIONOBJ) \
- @(ALL7OBJLIST)
- )
+ $(ALL7OBJLIST) \
+ ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL7LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -3607,7 +3621,9 @@ USE_8IMPLIB=-Wl,--out-implib=$(SHL8IMPLIBN)
ALLTAR : $(SHL8IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_8IMPLIB_DEPS=$(LB)/$(SHL8IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL8DEF=$(SHL8DEF)
@@ -3844,13 +3860,13 @@ $(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 \
+ $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
--dllname $(SHL8TARGET)$(DLLPOST) \
--kill-at \
--output-exp $(MISC)/$(@:b)_exp.o \
$(SHL8VERSIONOBJ) \
- @(ALL8OBJLIST)
- )
+ $(ALL8OBJLIST) \
+ ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL8LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -4112,7 +4128,9 @@ USE_9IMPLIB=-Wl,--out-implib=$(SHL9IMPLIBN)
ALLTAR : $(SHL9IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_9IMPLIB_DEPS=$(LB)/$(SHL9IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL9DEF=$(SHL9DEF)
@@ -4349,13 +4367,13 @@ $(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 \
+ $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
--dllname $(SHL9TARGET)$(DLLPOST) \
--kill-at \
--output-exp $(MISC)/$(@:b)_exp.o \
$(SHL9VERSIONOBJ) \
- @(ALL9OBJLIST)
- )
+ $(ALL9OBJLIST) \
+ ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL9LINKFLAGS) \
$(LINKFLAGSSHL) \
@@ -4617,7 +4635,9 @@ USE_10IMPLIB=-Wl,--out-implib=$(SHL10IMPLIBN)
ALLTAR : $(SHL10IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_10IMPLIB_DEPS=$(LB)/$(SHL10IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL10DEF=$(SHL10DEF)
@@ -4854,13 +4874,13 @@ $(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 \
+ $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
--dllname $(SHL10TARGET)$(DLLPOST) \
--kill-at \
--output-exp $(MISC)/$(@:b)_exp.o \
$(SHL10VERSIONOBJ) \
- @(ALL10OBJLIST)
- )
+ $(ALL10OBJLIST) \
+ ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL10LINKFLAGS) \
$(LINKFLAGSSHL) \
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index e8c2b75..f4a0f17 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -101,7 +101,9 @@ USE_$(TNR)IMPLIB=-Wl,--out-implib=$(SHL$(TNR)IMPLIBN)
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)
@@ -338,13 +340,13 @@ $(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 \
+ $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
--dllname $(SHL$(TNR)TARGET)$(DLLPOST) \
--kill-at \
--output-exp $(MISC)/$(@:b)_exp.o \
$(SHL$(TNR)VERSIONOBJ) \
- @(ALL$(TNR)OBJLIST)
- )
+ $(ALL$(TNR)OBJLIST) \
+ ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL$(TNR)LINKFLAGS) \
$(LINKFLAGSSHL) \
More information about the Libreoffice-commits
mailing list