From 1e02f8a354ce16cf0cfb277a40565a8698825d42 Mon Sep 17 00:00:00 2001
From: tono <tono@openoffice.org>
Date: Mon, 31 May 2010 21:51:32 +0900
Subject: i#111956: MinGW port fix: dependency to shared library

---
 sc/util/makefile.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk
index b7b12e07e..c465a6650 100644
--- a/sc/util/makefile.mk
+++ b/sc/util/makefile.mk
@@ -174,7 +174,11 @@ SHL6LIBS= \
 SHL6VERSIONMAP= scfilt.map
 SHL6DEF=$(MISC)$/$(SHL6TARGET).def
 DEF6NAME= $(SHL6TARGET)
+.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
 SHL6DEPN=$(SHL1TARGETN)
+.ELSE
+SHL6DEPN=$(SHL1IMPLIBN)
+.ENDIF
 SHL6STDLIBS= \
     $(ISCLIB) \
     $(BASICLIB)	\
@@ -206,7 +210,11 @@ SHL8TARGET= scui$(DLLPOSTFIX)
 SHL8IMPLIB= scuiimp
 SHL8VERSIONMAP= scui.map
 SHL8DEF=$(MISC)$/$(SHL8TARGET).def
+.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
 SHL8DEPN=$(SHL1TARGETN)
+.ELSE
+SHL8DEPN=$(SHL1IMPLIBN)
+.ENDIF
 DEF8NAME=$(SHL8TARGET)
 
 SHL8STDLIBS= \
@@ -317,7 +325,11 @@ SHL9STDLIBS= \
         $(SVXMSFILTERLIB)		\
         $(FORLIB)
 
+.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
 SHL9DEPN=$(SHL1TARGETN) $(SHL8TARGETN)
+.ELSE
+SHL9DEPN=$(SHL1IMPLIBN) $(SHL8IMPLIBN)
+.ENDIF
 SHL9LIBS=$(SLB)$/$(TARGET_VBA).lib
 
 .IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
-- 
cgit v1.2.3


From 8148f8e5bef5c91c8caec67379b0ef946a4ed83b Mon Sep 17 00:00:00 2001
From: tono <tono@openoffice.org>
Date: Tue, 15 Jun 2010 22:35:25 +0900
Subject: i#111956: MinGW port fix: dependency to shared library: pure porting
 fix

---
 sc/util/makefile.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk
index c465a6650..2f8ef22e7 100644
--- a/sc/util/makefile.mk
+++ b/sc/util/makefile.mk
@@ -174,7 +174,7 @@ SHL6LIBS= \
 SHL6VERSIONMAP= scfilt.map
 SHL6DEF=$(MISC)$/$(SHL6TARGET).def
 DEF6NAME= $(SHL6TARGET)
-.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
+.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
 SHL6DEPN=$(SHL1TARGETN)
 .ELSE
 SHL6DEPN=$(SHL1IMPLIBN)
@@ -210,7 +210,7 @@ SHL8TARGET= scui$(DLLPOSTFIX)
 SHL8IMPLIB= scuiimp
 SHL8VERSIONMAP= scui.map
 SHL8DEF=$(MISC)$/$(SHL8TARGET).def
-.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
+.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
 SHL8DEPN=$(SHL1TARGETN)
 .ELSE
 SHL8DEPN=$(SHL1IMPLIBN)
@@ -325,7 +325,7 @@ SHL9STDLIBS= \
         $(SVXMSFILTERLIB)		\
         $(FORLIB)
 
-.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
+.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
 SHL9DEPN=$(SHL1TARGETN) $(SHL8TARGETN)
 .ELSE
 SHL9DEPN=$(SHL1IMPLIBN) $(SHL8IMPLIBN)
-- 
cgit v1.2.3


From ec81a58becbe919adde19cc969fc58f5cd1a7848 Mon Sep 17 00:00:00 2001
From: tono <tono@openoffice.org>
Date: Fri, 18 Jun 2010 22:43:04 +0900
Subject: Backed out changeset: d80a58fd55d9

---
 sc/util/makefile.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk
index 2f8ef22e7..c465a6650 100644
--- a/sc/util/makefile.mk
+++ b/sc/util/makefile.mk
@@ -174,7 +174,7 @@ SHL6LIBS= \
 SHL6VERSIONMAP= scfilt.map
 SHL6DEF=$(MISC)$/$(SHL6TARGET).def
 DEF6NAME= $(SHL6TARGET)
-.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
+.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
 SHL6DEPN=$(SHL1TARGETN)
 .ELSE
 SHL6DEPN=$(SHL1IMPLIBN)
@@ -210,7 +210,7 @@ SHL8TARGET= scui$(DLLPOSTFIX)
 SHL8IMPLIB= scuiimp
 SHL8VERSIONMAP= scui.map
 SHL8DEF=$(MISC)$/$(SHL8TARGET).def
-.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
+.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
 SHL8DEPN=$(SHL1TARGETN)
 .ELSE
 SHL8DEPN=$(SHL1IMPLIBN)
@@ -325,7 +325,7 @@ SHL9STDLIBS= \
         $(SVXMSFILTERLIB)		\
         $(FORLIB)
 
-.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
+.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
 SHL9DEPN=$(SHL1TARGETN) $(SHL8TARGETN)
 .ELSE
 SHL9DEPN=$(SHL1IMPLIBN) $(SHL8IMPLIBN)
-- 
cgit v1.2.3


From 530123c25c9dfdd61887cf1b42f5141fa4e6349c Mon Sep 17 00:00:00 2001
From: tono <tono@openoffice.org>
Date: Fri, 18 Jun 2010 22:49:15 +0900
Subject: Backed out changeset: f63af3433bcb

---
 sc/util/makefile.mk | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk
index c465a6650..b7b12e07e 100644
--- a/sc/util/makefile.mk
+++ b/sc/util/makefile.mk
@@ -174,11 +174,7 @@ SHL6LIBS= \
 SHL6VERSIONMAP= scfilt.map
 SHL6DEF=$(MISC)$/$(SHL6TARGET).def
 DEF6NAME= $(SHL6TARGET)
-.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
 SHL6DEPN=$(SHL1TARGETN)
-.ELSE
-SHL6DEPN=$(SHL1IMPLIBN)
-.ENDIF
 SHL6STDLIBS= \
     $(ISCLIB) \
     $(BASICLIB)	\
@@ -210,11 +206,7 @@ SHL8TARGET= scui$(DLLPOSTFIX)
 SHL8IMPLIB= scuiimp
 SHL8VERSIONMAP= scui.map
 SHL8DEF=$(MISC)$/$(SHL8TARGET).def
-.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
 SHL8DEPN=$(SHL1TARGETN)
-.ELSE
-SHL8DEPN=$(SHL1IMPLIBN)
-.ENDIF
 DEF8NAME=$(SHL8TARGET)
 
 SHL8STDLIBS= \
@@ -325,11 +317,7 @@ SHL9STDLIBS= \
         $(SVXMSFILTERLIB)		\
         $(FORLIB)
 
-.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
 SHL9DEPN=$(SHL1TARGETN) $(SHL8TARGETN)
-.ELSE
-SHL9DEPN=$(SHL1IMPLIBN) $(SHL8IMPLIBN)
-.ENDIF
 SHL9LIBS=$(SLB)$/$(TARGET_VBA).lib
 
 .IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
-- 
cgit v1.2.3