summaryrefslogtreecommitdiff
path: root/lotuswordpro
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-10-04 18:14:51 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-10-04 18:34:23 +0200
commit417c794fa42ff070b5c767532243830e1b9a9127 (patch)
tree0a7a21398892f0abc37cf12e80f1dd5fc4479f8d /lotuswordpro
parent977ea14f37c4d53668ed89ed79009b1e15fcb8a6 (diff)
adapt lotuswordpro unittests to separate RdbTarget makefile requirement
Diffstat (limited to 'lotuswordpro')
-rw-r--r--lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk6
-rw-r--r--lotuswordpro/Module_lotuswordpro.mk1
-rw-r--r--lotuswordpro/RdbTarget_lotuswordpro_test_lotuswordpro.mk39
3 files changed, 40 insertions, 6 deletions
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index a1ffb35fce6e..66aee3400ffe 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -71,12 +71,6 @@ $(eval $(call gb_CppunitTest_set_args,lotuswordpro_test_lotuswordpro,\
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
))
-$(eval $(call gb_RdbTarget_RdbTarget,lotuswordpro_test_lotuswordpro))
-
-$(eval $(call gb_RdbTarget_add_components,lotuswordpro_test_lotuswordpro,\
- lotuswordpro/util/lwpfilter,\
-))
-
# we need to explicitly depend on library lwpft because it is not implied
# by a link relation
$(call gb_CppunitTest_get_target,lotuswordpro_test_lotuswordpro) : $(call gb_Library_get_target,lwpft)
diff --git a/lotuswordpro/Module_lotuswordpro.mk b/lotuswordpro/Module_lotuswordpro.mk
index 193276786b80..9e756c90e169 100644
--- a/lotuswordpro/Module_lotuswordpro.mk
+++ b/lotuswordpro/Module_lotuswordpro.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_targets,lotuswordpro,\
$(eval $(call gb_Module_add_check_targets,lotuswordpro,\
CppunitTest_lotuswordpro_test_lotuswordpro \
+ RdbTarget_lotuswordpro_test_lotuswordpro \
))
# vim: set noet sw=4 ts=4:
diff --git a/lotuswordpro/RdbTarget_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/RdbTarget_lotuswordpro_test_lotuswordpro.mk
new file mode 100644
index 000000000000..8d1f7c6ebca1
--- /dev/null
+++ b/lotuswordpro/RdbTarget_lotuswordpro_test_lotuswordpro.mk
@@ -0,0 +1,39 @@
+# -*- 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
+# Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+# Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com>
+# David Tardon, Red Hat Inc. <dtardon@redhat.com>
+#
+# 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,lotuswordpro_test_lotuswordpro))
+
+$(eval $(call gb_RdbTarget_add_components,lotuswordpro_test_lotuswordpro,\
+ lotuswordpro/util/lwpfilter,\
+))
+
+# vim: set noet sw=4 ts=4: