From 9ba8d1f330e0d65a48854d6581c63ccdd9d7bf9f Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Thu, 1 Nov 2007 17:04:12 +0000
Subject: INTEGRATION: CWS dxliberate01 (1.5.360); FILE MERGED 2007/07/23
 10:29:36 thb 1.5.360.1: #i48454# dxcanvas is now part of OOo

---
 scp2/source/canvas/makefile.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'scp2/source')

diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk
index d5ee428fc825..b8244d186d90 100644
--- a/scp2/source/canvas/makefile.mk
+++ b/scp2/source/canvas/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: ihi $ $Date: 2006-08-04 13:34:40 $
+#   last change: $Author: hr $ $Date: 2007-11-01 18:04:12 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -55,12 +55,14 @@ SCPDEFS+=-DSYSTEM_AGG
 .ENDIF
 
 PARFILES= canvascommons.par		\
-          directxcanvas.par     \
           vclcanvas.par
 
 .IF "$(ENABLE_CAIRO)" == "TRUE"
 PARFILES+= cairocanvas.par
 .ENDIF
+.IF "$(ENABLE_DIRECTX)" != ""
+PARFILES+= directxcanvas.par
+.ENDIF
 
 # --- File ---------------------------------------------------------
 
-- 
cgit v1.2.3