From 6ea0304b451d06756bf24256fadbf379faf72265 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

---
 salhelper/qa/makefile.mk  | 6 +++---
 salhelper/qa/test_api.cxx | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'salhelper')

diff --git a/salhelper/qa/makefile.mk b/salhelper/qa/makefile.mk
index 9987b3a276cd..4589338a5316 100644
--- a/salhelper/qa/makefile.mk
+++ b/salhelper/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
@@ -39,7 +39,7 @@ ENABLE_EXCEPTIONS := TRUE
 
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)$/test_api.obj
-SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(SALHELPERLIB)
+SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(SALHELPERLIB) $(TESTSHL2LIB)
 SHL1IMPLIB = i$(SHL1TARGET)
 SHL1VERSIONMAP = version.map
 DEF1NAME = $(SHL1TARGET)
@@ -51,4 +51,4 @@ SLOFILES = $(SHL1OBJS)
 ALLTAR: test
 
 test .PHONY: $(SHL1TARGETN)
-    cd $(SHL1TARGETN:d) && testshl2 $(SHL1TARGETN:f)
+    cd $(SHL1TARGETN:d) && $(TESTSHL2) $(SHL1TARGETN:f)
diff --git a/salhelper/qa/test_api.cxx b/salhelper/qa/test_api.cxx
index 9957f6a56cf1..83df7ec084c6 100644
--- a/salhelper/qa/test_api.cxx
+++ b/salhelper/qa/test_api.cxx
@@ -59,7 +59,7 @@ std::type_info const & getSimpleReferenceObjectTypeInfo()
 
 }
 
-#include "cppunit/simpleheader.hxx"
+#include "testshl/simpleheader.hxx"
 #include "osl/mutex.hxx"
 #include "salhelper/condition.hxx"
 #include "salhelper/dynload.hxx"
-- 
cgit v1.2.3