diff options
| author | sb <sb@openoffice.org> | 2010-01-05 13:09:26 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-01-05 13:09:26 +0100 |
| commit | a44418ec3038019bfdffa8e1df3a0a080f74b0a9 (patch) | |
| tree | 6d6c5dd4243b39d2e0c35835a656cafe0a30f066 /configmgr/qa | |
| parent | d9164f354a8951ad220d5ae937517228296d1922 (diff) | |
| parent | 0de34b05f3c1a0409d23b63b9e69d4d7abbe1090 (diff) | |
sb111: merged in DEV300_m68
Diffstat (limited to 'configmgr/qa')
| -rw-r--r-- | configmgr/qa/unit/makefile.mk | 14 | ||||
| -rw-r--r-- | configmgr/qa/unit/test.cxx | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk index 44746a5a6ada..206650eafd33 100644 --- a/configmgr/qa/unit/makefile.mk +++ b/configmgr/qa/unit/makefile.mk @@ -1,7 +1,13 @@ #************************************************************************* # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # +<<<<<<< local # Copyright 2009 by Sun Microsystems, Inc. +======= +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +>>>>>>> other # # OpenOffice.org - a multi-platform office productivity suite # @@ -37,6 +43,7 @@ ENABLE_EXCEPTIONS = TRUE SLOFILES = $(SLO)/test.obj +<<<<<<< local SHL1OBJS = $(SLOFILES) SHL1STDLIBS = \ $(CPPUHELPERLIB) \ @@ -45,6 +52,13 @@ SHL1STDLIBS = \ $(SALLIB) SHL1TARGET = unit SHL1VERSIONMAP = version.map +======= +SHL1TARGET = $(TARGET) +SHL1OBJS = $(SLO)$/performance.obj $(SLO)$/threading.obj $(SLO)$/ubootstrap.obj +SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB) +SHL1VERSIONMAP = export.map +SHL1IMPLIB = i$(SHL1TARGET) +>>>>>>> other DEF1NAME = $(SHL1TARGET) .INCLUDE: target.mk diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx index d7fa8eed753f..d58ffb05f5be 100644 --- a/configmgr/qa/unit/test.cxx +++ b/configmgr/qa/unit/test.cxx @@ -52,7 +52,6 @@ #include "com/sun/star/util/XChangesBatch.hpp" #include "cppuhelper/implbase1.hxx" #include "cppuhelper/servicefactory.hxx" -#include "cppunit/simpleheader.hxx" #include "osl/conditn.hxx" #include "osl/thread.h" #include "osl/thread.hxx" @@ -64,6 +63,7 @@ #include "rtl/ustring.h" #include "rtl/ustring.hxx" #include "sal/types.h" +#include "testshl/simpleheader.hxx" namespace { |