diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-09-14 19:06:55 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-09-14 19:06:55 +0200 |
| commit | 6ea0304b451d06756bf24256fadbf379faf72265 (patch) | |
| tree | 8f53e66fd88011c1b046aeb79a7dd753a51cce89 /sal/qa/systools | |
| parent | c617ecebd7e6f5b5ec29f32ca54decf649c00d7a (diff) | |
#i103496#: split cppunit in a pure external lib and a lib depending on sal -> testshl2
Diffstat (limited to 'sal/qa/systools')
| -rw-r--r-- | sal/qa/systools/makefile.mk | 9 | ||||
| -rw-r--r-- | sal/qa/systools/test_comtools.cxx | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sal/qa/systools/makefile.mk b/sal/qa/systools/makefile.mk index cde5b71c215c..035bef25c34a 100644 --- a/sal/qa/systools/makefile.mk +++ b/sal/qa/systools/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -47,15 +47,12 @@ CXXFLAGS+= $(LFS_CFLAGS) CFLAGS+=/Ob0 # BEGIN ---------------------------------------------------------------- -# auto generated Target:joblist by codegen.pl +# auto generated Target:joblist by codegen.pl SHL1OBJS= \ $(SLO)$/test_comtools.obj SHL1TARGET= test_comtools -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB)\ - uuid.lib +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) uuid.lib SHL1IMPLIB= i$(SHL1TARGET) # SHL1DEF= $(MISC)$/$(SHL1TARGET).def diff --git a/sal/qa/systools/test_comtools.cxx b/sal/qa/systools/test_comtools.cxx index 1957d62d54f2..c61ff435d235 100644 --- a/sal/qa/systools/test_comtools.cxx +++ b/sal/qa/systools/test_comtools.cxx @@ -33,7 +33,7 @@ #include "precompiled_sal.hxx" // autogenerated file with codegen.pl -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <systools/win32/comtools.hxx> class COMObject : public IUnknown |