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 | 8412bc28b62534dd39eaa33b837c910d4cae08bf (patch) | |
| tree | f8724b27905f4b356938cd79075d68c5710a832a | |
| parent | a522451c35d959e2302ee85bb7f4d4f794511382 (diff) | |
Backed out changeset: d80a58fd55d9
| -rw-r--r-- | i18npool/source/localedata/data/makefile.mk | 6 | ||||
| -rw-r--r-- | svtools/util/makefile.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/i18npool/source/localedata/data/makefile.mk b/i18npool/source/localedata/data/makefile.mk index c268b5137a62..37f38b9f6e2d 100644 --- a/i18npool/source/localedata/data/makefile.mk +++ b/i18npool/source/localedata/data/makefile.mk @@ -285,7 +285,7 @@ SHL2DEF=$(MISC)$/$(SHL2TARGET).def DEF2NAME=$(SHL2TARGET) SHL2STDLIBS= $(LINK_LOCALEDATA_EN_LIB) -.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" SHL2DEPN=$(SHL1TARGETN) .ELSE SHL2DEPN=$(SHL1IMPLIBN) @@ -327,7 +327,7 @@ SHL3DEF=$(MISC)$/$(SHL3TARGET).def DEF3NAME=$(SHL3TARGET) SHL3STDLIBS= $(LINK_LOCALEDATA_EN_LIB) -.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" SHL3DEPN=$(SHL1TARGETN) $(SHL2TARGETN) .ELSE SHL3DEPN=$(SHL1IMPLIBN) $(SHL2IMPLIBN) @@ -418,7 +418,7 @@ SHL4DEF=$(MISC)$/$(SHL4TARGET).def DEF4NAME=$(SHL4TARGET) SHL4STDLIBS= $(LINK_LOCALEDATA_EN_LIB) -.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" SHL4DEPN=$(SHL1TARGETN) .ELSE SHL4DEPN=$(SHL1IMPLIBN) diff --git a/svtools/util/makefile.mk b/svtools/util/makefile.mk index 85a252ea516b..9239b36cc6dc 100644 --- a/svtools/util/makefile.mk +++ b/svtools/util/makefile.mk @@ -153,7 +153,7 @@ DEF1DES =SvTools APP2TARGET = g2g APP2BASE = 0x10000000 -.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" APP2DEPN = $(SHL1TARGETN) $(SHL2TARGETN) .ELSE APP2DEPN = $(SHL1IMPLIBN) $(SHL2IMPLIBN) |