diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 11:39:06 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 11:39:06 +0000 |
| commit | d1612a4e1fca139030c5b5b21d70194c007a41c8 (patch) | |
| tree | 8f6874efbfb2de13e0b27a999396ce36efe1c08e /desktop/source/deployment/misc | |
| parent | ee7cf6fb15c30401ef9369e0cd735672fac545ab (diff) | |
INTEGRATION: CWS os2port02 (1.13.160); FILE MERGED
2007/09/29 16:29:16 ydario 1.13.160.1: Issue number: i82034
Submitted by: ydario
Reviewed by: ydario
Commit of changes for OS/2 CWS source code integration.
Diffstat (limited to 'desktop/source/deployment/misc')
| -rw-r--r-- | desktop/source/deployment/misc/makefile.mk | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/desktop/source/deployment/misc/makefile.mk b/desktop/source/deployment/misc/makefile.mk index 7a3b000367..b972465048 100644 --- a/desktop/source/deployment/misc/makefile.mk +++ b/desktop/source/deployment/misc/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.13 $ +# $Revision: 1.14 $ # -# last change: $Author: vg $ $Date: 2007-01-18 14:55:26 $ +# last change: $Author: hr $ $Date: 2007-11-02 12:39:06 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -40,6 +40,10 @@ TARGET = deployment_misc USE_DEFFILE = TRUE ENABLE_EXCEPTIONS = TRUE +.IF "$(GUI)"=="OS2" +TARGET = deplmisc +.ENDIF + .INCLUDE : settings.mk # Reduction of exported symbols: @@ -58,7 +62,11 @@ SRS1NAME = $(TARGET) SRC1FILES = \ dp_misc.src +.IF "$(GUI)"=="OS2" +SHL1TARGET = $(TARGET) +.ELSE SHL1TARGET = deploymentmisc$(UPD)$(DLLPOSTFIX) +.ENDIF SHL1OBJS = \ $(SLO)$/dp_misc.obj \ $(SLO)$/dp_resource.obj \ @@ -78,7 +86,14 @@ SHL1STDLIBS = \ $(UCBHELPERLIB) \ $(UNOTOOLSLIB) \ $(XMLSCRIPTLIB) +.IF "$(GUI)"=="OS2" +SHL1IMPLIB = ideploymentmisc$(UPD)$(DLLPOSTFIX) +LIB1TARGET = $(SLB)$/_deplmisc.lib +LIB1OBJFILES = $(SHL1OBJS) +DEFLIB1NAME = _deplmisc +.ELSE SHL1IMPLIB = i$(SHL1TARGET) +.ENDIF DEF1NAME = $(SHL1TARGET) SLOFILES = $(SHL1OBJS) |