diff options
| author | tono <tono@openoffice.org> | 2010-06-18 22:43:04 +0900 |
|---|---|---|
| committer | tono <tono@openoffice.org> | 2010-06-18 22:43:04 +0900 |
| commit | ec81a58becbe919adde19cc969fc58f5cd1a7848 (patch) | |
| tree | 4ea8d61c3fc2048fded79011f081a1adb873ec0f | |
| parent | 8148f8e5bef5c91c8caec67379b0ef946a4ed83b (diff) | |
Backed out changeset: d80a58fd55d9
| -rw-r--r-- | sc/util/makefile.mk | 6 |
1 files 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) |