#i103496#: split cppunit in a pure external lib and a lib depending on sal -> testshl2

11 files changed, 38 insertions, 37 deletions

diff --git a/writerfilter/qa/cppunittests/doctok/makefile.mk b/writerfilter/qa/cppunittests/doctok/makefile.mk
index ca8d3e01a7c4..d9a704320185 100644
--- a/writerfilter/qa/cppunittests/doctok/makefile.mk
+++ b/writerfilter/qa/cppunittests/doctok/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
@@ -43,7 +43,7 @@ ENABLE_EXCEPTIONS=TRUE
 
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:doctok by codegen.pl 
+# auto generated Target:doctok by codegen.pl
 SHL1OBJS=  \
        $(SLO)$/testdoctok.obj
 
@@ -53,6 +53,7 @@ SHL1STDLIBS=\
     $(UCBHELPERLIB) \
     $(CPPUHELPERLIB) \
     $(CPPULIB) \
+     $(TESTSHL2LIB)    \
    $(CPPUNITLIB)
 
 SHL1LIBS=\
diff --git a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
index 70d25ab21a80..0ed8035fb1d3 100644
--- a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
+++ b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
@@ -1,6 +1,6 @@
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include <osl/process.h>
 #include <ucbhelper/contentbroker.hxx>
diff --git a/writerfilter/qa/cppunittests/odiapi/makefile.mk b/writerfilter/qa/cppunittests/odiapi/makefile.mk
index b9e50e93919f..9833df5e009b 100644
--- a/writerfilter/qa/cppunittests/odiapi/makefile.mk
+++ b/writerfilter/qa/cppunittests/odiapi/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
@@ -39,7 +39,7 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl 
+# auto generated Target:testjob by codegen.pl
 
 .IF "$(GUI)" == "WNT"
     #CFLAGS+=/Ob1
@@ -52,14 +52,14 @@ SHL1OBJS=\
     $(SLO)$/testCore.obj
 
 SHL1TARGET=$(TARGET)
-SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) 
-   
+SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(TESTSHL2LIB) $(CPPUNITLIB)
+
 .IF "$(GUI)"=="WNT"
-SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib $(LB)$/iodiapi.lib
+SHL1STDLIBS+=   $(LB)$/iodiapi.lib
 .ELIF "$(GUI)"=="UNX" && "$(GUIBASE)"!="aqua"
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a $(LB)$/libodiapi.so
+SHL1STDLIBS+=$(LB)$/libodiapi.so
 .ELIF "$(GUI)"=="UNX" && "$(GUIBASE)"=="aqua"
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a $(LB)$/libodiapi.dylib
+SHL1STDLIBS+=$(LB)$/libodiapi.dylib
 .ENDIF
 
 SHL1IMPLIB= i$(SHL1TARGET)
diff --git a/writerfilter/qa/cppunittests/odiapi/testCore.cxx b/writerfilter/qa/cppunittests/odiapi/testCore.cxx
index cbdc47e5d872..295f3895df5f 100644
--- a/writerfilter/qa/cppunittests/odiapi/testCore.cxx
+++ b/writerfilter/qa/cppunittests/odiapi/testCore.cxx
@@ -1,6 +1,6 @@
 /*  Copyright 2005 Sun Microsystems, Inc. */
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <odiapi/core/Node.hxx>
 #include <odiapi/props/Properties.hxx>
 
diff --git a/writerfilter/qa/cppunittests/odiapi/testProperty.cxx b/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
index b2a633f9b70f..c1ef49a4941c 100644
--- a/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
+++ b/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
@@ -1,6 +1,6 @@
 /*  Copyright 2005 Sun Microsystems, Inc. */
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <odiapi/props/Properties.hxx>
 #include "FileLoggerImpl.hxx"
 #include "ExternalViewLogger.hxx"
diff --git a/writerfilter/qa/cppunittests/qname/makefile.mk b/writerfilter/qa/cppunittests/qname/makefile.mk
index d8a5916d107a..555c633b2cd6 100644
--- a/writerfilter/qa/cppunittests/qname/makefile.mk
+++ b/writerfilter/qa/cppunittests/qname/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,24 +42,24 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl 
+# auto generated Target:testjob by codegen.pl
 
 .IF "$(GUI)" == "WNT"
     CFLAGS+=/Ob1
 .ENDIF
 
 SHL1OBJS=\
-    $(SLO)$/testQName.obj 
+    $(SLO)$/testQName.obj
 
 SHL1TARGET=$(TARGET)
 
-SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) 
+SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
-SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib $(LB)$/iodiapi.lib
+SHL1STDLIBS+=   $(LB)$/iodiapi.lib
 .ENDIF
 .IF "$(GUI)" == "UNX"
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a $(LB)$/libodiapi.so
+SHL1STDLIBS+=$(LB)$/libodiapi.so
 .ENDIF
 
 SHL1IMPLIB= i$(SHL1TARGET)
