diff options
| -rw-r--r-- | Repository.mk | 1 | ||||
| -rw-r--r-- | sc/CppunitTest_sc_cellrangesbase.mk | 1 | ||||
| -rw-r--r-- | sc/CppunitTest_sc_datapilotdescriptorbase.mk | 1 | ||||
| -rw-r--r-- | sc/CppunitTest_sc_datapilotfieldobj.mk | 1 | ||||
| -rw-r--r-- | sc/CppunitTest_sc_namedrangeobj.mk | 1 | ||||
| -rw-r--r-- | sc/CppunitTest_sc_spreadsheetobj.mk | 1 | ||||
| -rw-r--r-- | sc/CppunitTest_sc_tableautoformatfield.mk | 1 | ||||
| -rw-r--r-- | test/Library_subsequenttest.mk | 72 | ||||
| -rw-r--r-- | test/Library_test.mk | 1 | ||||
| -rw-r--r-- | test/Module_test.mk | 1 |
10 files changed, 80 insertions, 1 deletions
diff --git a/Repository.mk b/Repository.mk index 2f54f98b727d..ffa61670acb7 100644 --- a/Repository.mk +++ b/Repository.mk @@ -332,6 +332,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ sofficeapp \ srtrs1 \ store \ + subsequenttest \ test \ textconv_dict \ ucb1 \ diff --git a/sc/CppunitTest_sc_cellrangesbase.mk b/sc/CppunitTest_sc_cellrangesbase.mk index 3dff64379578..12c96a866561 100644 --- a/sc/CppunitTest_sc_cellrangesbase.mk +++ b/sc/CppunitTest_sc_cellrangesbase.mk @@ -63,6 +63,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_cellrangesbase, \ test \ tl \ tk \ + subsequenttest \ ucbhelper \ unotest \ utl \ diff --git a/sc/CppunitTest_sc_datapilotdescriptorbase.mk b/sc/CppunitTest_sc_datapilotdescriptorbase.mk index 16e5cd906136..31a49b80a8f7 100644 --- a/sc/CppunitTest_sc_datapilotdescriptorbase.mk +++ b/sc/CppunitTest_sc_datapilotdescriptorbase.mk @@ -63,6 +63,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_datapilotdescriptorbase, \ test \ tl \ tk \ + subsequenttest \ ucbhelper \ unotest \ utl \ diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index 8039eccb26bb..5898d3d57ef9 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -63,6 +63,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_datapilotfieldobj, \ test \ tl \ tk \ + subsequenttest \ ucbhelper \ unotest \ utl \ diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index ee96b029f26e..bd2d7d9662b1 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -63,6 +63,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_namedrangeobj, \ test \ tl \ tk \ + subsequenttest \ ucbhelper \ unotest \ utl \ diff --git a/sc/CppunitTest_sc_spreadsheetobj.mk b/sc/CppunitTest_sc_spreadsheetobj.mk index 62d32721d40e..29779bd952bf 100644 --- a/sc/CppunitTest_sc_spreadsheetobj.mk +++ b/sc/CppunitTest_sc_spreadsheetobj.mk @@ -55,6 +55,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_spreadsheetobj, \ sc \ sfx \ sot \ + subsequenttest \ svl \ svt \ svx \ diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk index b8f1838df023..a002d67e907f 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -55,6 +55,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_tableautoformatfield, \ sc \ sfx \ sot \ + subsequenttest \ svl \ svt \ svx \ diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk new file mode 100644 index 000000000000..802b0f71dc98 --- /dev/null +++ b/test/Library_subsequenttest.mk @@ -0,0 +1,72 @@ +# -*- 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. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# 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_Library_Library,subsequenttest)) + +$(eval $(call gb_Library_set_include,subsequenttest,\ + -I$(SRCDIR)/tools/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_defs,subsequenttest,\ + -DOOO_DLLIMPLEMENTATION_TEST \ +)) + +$(eval $(call gb_Library_add_api,subsequenttest,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,subsequenttest,\ + comphelper \ + cppu \ + cppuhelper \ + i18nisolang1 \ + sal \ + test \ + tl \ + utl \ + ucbhelper \ + unotest \ + vcl \ + $(gb_STDLIBS) \ +)) + +ifeq ($(GUIBASE),unx) +$(call gb_Library_get_target,subsequenttest) : \ + $(call gb_Library_get_target,desktop_detector) \ + $(call gb_Library_get_target,vclplug_svp) \ + +endif + +$(eval $(call gb_Library_use_external,subsequenttest,cppunit)) + +$(eval $(call gb_Library_add_exception_objects,subsequenttest,\ + test/source/unoapi_test \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/test/Library_test.mk b/test/Library_test.mk index 967af9c4e944..4275a1f06e59 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -68,7 +68,6 @@ $(eval $(call gb_Library_use_external,test,cppunit)) $(eval $(call gb_Library_add_exception_objects,test,\ test/source/bootstrapfixture \ - test/source/unoapi_test \ )) # vim: set noet sw=4 ts=4: diff --git a/test/Module_test.mk b/test/Module_test.mk index 86c7c00a5789..6c8b81fa2992 100644 --- a/test/Module_test.mk +++ b/test/Module_test.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Module_Module,test)) $(eval $(call gb_Module_add_targets,test,\ Library_test \ + Library_subsequenttest \ Package_inc \ Package_unittest \ )) |