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 | 416fc7a2be488e0e0234e88455761f62b8a6ac5a (patch) | |
| tree | f79aaa30a72e68232ca89a98a50c307a47d894ce /unoxml/test | |
| parent | 10b494ec3d7bab04e82c1f8bb51eadd15ce38ae5 (diff) | |
#i103496#: split cppunit in a pure external lib and a lib depending on sal -> testshl2
Diffstat (limited to 'unoxml/test')
| -rw-r--r-- | unoxml/test/domtest.cxx | 2 | ||||
| -rw-r--r-- | unoxml/test/makefile.mk | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/unoxml/test/domtest.cxx b/unoxml/test/domtest.cxx index 6687669fd875..84a324f3eb4c 100644 --- a/unoxml/test/domtest.cxx +++ b/unoxml/test/domtest.cxx @@ -30,7 +30,7 @@ // autogenerated file with codegen.pl -#include <cppunit/simpleheader.hxx> +#include <testshl/simpleheader.hxx> #include <rtl/ref.hxx> #include <osl/file.hxx> diff --git a/unoxml/test/makefile.mk b/unoxml/test/makefile.mk index 781f8a46bf96..3df2aa5d0d28 100644 --- a/unoxml/test/makefile.mk +++ b/unoxml/test/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 @@ -44,7 +44,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Common ---------------------------------------------------------- # BEGIN ---------------------------------------------------------------- -# auto generated Target:tests by codegen.pl +# auto generated Target:tests by codegen.pl SHL1OBJS= \ $(SLO)$/domtest.obj @@ -66,6 +66,7 @@ SHL1STDLIBS= \ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPUNITLIB) \ + $(TESTSHL2LIB) \ $(CPPULIB) \ $(SAXLIB) \ $(SALLIB)\ @@ -74,18 +75,18 @@ SHL1STDLIBS= \ SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) -SHL1VERSIONMAP = export.map +SHL1VERSIONMAP = export.map # END ------------------------------------------------------------------ #------------------------------- All object files ------------------------------- # do this here, so we get right dependencies -SLOFILES=$(SHL1OBJS) +SLOFILES=$(SHL1OBJS) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk -.INCLUDE : _cppunit.mk +.INCLUDE : _cppunit.mk # --- Fake uno bootstrap ------------------------ @@ -100,7 +101,7 @@ $(MISC)$/unoxml_unittest_succeeded : $(SHL1TARGETN) $(BIN)$/unoxml_unittest_test @echo ---------------------------------------------------------- @echo - start unit test on library $(SHL1TARGETN) @echo ---------------------------------------------------------- - testshl2 -forward $(BIN)$/ -sf $(mktmp ) $(SHL1TARGETN) + $(TESTSHL2) -forward $(BIN)$/ -sf $(mktmp ) $(SHL1TARGETN) $(TOUCH) $@ ALLTAR : $(MISC)$/unoxml_unittest_succeeded |