tweak to capture recent changes in starmath and gbuild

Change-Id: I1e7fb1ae0da02a60f1ee3655a09693c11108f61d

1 files changed, 18 insertions, 45 deletions

diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index e8cbc6dff101..b065032cf96c 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
 # The contents of this file are subject to the Mozilla Public License Version
@@ -10,12 +11,11 @@
 # for the specific language governing rights and limitations under the
 # License.
 #
-# The Initial Developer of the Original Code is
-#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
 # Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
 #
 # For minor contributions see the git repository.
 #
@@ -29,34 +29,27 @@ $(eval $(call gb_CppunitTest_CppunitTest,starmath_qa_cppunit))
 
 $(eval $(call gb_CppunitTest_set_include,starmath_qa_cppunit,\
     $$(INCLUDE) \
-    -I$(realpath $(SRCDIR)/starmath/inc) \
-    -I$(realpath $(SRCDIR)/starmath/inc/pch) \
-    -I$(OUTDIR)/inc \
+    -I$(SRCDIR)/starmath/inc \
 ))
 
-$(eval $(call gb_CppunitTest_add_api,starmath_qa_cppunit,\
+$(eval $(call gb_CppunitTest_use_api,starmath_qa_cppunit,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_set_defs,starmath_qa_cppunit,\
-    $$(DEFS) \
-    -DSMDLL \
-))
-
-$(eval $(call gb_CppunitTest_add_library_objects,starmath_qa_cppunit,\
+$(eval $(call gb_CppunitTest_use_library_objects,starmath_qa_cppunit,\
     sm \
 ))
 
 $(call gb_CxxObject_get_target,starmath/qa/cppunit/test_starmath): $(WORKDIR)/AllLangRes/sm
 
-$(eval $(call gb_CppunitTest_add_linked_libs,starmath_qa_cppunit,\
+$(eval $(call gb_CppunitTest_use_libraries,starmath_qa_cppunit,\
     comphelper \
     cppu \
     cppuhelper \
     editeng \
     i18nisolang1 \
-    i18npaper \
+    i18nutil \
     sal \
     sfx \
     sot \
@@ -77,42 +70,22 @@ $(eval $(call gb_CppunitTest_add_exception_objects,starmath_qa_cppunit,\
     starmath/qa/cppunit/test_starmath \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,starmath_qa_cppunit))
-
-$(eval $(call gb_CppunitTest_add_type_rdbs,starmath_qa_cppunit,\
-    types \
-))
-
-$(eval $(call gb_CppunitTest_add_service_rdbs,starmath_qa_cppunit,\
-    starmath_qa_cppunit \
-))
-
-$(eval $(call gb_CppunitTest_set_args,starmath_qa_cppunit,\
-    --headless \
-    --invisible \
-    --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
-))
-
-$(eval $(call gb_RdbTarget_RdbTarget,starmath_qa_cppunit))
+$(eval $(call gb_CppunitTest_use_ure,starmath_qa_cppunit))
 
-$(eval $(call gb_RdbTarget_add_components,starmath_qa_cppunit,\
+$(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\
+    configmgr/source/configmgr \
+    dtrans/util/mcnttype \
     framework/util/fwk \
     i18npool/util/i18npool \
     toolkit/util/tk \
     sfx2/util/sfx \
 ))
 
-$(eval $(call gb_RdbTarget_add_old_components,starmath_qa_cppunit,\
-    configmgr \
-    mcnttype \
-    vcl \
-))
-
 ifeq ($(strip $(OS)),WNT)
-$(eval $(call gb_RdbTarget_add_old_components,starmath_qa_cppunit,\
-    ftransl \
-    sysdtrans \
+$(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\
+    dtrans/util/ftransl \
+    dtrans/util/sysdtrans \
 ))
 endif
 
-# vim: set noet sw=4:
+# vim: set noet sw=4 ts=4: