10 files changed, 25 insertions, 43 deletions
diff --git a/sal/qa/osl/socket/makefile.mk b/sal/qa/osl/socket/makefile.mk
index 5bcb252d187a..134bcadb55aa 100755
--- a/sal/qa/osl/socket/makefile.mk
+++ b/sal/qa/osl/socket/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,22 +44,18 @@ CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:Socket by codegen.pl 
+# auto generated Target:Socket by codegen.pl
 SHL1OBJS=  \
     $(SLO)$/osl_Socket.obj
 
 SHL1TARGET=osl_SocketOld
-SHL1STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL1STDLIBS= $(SALLIB) $CPPUNITLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
-#SHL1STDLIBS+=	$(SOLARLIBDIR)$/cppunit.lib
 SHL1STDLIBS+= $(WS2_32LIB)
 .ENDIF
 
 .IF "$(GUI)" == "UNX"
-#SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
 SHL1STDLIBS+= -ldl -lnsl
 .ENDIF
 
@@ -75,9 +71,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
 SHL2OBJS=  \
     $(SLO)$/osl_Socket_tests.obj
 SHL2TARGET= osl_Socket_tests
-SHL2STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL2STDLIBS= $(SALLIB) $CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL2IMPLIB= i$(SHL2TARGET)
 DEF2NAME=    $(SHL2TARGET)
@@ -86,15 +80,13 @@ SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
 # END --------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:Socket by codegen.pl 
+# auto generated Target:Socket by codegen.pl
 SHL3OBJS=  \
     $(SLO)$/sockethelper.obj \
     $(SLO)$/osl_StreamSocket.obj
 
 SHL3TARGET= osl_StreamSocket
-SHL3STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL3STDLIBS= $(SALLIB) $CPPUNITLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
 SHL3STDLIBS += $(WS2_32LIB)
@@ -111,15 +103,13 @@ SHL3VERSIONMAP = $(PRJ)$/qa$/export.map
 # END ------------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:Socket by codegen.pl 
+# auto generated Target:Socket by codegen.pl
 SHL4OBJS=  \
     $(SLO)$/sockethelper.obj \
     $(SLO)$/osl_DatagramSocket.obj
 
 SHL4TARGET= osl_DatagramSocket
-SHL4STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL4STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
 SHL4STDLIBS += $(WS2_32LIB)
@@ -136,15 +126,13 @@ SHL4VERSIONMAP = $(PRJ)$/qa$/export.map
 # END ------------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:Socket by codegen.pl 
+# auto generated Target:Socket by codegen.pl
 SHL5OBJS=  \
     $(SLO)$/sockethelper.obj \
     $(SLO)$/osl_SocketAddr.obj
 
 SHL5TARGET= osl_SocketAddr
-SHL5STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL5STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
 SHL5STDLIBS += $(WS2_32LIB)
@@ -161,15 +149,13 @@ SHL5VERSIONMAP = $(PRJ)$/qa$/export.map
 # END ------------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:Socket by codegen.pl 
+# auto generated Target:Socket by codegen.pl
 SHL6OBJS=  \
     $(SLO)$/sockethelper.obj \
     $(SLO)$/osl_Socket2.obj
 
 SHL6TARGET= osl_Socket2
-SHL6STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL6STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
 SHL6STDLIBS += $(WS2_32LIB)
@@ -186,15 +172,13 @@ SHL6VERSIONMAP = $(PRJ)$/qa$/export.map
 # END ------------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:Socket by codegen.pl 
+# auto generated Target:Socket by codegen.pl
 SHL7OBJS=  \
     $(SLO)$/sockethelper.obj \
     $(SLO)$/osl_ConnectorSocket.obj
 
 SHL7TARGET= osl_ConnectorSocket
-SHL7STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL7STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
 SHL7STDLIBS += $(WS2_32LIB)
@@ -211,15 +195,13 @@ SHL7VERSIONMAP = $(PRJ)$/qa$/export.map
 # END ------------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
-# auto generated Target:Socket by codegen.pl 
+# auto generated Target:Socket by codegen.pl
 SHL8OBJS=  \
     $(SLO)$/sockethelper.obj \
     $(SLO)$/osl_AcceptorSocket.obj
 
 SHL8TARGET= osl_AcceptorSocket
