summaryrefslogtreecommitdiff
path: root/cppuhelper
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-09-20 13:26:31 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-09-20 13:26:31 +0000
commit404fac9d4e7ba306b7a1a112bb8021f04539e12c (patch)
tree3ce59d2a6f9bbb608dfa50227961bd7bb729ee65 /cppuhelper
parent311334f997d4ee7ac4bfc9378d701fe58c98d501 (diff)
INTEGRATION: CWS os2port01 (1.20.78); FILE MERGED
2007/07/13 14:16:45 obr 1.20.78.2: RESYNC: (1.20-1.22); FILE MERGED 2006/12/28 14:53:54 ydario 1.20.78.1: OS/2 initial import.
Diffstat (limited to 'cppuhelper')
-rw-r--r--cppuhelper/test/makefile.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/cppuhelper/test/makefile.mk b/cppuhelper/test/makefile.mk
index 926cb6622e57..4d2eea472a6a 100644
--- a/cppuhelper/test/makefile.mk
+++ b/cppuhelper/test/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.22 $
+# $Revision: 1.23 $
#
-# last change: $Author: obo $ $Date: 2007-01-25 12:07:51 $
+# last change: $Author: vg $ $Date: 2007-09-20 14:26:31 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -135,7 +135,7 @@ TYPES:=test.A;test.BA;test.CA;test.DBA;test.E;test.FE;test.G;test.H;test.I
HELPERTYPES:=com.sun.star.uno.XReference;com.sun.star.uno.XAdapter;com.sun.star.uno.XAggregation;com.sun.star.uno.XWeak;com.sun.star.lang.XComponent;com.sun.star.lang.XTypeProvider;com.sun.star.lang.XEventListener;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.registry.XRegistryKey;com.sun.star.lang.XInitialization;com.sun.star.lang.XServiceInfo;com.sun.star.loader.XImplementationLoader;com.sun.star.lang.IllegalAccessException;com.sun.star.beans.XVetoableChangeListener;com.sun.star.beans.XPropertySet;com.sun.star.uno.XComponentContext
FACTORYTYPES:=com.sun.star.lang.XComponent;com.sun.star.registry.XSimpleRegistry;com.sun.star.lang.XInitialization;com.sun.star.lang.XMultiServiceFactory;com.sun.star.loader.XImplementationLoader;com.sun.star.registry.XImplementationRegistration;com.sun.star.container.XSet;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XMultiComponentFactory
-.IF "$(OS)" == "WNT"
+.IF "$(OS)" == "WNT" || "$(OS)" == "OS2"
UNO_PATH = $(SOLARBINDIR)
UNO_OUT = $(OUT)$/bin
.ELSE