diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 10:55:35 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 10:55:35 +0000 |
| commit | c343e69f71681e0d555df42362971a822cf9f2d4 (patch) | |
| tree | 7d8e98c2fa55a6935e73fd130baacb82e111e573 /toolkit | |
| parent | 17eed69bd56a8169a3ec9139445f8c35300d6de7 (diff) | |
INTEGRATION: CWS layout_DEV300 (1.21.84); FILE MERGED
2008/02/12 15:54:55 jcn 1.21.84.3: Remove LAYOUTLIB definition from makefiles.
2008/02/12 11:05:46 jcn 1.21.84.2: Annotate classes with TOOLKIT_DLLPUBLIC.
Remove -fvisibility=default, -fno-visibility-inlines-hidden hack.
2008/02/11 15:13:37 jcn 1.21.84.1: Make layout stuff in toolkit build with --enable-layout.
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/util/makefile.mk | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/toolkit/util/makefile.mk b/toolkit/util/makefile.mk index 40573610a494..7abd27f28456 100644 --- a/toolkit/util/makefile.mk +++ b/toolkit/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.22 $ +# $Revision: 1.23 $ # -# last change: $Author: obo $ $Date: 2008-02-25 15:26:45 $ +# last change: $Author: kz $ $Date: 2008-03-06 11:55:35 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -103,5 +103,31 @@ RES1FILELIST=$(SRS)$/awt.srs RESLIB1NAME=$(TARGET) RESLIB1SRSFILES=$(RES1FILELIST) +.IF "$(ENABLE_LAYOUT)" == "TRUE" + +TARGET2 = tklayout +LIB2FILES= \ + $(SLB)$/layout_awt.lib \ + $(SLB)$/layoutcore.lib \ + $(SLB)$/vclcompat.lib + +LIB2TARGET= $(SLB)$/$(TARGET2).lib +SHL2TARGET= $(TARGET2)$(UPD)$(DLLPOSTFIX) +SHL2IMPLIB= $(TARGET2) + +SHL2LIBS= $(LIB2TARGET) + +SHL2STDLIBS= \ + $(UNOTOOLSLIB) \ + $(TKLIB) \ + $(TOOLSLIB) \ + $(COMPHELPERLIB) \ + $(VCLLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) \ + $(SALLIB) \ + +.ENDIF # ENABLE_LAYOUT == "TRUE" + # --- Footer ------------------------------------------------------------- .INCLUDE : target.mk |