-SHL8STDLIBS=\
-    $(SALLIB) \
-    $(CPPUNITLIB)
+SHL8STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
 SHL8STDLIBS += $(WS2_32LIB)
diff --git a/sal/qa/osl/socket/osl_AcceptorSocket.cxx b/sal/qa/osl/socket/osl_AcceptorSocket.cxx
index 002e27efbd0e..6325385b62ee 100644
--- a/sal/qa/osl/socket/osl_AcceptorSocket.cxx
+++ b/sal/qa/osl/socket/osl_AcceptorSocket.cxx
@@ -61,7 +61,7 @@
 // include files
 //------------------------------------------------------------------------
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
diff --git a/sal/qa/osl/socket/osl_ConnectorSocket.cxx b/sal/qa/osl/socket/osl_ConnectorSocket.cxx
index e3f4ad3e5bea..52c1b12b687e 100644
--- a/sal/qa/osl/socket/osl_ConnectorSocket.cxx
+++ b/sal/qa/osl/socket/osl_ConnectorSocket.cxx
@@ -61,7 +61,7 @@
 // include files
 //------------------------------------------------------------------------
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
diff --git a/sal/qa/osl/socket/osl_DatagramSocket.cxx b/sal/qa/osl/socket/osl_DatagramSocket.cxx
index 4e714d0b655b..4cf27a90ad90 100644
--- a/sal/qa/osl/socket/osl_DatagramSocket.cxx
+++ b/sal/qa/osl/socket/osl_DatagramSocket.cxx
@@ -61,7 +61,7 @@
 // include files
 //------------------------------------------------------------------------
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 //#include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx
index 20f2a80d04da..ccc87ee23a1d 100755
--- a/sal/qa/osl/socket/osl_Socket.cxx
+++ b/sal/qa/osl/socket/osl_Socket.cxx
@@ -66,7 +66,7 @@
 #include <osl_Socket_Const_orig.h>
 #endif
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 using namespace osl;
 using namespace rtl;
diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx
index 29a7924c5503..a7b0ecfa1ef7 100644
--- a/sal/qa/osl/socket/osl_Socket2.cxx
+++ b/sal/qa/osl/socket/osl_Socket2.cxx
@@ -61,7 +61,7 @@
 // include files
 //------------------------------------------------------------------------
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 //#include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
diff --git a/sal/qa/osl/socket/osl_SocketAddr.cxx b/sal/qa/osl/socket/osl_SocketAddr.cxx
index e9db614bade8..63ca58f67936 100644
--- a/sal/qa/osl/socket/osl_SocketAddr.cxx
+++ b/sal/qa/osl/socket/osl_SocketAddr.cxx
@@ -61,7 +61,7 @@
 // include files
 //------------------------------------------------------------------------
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 //#include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
diff --git a/sal/qa/osl/socket/osl_Socket_tests.cxx b/sal/qa/osl/socket/osl_Socket_tests.cxx
index 3122b27b1f1a..7f0fb5bbe87e 100644
--- a/sal/qa/osl/socket/osl_Socket_tests.cxx
+++ b/sal/qa/osl/socket/osl_Socket_tests.cxx
@@ -36,7 +36,7 @@
 //------------------------------------------------------------------------
 #include <osl_Socket_Const.h>
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <osl/socket.hxx>
 //------------------------------------------------------------------------
 // helper functions
diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx
index 0d5a1e54739f..9769d13adb0f 100644
--- a/sal/qa/osl/socket/osl_StreamSocket.cxx
+++ b/sal/qa/osl/socket/osl_StreamSocket.cxx
@@ -61,7 +61,7 @@
 // include files
 //------------------------------------------------------------------------
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 //#include "osl_Socket_Const.h"
 #include "sockethelper.hxx"
diff --git a/sal/qa/osl/socket/sockethelper.cxx b/sal/qa/osl/socket/sockethelper.cxx
index c10ebcb2c8ca..681858f15dc1 100644
--- a/sal/qa/osl/socket/sockethelper.cxx
+++ b/sal/qa/osl/socket/sockethelper.cxx
@@ -32,7 +32,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 #include "sockethelper.hxx"
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 //------------------------------------------------------------------------
 // Ip version definition