adapt starmath unittests to separate RdbTarget makefile requirement

3 files changed, 57 insertions, 22 deletions

diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index 0e73dcca904c..0adf9566c2a9 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -92,26 +92,4 @@ $(eval $(call gb_CppunitTest_set_args,starmath_qa_cppunit,\
     --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
 ))
 
-$(eval $(call gb_RdbTarget_RdbTarget,starmath_qa_cppunit))
-
-$(eval $(call gb_RdbTarget_add_components,starmath_qa_cppunit,\
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    toolkit/util/tk \
-    sfx2/util/sfx \
-))
-
-$(eval $(call gb_RdbTarget_add_old_components,starmath_qa_cppunit,\
-    component/vcl/vcl \
-    configmgr \
-    mcnttype \
-))
-
-ifeq ($(strip $(OS)),WNT)
-$(eval $(call gb_RdbTarget_add_old_components,starmath_qa_cppunit,\
-    ftransl \
-    sysdtrans \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk
index b3763c21c01c..6da29aa96e2d 100644
--- a/starmath/Module_starmath.mk
+++ b/starmath/Module_starmath.mk
@@ -35,6 +35,12 @@ $(eval $(call gb_Module_add_targets,starmath,\
 	Package_uiconfig \
 ))
 
+# was this missing accidentally?
+#$(eval $(call gb_Module_add_check_targets,starmath,\
+    CppunitTest_starmath_qa_cppunit \
+    RdbTarget_starmath_qa_cppunit \
+))
+
 $(eval $(call gb_Module_add_subsequentcheck_targets,starmath,\
 	JunitTest_sm_unoapi \
 ))
diff --git a/starmath/RdbTarget_starmath_qa_cppunit.mk b/starmath/RdbTarget_starmath_qa_cppunit.mk
new file mode 100644
index 000000000000..64b7baaf6aea
--- /dev/null
+++ b/starmath/RdbTarget_starmath_qa_cppunit.mk
@@ -0,0 +1,51 @@
+# -*- 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
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# 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):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_RdbTarget_RdbTarget,starmath_qa_cppunit))
+
+$(eval $(call gb_RdbTarget_add_components,starmath_qa_cppunit,\
+    framework/util/fwk \
+    i18npool/util/i18npool \
+    toolkit/util/tk \
+    sfx2/util/sfx \
+))
+
+$(eval $(call gb_RdbTarget_add_old_components,starmath_qa_cppunit,\
+    component/vcl/vcl \
+    configmgr \
+    mcnttype \
+))
+
+ifeq ($(strip $(OS)),WNT)
+$(eval $(call gb_RdbTarget_add_old_components,starmath_qa_cppunit,\
+    ftransl \
+    sysdtrans \
+))
+endif
+
+# vim: set noet sw=4 ts=4: