[Libreoffice-commits] .: 3 commits - solenv/inc
Tor Lillqvist
tml at kemper.freedesktop.org
Fri Jun 17 15:29:06 PDT 2011
solenv/inc/_tg_def.mk | 20 ++++++------
solenv/inc/_tg_shl.mk | 80 +++++++++++++++++++++++++++++++++++++-------------
solenv/inc/tg_def.mk | 2 -
solenv/inc/tg_shl.mk | 8 +++--
4 files changed, 77 insertions(+), 33 deletions(-)
New commits:
commit d583a31faa832976ffefb465b7d5b4546a5fa0e9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sat Jun 18 01:28:45 2011 +0300
With MinGW we get the import library when making the DLL
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index 83f33a5..a60f9ce 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -66,8 +66,8 @@ 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)
@@ -243,6 +243,10 @@ $(MISC)/%linkinc.ls:
@echo . > $@
.ENDIF # "$(linkinc)"!=""
+.IF "$(COM)" == "GCC" && "$(SHL1IMPLIBN)" != ""
+$(SHL1IMPLIBN) : $(SHL1TARGETN)
+.ENDIF
+
$(SHL1TARGETN) : \
$(SHL1OBJS)\
$(SHL1LIBS)\
@@ -566,8 +570,8 @@ 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)
@@ -743,6 +747,10 @@ $(MISC)/%linkinc.ls:
@echo . > $@
.ENDIF # "$(linkinc)"!=""
+.IF "$(COM)" == "GCC" && "$(SHL2IMPLIBN)" != ""
+$(SHL2IMPLIBN) : $(SHL2TARGETN)
+.ENDIF
+
$(SHL2TARGETN) : \
$(SHL2OBJS)\
$(SHL2LIBS)\
@@ -1066,8 +1074,8 @@ 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)
@@ -1243,6 +1251,10 @@ $(MISC)/%linkinc.ls:
@echo . > $@
.ENDIF # "$(linkinc)"!=""
+.IF "$(COM)" == "GCC" && "$(SHL3IMPLIBN)" != ""
+$(SHL3IMPLIBN) : $(SHL3TARGETN)
+.ENDIF
+
$(SHL3TARGETN) : \
$(SHL3OBJS)\
$(SHL3LIBS)\
@@ -1566,8 +1578,8 @@ 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)
@@ -1743,6 +1755,10 @@ $(MISC)/%linkinc.ls:
@echo . > $@
.ENDIF # "$(linkinc)"!=""
+.IF "$(COM)" == "GCC" && "$(SHL4IMPLIBN)" != ""
+$(SHL4IMPLIBN) : $(SHL4TARGETN)
+.ENDIF
+
$(SHL4TARGETN) : \
$(SHL4OBJS)\
$(SHL4LIBS)\
@@ -2066,8 +2082,8 @@ 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)
@@ -2243,6 +2259,10 @@ $(MISC)/%linkinc.ls:
@echo . > $@
.ENDIF # "$(linkinc)"!=""
+.IF "$(COM)" == "GCC" && "$(SHL5IMPLIBN)" != ""
+$(SHL5IMPLIBN) : $(SHL5TARGETN)
+.ENDIF
+
$(SHL5TARGETN) : \
$(SHL5OBJS)\
$(SHL5LIBS)\
@@ -2566,8 +2586,8 @@ 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)
@@ -2743,6 +2763,10 @@ $(MISC)/%linkinc.ls:
@echo . > $@
.ENDIF # "$(linkinc)"!=""
+.IF "$(COM)" == "GCC" && "$(SHL6IMPLIBN)" != ""
+$(SHL6IMPLIBN) : $(SHL6TARGETN)
+.ENDIF
+
$(SHL6TARGETN) : \
$(SHL6OBJS)\
$(SHL6LIBS)\
@@ -3066,8 +3090,8 @@ 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)
@@ -3243,6 +3267,10 @@ $(MISC)/%linkinc.ls:
@echo . > $@
.ENDIF # "$(linkinc)"!=""
+.IF "$(COM)" == "GCC" && "$(SHL7IMPLIBN)" != ""
+$(SHL7IMPLIBN) : $(SHL7TARGETN)
+.ENDIF
+
$(SHL7TARGETN) : \
$(SHL7OBJS)\
$(SHL7LIBS)\
@@ -3566,8 +3594,8 @@ 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)
@@ -3743,6 +3771,10 @@ $(MISC)/%linkinc.ls:
@echo . > $@
.ENDIF # "$(linkinc)"!=""
+.IF "$(COM)" == "GCC" && "$(SHL8IMPLIBN)" != ""
+$(SHL8IMPLIBN) : $(SHL8TARGETN)
+.ENDIF
+
$(SHL8TARGETN) : \
$(SHL8OBJS)\
$(SHL8LIBS)\
@@ -4066,8 +4098,8 @@ 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)
@@ -4243,6 +4275,10 @@ $(MISC)/%linkinc.ls:
@echo . > $@
.ENDIF # "$(linkinc)"!=""
+.IF "$(COM)" == "GCC" && "$(SHL9IMPLIBN)" != ""
+$(SHL9IMPLIBN) : $(SHL9TARGETN)
+.ENDIF
+
$(SHL9TARGETN) : \
$(SHL9OBJS)\
$(SHL9LIBS)\
@@ -4566,8 +4602,8 @@ 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)
@@ -4743,6 +4779,10 @@ $(MISC)/%linkinc.ls:
@echo . > $@
.ENDIF # "$(linkinc)"!=""
+.IF "$(COM)" == "GCC" && "$(SHL10IMPLIBN)" != ""
+$(SHL10IMPLIBN) : $(SHL10TARGETN)
+.ENDIF
+
$(SHL10TARGETN) : \
$(SHL10OBJS)\
$(SHL10LIBS)\
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index ebac9e4..d6bcbc8 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -95,8 +95,8 @@ 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)
@@ -272,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)\
commit 7545328bf603888526f69aa8b3fc21646e762a48
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sat Jun 18 01:16:39 2011 +0300
Use DLLTOOL variable instead of hardcode dlltool
diff --git a/solenv/inc/_tg_def.mk b/solenv/inc/_tg_def.mk
index 8099a64..b0b35d8 100644
--- a/solenv/inc/_tg_def.mk
+++ b/solenv/inc/_tg_def.mk
@@ -70,7 +70,7 @@ $(DEF1TARGETN) .PHONY :
.IF "$(DEFLIB1NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL1TARGET).exp
- $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL1TARGET).exp --export-all-symbols \
+ $(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
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL1TARGET).exp
@@ -239,7 +239,7 @@ $(DEF2TARGETN) .PHONY :
.IF "$(DEFLIB2NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL2TARGET).exp
- $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL2TARGET).exp --export-all-symbols \
+ $(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
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL2TARGET).exp
@@ -408,7 +408,7 @@ $(DEF3TARGETN) .PHONY :
.IF "$(DEFLIB3NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL3TARGET).exp
- $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL3TARGET).exp --export-all-symbols \
+ $(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
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL3TARGET).exp
@@ -577,7 +577,7 @@ $(DEF4TARGETN) .PHONY :
.IF "$(DEFLIB4NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL4TARGET).exp
- $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL4TARGET).exp --export-all-symbols \
+ $(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
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL4TARGET).exp
@@ -746,7 +746,7 @@ $(DEF5TARGETN) .PHONY :
.IF "$(DEFLIB5NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL5TARGET).exp
- $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL5TARGET).exp --export-all-symbols \
+ $(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
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL5TARGET).exp
@@ -915,7 +915,7 @@ $(DEF6TARGETN) .PHONY :
.IF "$(DEFLIB6NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL6TARGET).exp
- $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL6TARGET).exp --export-all-symbols \
+ $(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
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL6TARGET).exp
@@ -1084,7 +1084,7 @@ $(DEF7TARGETN) .PHONY :
.IF "$(DEFLIB7NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL7TARGET).exp
- $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL7TARGET).exp --export-all-symbols \
+ $(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
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL7TARGET).exp
@@ -1253,7 +1253,7 @@ $(DEF8TARGETN) .PHONY :
.IF "$(DEFLIB8NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL8TARGET).exp
- $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL8TARGET).exp --export-all-symbols \
+ $(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
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL8TARGET).exp
@@ -1422,7 +1422,7 @@ $(DEF9TARGETN) .PHONY :
.IF "$(DEFLIB9NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL9TARGET).exp
- $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL9TARGET).exp --export-all-symbols \
+ $(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
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL9TARGET).exp
@@ -1591,7 +1591,7 @@ $(DEF10TARGETN) .PHONY :
.IF "$(DEFLIB10NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL10TARGET).exp
- $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL10TARGET).exp --export-all-symbols \
+ $(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
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL10TARGET).exp
diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk
index fdc78c2..0e677e6 100644
--- a/solenv/inc/tg_def.mk
+++ b/solenv/inc/tg_def.mk
@@ -99,7 +99,7 @@ $(DEF$(TNR)TARGETN) .PHONY :
.IF "$(DEFLIB$(TNR)NAME)"!=""
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL$(TNR)TARGET).exp
- $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL$(TNR)TARGET).exp --export-all-symbols \
+ $(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
$(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL$(TNR)TARGET).exp
commit 8d7a5d781010c1585d091af43f07b70c0a45743b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sat Jun 18 01:12:51 2011 +0300
Bin obsolete comment
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index c7ad1ba..83f33a5 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -286,7 +286,7 @@ $(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 \
@@ -786,7 +786,7 @@ $(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 \
@@ -1286,7 +1286,7 @@ $(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 \
@@ -1786,7 +1786,7 @@ $(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 \
@@ -2286,7 +2286,7 @@ $(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 \
@@ -2786,7 +2786,7 @@ $(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 \
@@ -3286,7 +3286,7 @@ $(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 \
@@ -3786,7 +3786,7 @@ $(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 \
@@ -4286,7 +4286,7 @@ $(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 \
@@ -4786,7 +4786,7 @@ $(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 \
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 4e10c6b..ebac9e4 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -315,7 +315,7 @@ $(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 \
More information about the Libreoffice-commits
mailing list