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 | da6b240a3fdc74b2811c229a7f8eff8307c6c256 (patch) | |
| tree | edb9fd76b4e5f167a9cf303b445649eec12280af | |
| parent | e447c6b6ea98f01ee8f048134e700d05cf265392 (diff) | |
Backed out changeset: d80a58fd55d9
| -rw-r--r-- | desktop/source/pkgchk/unopkg/makefile.mk | 4 | ||||
| -rw-r--r-- | framework/util/makefile.mk | 8 | ||||
| -rw-r--r-- | svx/util/makefile.mk | 2 | ||||
| -rw-r--r-- | vbahelper/util/makefile.mk | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/desktop/source/pkgchk/unopkg/makefile.mk b/desktop/source/pkgchk/unopkg/makefile.mk index 0cefee98634e..729548cbadd1 100644 --- a/desktop/source/pkgchk/unopkg/makefile.mk +++ b/desktop/source/pkgchk/unopkg/makefile.mk @@ -49,7 +49,7 @@ CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES) APP1TARGET = so$/unopkg APP1OBJS = $(OBJFILES) APP1STDLIBS = $(SALLIB) $(UNOPKGAPPLIB) -.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" APP1DEPN = $(SHL1TARGETN) .ELSE APP1DEPN = $(SHL1IMPLIBN) @@ -65,7 +65,7 @@ APP1LINKRES = $(MISC)$/$(TARGET)1.res APP2TARGET = unopkg APP2OBJS = $(OBJFILES) APP2STDLIBS = $(SALLIB) $(UNOPKGAPPLIB) -.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" APP2DEPN = $(SHL1TARGETN) .ELSE APP2DEPN = $(SHL1IMPLIBN) diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk index ab0513fccece..08218b6267b3 100644 --- a/framework/util/makefile.mk +++ b/framework/util/makefile.mk @@ -158,7 +158,7 @@ SHL2STDLIBS= \ $(SALLIB) SHL2DEF= $(MISC)$/$(SHL2TARGET).def -.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" SHL2DEPN= $(SHL1TARGETN) .ELSE SHL2DEPN= $(SHL1IMPLIBN) @@ -218,7 +218,7 @@ SHL3STDLIBS= \ $(SALLIB) SHL3DEF= $(MISC)$/$(SHL3TARGET).def -.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" SHL3DEPN= $(SHL1TARGETN) $(SHL2TARGETN) .ELSE SHL3DEPN= $(SHL1IMPLIBN) $(SHL2IMPLIBN) @@ -363,7 +363,7 @@ SHL4STDLIBS= \ $(I18NISOLANGLIB) SHL4DEF= $(MISC)$/$(SHL4TARGET).def -.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" SHL4DEPN= $(SHL1TARGETN) $(SHL2TARGETN) .ELSE SHL4DEPN= $(SHL1IMPLIBN) $(SHL2IMPLIBN) @@ -398,7 +398,7 @@ SHL5STDLIBS= \ $(SALLIB) SHL5DEF= $(MISC)$/$(SHL5TARGET).def -.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" SHL5DEPN= $(SHL1TARGETN) .ELSE SHL5DEPN= $(SHL1IMPLIBN) diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk index eeb1ee3dbcec..5ee482e6ac82 100644 --- a/svx/util/makefile.mk +++ b/svx/util/makefile.mk @@ -104,7 +104,7 @@ DEFLIB1NAME=$(SHL1LIBS:b) SHL2TARGET= svx$(DLLPOSTFIX) SHL2IMPLIB= i$(TARGET) SHL2USE_EXPORTS=name -.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" SHL2DEPN=$(SHL1TARGETN) .ELSE SHL2DEPN=$(SHL1IMPLIBN) diff --git a/vbahelper/util/makefile.mk b/vbahelper/util/makefile.mk index 5f6bfa4967f9..54a17873cf94 100644 --- a/vbahelper/util/makefile.mk +++ b/vbahelper/util/makefile.mk @@ -96,7 +96,7 @@ SHL2STDLIBS= \ $(TKLIB) \ $(BASICLIB) \ -.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" SHL2DEPN=$(SHL1TARGETN) .ELSE SHL2DEPN=$(SHL1IMPLIBN) |