summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-02-28 09:48:14 +0000
committerKurt Zenker <kz@openoffice.org>2006-02-28 09:48:14 +0000
commitdf3ab09c40a13b606495b3b3f64ed16d1486b1f0 (patch)
tree90c2e3bc14fecfbfd8225430cd985694ba9de606
parentdf6004340d7f2535c64901694ce2ce051ecb809b (diff)
INTEGRATION: CWS cairocanvas (1.24.108); FILE MERGED
2006/01/27 13:22:33 thb 1.24.108.3: RESYNC: (1.27-1.29); FILE MERGED 2005/12/12 19:05:54 thb 1.24.108.2: RESYNC: (1.24-1.27); FILE MERGED 2005/11/09 13:00:28 radekdoulik 1.24.108.1: Issue number: #51657 Submitted by: radekdoulik Reviewed by: radekdoulik scp2 changes to include cairo canvas component in serveces.rdb
-rw-r--r--scp2/util/makefile.mk10
1 files changed, 7 insertions, 3 deletions
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index bee048aa518b..0d74241735a1 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.30 $
+# $Revision: 1.31 $
#
-# last change: $Author: rt $ $Date: 2006-02-06 13:51:48 $
+# last change: $Author: kz $ $Date: 2006-02-28 10:48:14 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -152,7 +152,11 @@ SCP1FILES += \
SCP1FILES += \
vclcanvas.par
-
+
+.IF "$(ENABLE_CAIRO)" == "TRUE"
+SCP1FILES += cairocanvas.par
+.ENDIF
+
# ------------------------------------------------------------------------
# OpenOffice.org with JRE