diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-10-04 18:33:36 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-10-04 18:34:24 +0200 |
commit | 266598b810b5325bf8948c01c78438210d21b49e (patch) | |
tree | 133469a56c7746f38a415e61c19ecc0546052409 /i18npool | |
parent | 4efbed432d7e04872cc801586d2d2533d573ac00 (diff) |
adapt i18npool unittests to separate RdbTarget makefile requirement
Diffstat (limited to 'i18npool')
-rw-r--r-- | i18npool/CppunitTest_i18npool_test_breakiterator.mk | 6 | ||||
-rw-r--r-- | i18npool/Module_i18npool.mk | 1 | ||||
-rw-r--r-- | i18npool/RdbTarget_i18npool_test_breakiterator.mk | 35 |
3 files changed, 36 insertions, 6 deletions
diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk index 28a8c3914f7e..5be23d7d59a2 100644 --- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk +++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk @@ -63,12 +63,6 @@ $(eval $(call gb_CppunitTest_set_args,i18npool_test_breakiterator,\ --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ )) -$(eval $(call gb_RdbTarget_RdbTarget,i18npool_test_breakiterator)) - -$(eval $(call gb_RdbTarget_add_components,i18npool_test_breakiterator,\ - i18npool/util/i18npool \ -)) - $(call gb_CppunitTest_get_target,i18npool_test_breakiterator) : $(call gb_Module_get_target,i18npool) # vim: set noet sw=4 ts=4: diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk index 022e85f80891..8b6947bf3d17 100644 --- a/i18npool/Module_i18npool.mk +++ b/i18npool/Module_i18npool.mk @@ -59,6 +59,7 @@ endif $(eval $(call gb_Module_add_check_targets,i18npool,\ CppunitTest_i18npool_test_breakiterator \ + RdbTarget_i18npool_test_breakiterator \ )) ifeq ($(OS),IOS) diff --git a/i18npool/RdbTarget_i18npool_test_breakiterator.mk b/i18npool/RdbTarget_i18npool_test_breakiterator.mk new file mode 100644 index 000000000000..994e08e96ea2 --- /dev/null +++ b/i18npool/RdbTarget_i18npool_test_breakiterator.mk @@ -0,0 +1,35 @@ +# -*- 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 +# Matúš Kukan <matus.kukan@gmail.com> +# Portions created by the Initial Developer are Copyright (C) 2011 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,i18npool_test_breakiterator)) + +$(eval $(call gb_RdbTarget_add_components,i18npool_test_breakiterator,\ + i18npool/util/i18npool \ +)) + +# vim: set noet sw=4 ts=4: |