summaryrefslogtreecommitdiff
path: root/cppuhelper/source
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2005-10-27 16:19:33 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2005-10-27 16:19:33 +0000
commit0b336c1259a129c0a84ba203d3f44c808f31144f (patch)
tree41be6107f2687e44d6a1df1ed40505fcf86688f4 /cppuhelper/source
parent33fe691f0ec8114440716b4efe8e92f392cf66b0 (diff)
INTEGRATION: CWS skeletonmaker (1.39.18); FILE MERGED
2005/10/14 15:55:58 jsc 1.39.18.2: RESYNC: (1.39-1.40); FILE MERGED 2005/07/20 08:19:46 jsc 1.39.18.1: #i51720# new propertysetmixin.[h|c]xx
Diffstat (limited to 'cppuhelper/source')
-rw-r--r--cppuhelper/source/makefile.mk8
1 files changed, 5 insertions, 3 deletions
diff --git a/cppuhelper/source/makefile.mk b/cppuhelper/source/makefile.mk
index 4c47328f5cfb..b20aa8125dfb 100644
--- a/cppuhelper/source/makefile.mk
+++ b/cppuhelper/source/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.40 $
+# $Revision: 1.41 $
#
-# last change: $Author: rt $ $Date: 2005-09-08 09:28:11 $
+# last change: $Author: hr $ $Date: 2005-10-27 17:19:33 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -139,7 +139,8 @@ SLOFILES= \
$(SLO)$/implementationentry.obj \
$(SLO)$/access_control.obj \
$(SLO)$/macro_expander.obj \
- $(SLO)$/unourl.obj
+ $(SLO)$/unourl.obj \
+ $(SLO)$/propertysetmixin.obj
.IF "$(GUI)" == "WNT"
SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID)
@@ -149,6 +150,7 @@ SHL1TARGET=uno_$(TARGET)$(COMID)
SHL1STDLIBS= \
$(SALLIB) \
+ $(SALHELPERLIB) \
$(CPPULIB)
SHL1DEPN=