summaryrefslogtreecommitdiff
path: root/canvas/source/factory
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2010-01-29 15:36:08 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2010-01-29 15:36:08 +0000
commit0ea5581ebf8cf414717af74d22d647ed446d63d2 (patch)
treefa6698372a7ba38d0ef315b0bf5df69c0b6f3cf1 /canvas/source/factory
parent04a59adcc7fd221ee6b7644aa1fa53fed8dd3c0e (diff)
parentc0f197f920974f3fdaf8278dad16dc5ecb994d52 (diff)
ab71: merge with DEV300_m63
Diffstat (limited to 'canvas/source/factory')
-rw-r--r--canvas/source/factory/makefile.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/canvas/source/factory/makefile.mk b/canvas/source/factory/makefile.mk
index 3e9611412463..1051b953ae81 100644
--- a/canvas/source/factory/makefile.mk
+++ b/canvas/source/factory/makefile.mk
@@ -37,7 +37,7 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE : settings.mk
DLLPRE =
-
+.IF "$(L10N_framework)"==""
SLOFILES = \
$(SLO)$/cf_service.obj
@@ -55,6 +55,6 @@ SHL1LIBS = $(SLB)$/$(TARGET).lib
SHL1DEF = $(MISC)$/$(SHL1TARGET).def
DEF1NAME = $(SHL1TARGET)
-
+.ENDIF
.INCLUDE : target.mk