From 6152b5efa3490cc8f09f269dc7542ffe3833358c Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Mon, 14 Sep 2009 19:06:55 +0200
Subject: #i103496#: split cppunit in a pure external lib and a lib depending
 on sal -> testshl2

---
 basegfx/test/basegfx1d.cxx |  2 +-
 basegfx/test/basegfx2d.cxx |  2 +-
 basegfx/test/basegfx3d.cxx |  2 +-
 basegfx/test/makefile.mk   | 11 ++++++-----
 4 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'basegfx/test')

diff --git a/basegfx/test/basegfx1d.cxx b/basegfx/test/basegfx1d.cxx
index f058b0034fa7..454ed23289b2 100644
--- a/basegfx/test/basegfx1d.cxx
+++ b/basegfx/test/basegfx1d.cxx
@@ -33,7 +33,7 @@
 #include "precompiled_basegfx.hxx"
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 namespace basegfx1d
 {
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index 8b732e465a51..8f3e340729a2 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -33,7 +33,7 @@
 #include "precompiled_basegfx.hxx"
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/basegfx/test/basegfx3d.cxx b/basegfx/test/basegfx3d.cxx
index fc59ffbced4e..f0fe463ce23d 100644
--- a/basegfx/test/basegfx3d.cxx
+++ b/basegfx/test/basegfx3d.cxx
@@ -33,7 +33,7 @@
 #include "precompiled_basegfx.hxx"
 // autogenerated file with codegen.pl
 
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 
 namespace basegfx3d
 {
diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk
index 8e47a13defdd..d21093f4e08a 100644
--- a/basegfx/test/makefile.mk
+++ b/basegfx/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
@@ -46,7 +46,7 @@ SHL1OBJS=  \
     $(SLO)$/basegfx1d.obj \
     $(SLO)$/basegfx2d.obj \
     $(SLO)$/basegfx3d.obj \
-    $(SLO)$/testtools.obj	
+    $(SLO)$/testtools.obj
 
 # linking statically against basegfx parts
 SHL1LIBS=\
@@ -65,23 +65,24 @@ SHL1STDLIBS= \
                 $(SALLIB)        \
                 $(CPPUHELPERLIB) \
                         $(CPPULIB)       \
+                                $(TESTSHL2LIB) \
                 $(CPPUNITLIB)
 
 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
 
 # --- Enable testshl2 execution in normal build ------------------------
 
-- 
cgit v1.2.3