diff --git a/writerfilter/qa/cppunittests/qname/testQName.cxx b/writerfilter/qa/cppunittests/qname/testQName.cxx
index b244015cf575..c66cc15de863 100644
--- a/writerfilter/qa/cppunittests/qname/testQName.cxx
+++ b/writerfilter/qa/cppunittests/qname/testQName.cxx
@@ -1,6 +1,6 @@
 /*  Copyright 2005 Sun Microsystems, Inc. */
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <odiapi/qname/QName.hxx>
 #include <stdio.h>
 #include <rtl/string.hxx>
diff --git a/writerfilter/qa/cppunittests/sl/makefile.mk b/writerfilter/qa/cppunittests/sl/makefile.mk
index d9d9abd0d50c..6efe7c63da97 100644
--- a/writerfilter/qa/cppunittests/sl/makefile.mk
+++ b/writerfilter/qa/cppunittests/sl/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,21 +42,21 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl 
+# auto generated Target:testjob by codegen.pl
 
 SHL1OBJS=\
     $(SLO)$/testOD_SL.obj \
     $(SLO)$/FileLoggerImpl.obj\
-    $(SLO)$/ExternalViewLogger.obj	
+    $(SLO)$/ExternalViewLogger.obj
 
 SHL1TARGET=$(TARGET)
-SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) 
-   
+SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+
 .IF "$(GUI)" == "WNT"
-SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib $(LB)$/iodiapi.lib
+SHL1STDLIBS+=$(LB)$/iodiapi.lib
 .ENDIF
 .IF "$(GUI)" == "UNX"
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a $(LB)$/libodiapi.so
+SHL1STDLIBS+=$(LB)$/libodiapi.so
 .ENDIF
 
 SHL1IMPLIB= i$(SHL1TARGET)
diff --git a/writerfilter/qa/cppunittests/sl/testOD_SL.cxx b/writerfilter/qa/cppunittests/sl/testOD_SL.cxx
index 13f95f94eae6..f0ba1898783e 100644
--- a/writerfilter/qa/cppunittests/sl/testOD_SL.cxx
+++ b/writerfilter/qa/cppunittests/sl/testOD_SL.cxx
@@ -1,6 +1,6 @@
 /*  Copyright 2005 Sun Microsystems, Inc. */
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <odiapi/xxml/XXmlReader.hxx>
 #include <odiapi/props/Properties.hxx>
 #include <odiapi/sl/od_sl.hxx>
@@ -90,4 +90,4 @@ public:
 // register test suites
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestXXML, "TestXXML");
 
-NOADDITIONAL;
\ No newline at end of file
+NOADDITIONAL;
diff --git a/writerfilter/qa/cppunittests/xxml/makefile.mk b/writerfilter/qa/cppunittests/xxml/makefile.mk
index 0cd8c1e57067..0af305b4313f 100644
--- a/writerfilter/qa/cppunittests/xxml/makefile.mk
+++ b/writerfilter/qa/cppunittests/xxml/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,23 +42,23 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:testjob by codegen.pl 
+# auto generated Target:testjob by codegen.pl
 
 .IF "$(GUI)" == "WNT"
     CFLAGS+=/Ob1
 .ENDIF
 
 SHL1OBJS=\
-    $(SLO)$/testXXML.obj 
+    $(SLO)$/testXXML.obj
 
 SHL1TARGET=$(TARGET)
-SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) 
-   
+SHL1STDLIBS=$(SALLIB) $(TOOLSLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+
 .IF "$(GUI)" == "WNT"
-SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib $(LB)$/iodiapi.lib
+SHL1STDLIBS+=$(LB)$/iodiapi.lib
 .ENDIF
 .IF "$(GUI)" == "UNX"
-SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a $(LB)$/libodiapi.so
+SHL1STDLIBS+=$(LB)$/libodiapi.so
 .ENDIF
 
 SHL1IMPLIB= i$(SHL1TARGET)
diff --git a/writerfilter/qa/cppunittests/xxml/testXXML.cxx b/writerfilter/qa/cppunittests/xxml/testXXML.cxx
index 7a29c1b15882..2c132e38b585 100644
--- a/writerfilter/qa/cppunittests/xxml/testXXML.cxx
+++ b/writerfilter/qa/cppunittests/xxml/testXXML.cxx
@@ -1,6 +1,6 @@
 /*  Copyright 2005 Sun Microsystems, Inc. */
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <odiapi/xxml/XXmlReader.hxx>
 #include <osl/time.h>
 
@@ -157,4 +157,4 @@ public:
 // register test suites
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestXXML, "TestXXML");
 
-NOADDITIONAL;
\ No newline at end of file
+NOADDITIONAL;