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 | b8a58871dcc7e2398e95d518dff2f739712515e3 (patch) | |
| tree | 3e9e8da25856a3c600747976f6c3b9ac3b18e811 /shell | |
| parent | e7c6e5d2c248cfb935c91882a3a1e64fea7550b4 (diff) | |
#i103496#: split cppunit in a pure external lib and a lib depending on sal -> testshl2
Diffstat (limited to 'shell')
| -rwxr-xr-x | shell/qa/makefile.mk | 12 | ||||
| -rwxr-xr-x | shell/qa/recent_docs.cxx | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/shell/qa/makefile.mk b/shell/qa/makefile.mk index 70c42e646391..e935abd1c0d6 100755 --- a/shell/qa/makefile.mk +++ b/shell/qa/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 @@ -42,17 +42,13 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk # BEGIN ---------------------------------------------------------------- -# auto generated Target:testjob by codegen.pl +# auto generated Target:testjob by codegen.pl -SHL1OBJS=$(SLO)$/recent_docs.obj $(SLO)$/xml_parser.obj +SHL1OBJS=$(SLO)$/recent_docs.obj $(SLO)$/xml_parser.obj SHL1TARGET=recent_docs -SHL1STDLIBS=$(SALLIB) +SHL1STDLIBS=$(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) -.IF "$(GUI)" == "WNT" -SHL1STDLIBS+= $(SOLARLIBDIR)$/cppunit.lib -.ENDIF .IF "$(GUI)" == "UNX" -SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a \ ..$/unxsols4.pro$/slb$/libsysshell.a \ $(EXPATASCII3RDLIB) .ENDIF diff --git a/shell/qa/recent_docs.cxx b/shell/qa/recent_docs.cxx index df0266d24156..5936c8c033b1 100755 --- a/shell/qa/recent_docs.cxx +++ b/shell/qa/recent_docs.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_shell.hxx" -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include "systemshell.hxx" #include "osl/file.hxx" |