diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-10-04 18:28:30 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-10-04 18:34:24 +0200 |
commit | 8a3a108f5e545f667ad2cf8043aa102b347bd2f1 (patch) | |
tree | fdd736c3088306af30bdaabd0a7c087cb1c4e9f3 | |
parent | ddf0f4f36f29b0fc360c1d423cd4eb92edf8d3d9 (diff) |
adapt sd unittests to separate RdbTarget makefile requirement
-rw-r--r-- | sd/CppunitTest_sd_uimpress.mk | 7 | ||||
-rw-r--r-- | sd/Module_sd.mk | 1 | ||||
-rw-r--r-- | sd/RdbTarget_sd_uimpress.mk | 36 |
3 files changed, 37 insertions, 7 deletions
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index 6791a530043e..69d3b3aa7b87 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -95,11 +95,4 @@ $(eval $(call gb_CppunitTest_set_args,sd_uimpress,\ --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ )) -$(eval $(call gb_RdbTarget_RdbTarget,sd_uimpress)) - -$(eval $(call gb_RdbTarget_add_components,sd_uimpress,\ - framework/util/fwk \ - i18npool/util/i18npool \ -)) - # vim: set noet sw=4 ts=4: diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk index c374fb1b82a6..193cba5df67c 100644 --- a/sd/Module_sd.mk +++ b/sd/Module_sd.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Module_add_targets,sd,\ $(eval $(call gb_Module_add_check_targets,sd,\ CppunitTest_sd_uimpress \ + RdbTarget_sd_uimpress \ )) $(eval $(call gb_Module_add_subsequentcheck_targets,sd,\ diff --git a/sd/RdbTarget_sd_uimpress.mk b/sd/RdbTarget_sd_uimpress.mk new file mode 100644 index 000000000000..9265695f3cfe --- /dev/null +++ b/sd/RdbTarget_sd_uimpress.mk @@ -0,0 +1,36 @@ +# -*- 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,sd_uimpress)) + +$(eval $(call gb_RdbTarget_add_components,sd_uimpress,\ + framework/util/fwk \ + i18npool/util/i18npool \ +)) + +# vim: set noet sw=4 ts=4: |