summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-08-19 22:34:25 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-08-19 22:34:25 +0000
commit1d5733f73174a045b3cc504f1d4a4c161a9c58cc (patch)
treee6f73f4d72122f0cfd68eddaec00d5c9034016a2 /svx
parent431e61f94be4b2979afb9823b2141c82cfb87e6b (diff)
INTEGRATION: CWS aw033 (1.45.14); FILE MERGED
2008/05/14 13:59:24 aw 1.45.14.14: RESYNC: (1.56-1.59); FILE MERGED 2008/03/14 13:53:02 cl 1.45.14.13: RESYNC: (1.53-1.56); FILE MERGED 2008/01/22 12:30:08 aw 1.45.14.12: adaptions and 1st stripping 2007/12/03 16:41:08 aw 1.45.14.11: RESYNC: (1.52-1.53); FILE MERGED 2007/08/09 19:23:55 aw 1.45.14.10: RESYNC: (1.51-1.52); FILE MERGED 2007/06/27 18:40:17 aw 1.45.14.9: RESYNC: (1.49-1.51); FILE MERGED 2007/05/25 12:57:18 aw 1.45.14.8: changes after resync 2007/05/23 21:20:19 aw 1.45.14.7: RESYNC: (1.47-1.49); FILE MERGED 2006/11/28 19:56:48 aw 1.45.14.6: RESYNC: (1.46-1.47); FILE MERGED 2006/10/19 11:04:51 aw 1.45.14.5: #i39532# primitive 2006/08/09 17:24:43 aw 1.45.14.4: #i39532# 2006/05/12 16:19:08 aw 1.45.14.3: RESYNC: (1.45-1.46); FILE MERGED 2006/05/12 12:51:52 aw 1.45.14.2: code changes for primitive support 2005/10/28 11:39:06 aw 1.45.14.1: #i39532#
Diffstat (limited to 'svx')
-rw-r--r--svx/util/makefile.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
index 65ec476948..77b97f097d 100644
--- a/svx/util/makefile.mk
+++ b/svx/util/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.60 $
+# $Revision: 1.61 $
#
# This file is part of OpenOffice.org.
#
@@ -54,6 +54,9 @@ LIB1TARGET= $(SLB)$/$(TARGET).lib
LIB1FILES=\
$(SLB)$/animation.lib \
$(SLB)$/overlay.lib \
+ $(SLB)$/attribute.lib \
+ $(SLB)$/primitive2d.lib \
+ $(SLB)$/primitive3d.lib \
$(SLB)$/svdraw.lib \
$(SLB)$/form.lib
@@ -87,8 +90,7 @@ LIB3FILES=\
$(SLB)$/toolbars.lib \
$(SLB)$/properties.lib \
$(SLB)$/contact.lib \
- $(SLB)$/mixer.lib \
- $(SLB)$/event.lib
+ $(SLB)$/event.lib
LIB4TARGET= $(SLB)$/$(TARGET)_4.lib
LIB4FILES=\
@@ -113,6 +115,7 @@ SHL1STDLIBS= \
$(XMLOFFLIB) \
$(GOODIESLIB) \
$(BASEGFXLIB) \
+ $(DRAWINGLAYERLIB) \
$(BASICLIB) \
$(LNGLIB) \
$(SVTOOLLIB) \