From f66ac2934303e789014741547a06c98ab5433ca0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 11 Nov 2011 10:01:19 +0100 Subject: [PATCH] Make .component files directly usable within UNO_SERVICES. * solenv/bin/createcomponent.xslt simply surrounds it output by . * solenv/gbuild/CppunitTest.mk got new functions gb_CppunitTest_add[_old]_component[s] (like their gb_RdbTarget_ predecessors). * This obsoleted current uses of solenv/gbuild/RdbTarget.mk, which also does not work currently, as it catenates the input component files instead of passing them through packcomponents.xslt (which now takes care about the surrounding in the input). In the future, it will likely be combined with the recently added solenv/gbuild/ComponentsTarget.mk. --- .../CppunitTest_hwpfilter_test_hwpfilter.mk | 8 +- hwpfilter/Module_hwpfilter.mk | 1 - .../RdbTarget_hwpfilter_test_hwpfilter.mk | 44 ----------- ...CppunitTest_i18npool_test_breakiterator.mk | 4 +- i18npool/Module_i18npool.mk | 1 - .../RdbTarget_i18npool_test_breakiterator.mk | 35 -------- ...unitTest_lotuswordpro_test_lotuswordpro.mk | 4 +- lotuswordpro/Module_lotuswordpro.mk | 1 - ...dbTarget_lotuswordpro_test_lotuswordpro.mk | 39 --------- sc/CppunitTest_sc_filters_test.mk | 45 ++++++++++- sc/CppunitTest_sc_macros_test.mk | 36 ++++++++- sc/CppunitTest_sc_ucalc.mk | 12 ++- sc/Module_sc.mk | 3 - sc/RdbTarget_sc_filters_test.mk | 79 ------------------- sc/RdbTarget_sc_macros_test.mk | 69 ---------------- sc/RdbTarget_sc_ucalc.mk | 46 ----------- sd/CppunitTest_sd_filters_test.mk | 33 +++++++- sd/CppunitTest_sd_uimpress.mk | 5 +- sd/Module_sd.mk | 2 - sd/RdbTarget_sd_uimpress.mk | 36 --------- solenv/bin/createcomponent.xslt | 18 +++-- solenv/bin/packcomponents.xslt | 6 +- solenv/gbuild/CppunitTest.mk | 37 ++++++++- starmath/CppunitTest_starmath_qa_cppunit.mk | 20 ++++- starmath/Module_starmath.mk | 1 - starmath/RdbTarget_starmath_qa_cppunit.mk | 51 ------------ sw/CppunitTest_sw_filters_test.mk | 20 ++++- sw/CppunitTest_sw_swdoc_test.mk | 14 +++- sw/Module_sw.mk | 2 - sw/RdbTarget_sw_filters_test.mk | 53 ------------- sw/RdbTarget_sw_swdoc_test.mk | 47 ----------- .../CppunitTest_writerfilter_rtftok.mk | 9 ++- writerfilter/Module_writerfilter.mk | 1 - writerfilter/RdbTarget_writerfilter_rtftok.mk | 42 ---------- 34 files changed, 235 insertions(+), 589 deletions(-) delete mode 100644 hwpfilter/RdbTarget_hwpfilter_test_hwpfilter.mk delete mode 100644 i18npool/RdbTarget_i18npool_test_breakiterator.mk delete mode 100644 lotuswordpro/RdbTarget_lotuswordpro_test_lotuswordpro.mk delete mode 100644 sc/RdbTarget_sc_filters_test.mk delete mode 100644 sc/RdbTarget_sc_macros_test.mk delete mode 100644 sc/RdbTarget_sc_ucalc.mk delete mode 100644 sd/RdbTarget_sd_uimpress.mk delete mode 100644 starmath/RdbTarget_starmath_qa_cppunit.mk delete mode 100644 sw/RdbTarget_sw_filters_test.mk delete mode 100644 sw/RdbTarget_sw_swdoc_test.mk delete mode 100644 writerfilter/RdbTarget_writerfilter_rtftok.mk diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk index a6c841cb9992..bf633e4642c3 100644 --- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk +++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk @@ -63,8 +63,12 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,hwpfilter_test_hwpfilter,\ types \ )) -$(eval $(call gb_CppunitTest_add_service_rdbs,hwpfilter_test_hwpfilter,\ - hwpfilter_test_hwpfilter \ +$(eval $(call gb_CppunitTest_add_components,hwpfilter_test_hwpfilter,\ + hwpfilter/source/hwp \ +)) +$(eval $(call gb_CppunitTest_add_old_components,hwpfilter_test_hwpfilter,\ + ucb1 \ + ucpfile1 \ )) $(eval $(call gb_CppunitTest_set_args,hwpfilter_test_hwpfilter,\ diff --git a/hwpfilter/Module_hwpfilter.mk b/hwpfilter/Module_hwpfilter.mk index b0ebe0bb14da..95390e57b107 100644 --- a/hwpfilter/Module_hwpfilter.mk +++ b/hwpfilter/Module_hwpfilter.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Module_add_targets,hwpfilter,\ $(eval $(call gb_Module_add_check_targets,hwpfilter,\ CppunitTest_hwpfilter_test_hwpfilter \ - RdbTarget_hwpfilter_test_hwpfilter \ )) # vim: set noet sw=4 ts=4: diff --git a/hwpfilter/RdbTarget_hwpfilter_test_hwpfilter.mk b/hwpfilter/RdbTarget_hwpfilter_test_hwpfilter.mk deleted file mode 100644 index 119439b239b6..000000000000 --- a/hwpfilter/RdbTarget_hwpfilter_test_hwpfilter.mk +++ /dev/null @@ -1,44 +0,0 @@ -# -*- 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. -# 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. -# David Tardon, Red Hat Inc. -# -# 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,hwpfilter_test_hwpfilter)) - -$(eval $(call gb_RdbTarget_add_components,hwpfilter_test_hwpfilter,\ - hwpfilter/source/hwp,\ -)) - -$(eval $(call gb_RdbTarget_add_old_components,hwpfilter_test_hwpfilter,\ - ucb1 \ - ucpfile1 \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk index 5be23d7d59a2..c22b06762792 100644 --- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk +++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk @@ -55,8 +55,8 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,i18npool_test_breakiterator,\ types \ )) -$(eval $(call gb_CppunitTest_add_service_rdbs,i18npool_test_breakiterator,\ - i18npool_test_breakiterator \ +$(eval $(call gb_CppunitTest_add_components,i18npool_test_breakiterator,\ + i18npool/util/i18npool \ )) $(eval $(call gb_CppunitTest_set_args,i18npool_test_breakiterator,\ diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk index 8b6947bf3d17..022e85f80891 100644 --- a/i18npool/Module_i18npool.mk +++ b/i18npool/Module_i18npool.mk @@ -59,7 +59,6 @@ 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 deleted file mode 100644 index 994e08e96ea2..000000000000 --- a/i18npool/RdbTarget_i18npool_test_breakiterator.mk +++ /dev/null @@ -1,35 +0,0 @@ -# -*- 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 -# 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: diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk index 0541ed888894..6b55f2b40790 100644 --- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk +++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk @@ -63,8 +63,8 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,lotuswordpro_test_lotuswordpro,\ types \ )) -$(eval $(call gb_CppunitTest_add_service_rdbs,lotuswordpro_test_lotuswordpro,\ - lotuswordpro_test_lotuswordpro \ +$(eval $(call gb_CppunitTest_add_components,lotuswordpro_test_lotuswordpro,\ + lotuswordpro/util/lwpfilter,\ )) $(eval $(call gb_CppunitTest_set_args,lotuswordpro_test_lotuswordpro,\ diff --git a/lotuswordpro/Module_lotuswordpro.mk b/lotuswordpro/Module_lotuswordpro.mk index 9e756c90e169..193276786b80 100644 --- a/lotuswordpro/Module_lotuswordpro.mk +++ b/lotuswordpro/Module_lotuswordpro.mk @@ -34,7 +34,6 @@ $(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 deleted file mode 100644 index 8d1f7c6ebca1..000000000000 --- a/lotuswordpro/RdbTarget_lotuswordpro_test_lotuswordpro.mk +++ /dev/null @@ -1,39 +0,0 @@ -# -*- 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. -# 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. -# David Tardon, Red Hat Inc. -# -# 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: diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index a8aed8185939..47fb2c5f1cac 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -88,8 +88,49 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_filters_test,\ types \ )) -$(eval $(call gb_CppunitTest_add_service_rdbs,sc_filters_test,\ - sc_filters_test \ +$(eval $(call gb_CppunitTest_add_components,sc_filters_test,\ + basic/util/sb \ + comphelper/util/comphelp \ + dbaccess/util/dba \ + fileaccess/source/fileacc \ + filter/source/config/cache/filterconfig1 \ + forms/util/frm \ + framework/util/fwk \ + i18npool/util/i18npool \ + oox/util/oox \ + package/source/xstor/xstor \ + package/util/package2 \ + sax/source/expatwrap/expwrap \ + sax/source/fastparser/fastsax \ + sc/util/sc \ + sc/util/scfilt \ + sfx2/util/sfx \ + sot/util/sot \ + toolkit/util/tk \ + unotools/util/utl \ + unoxml/source/rdf/unordf \ + unoxml/source/service/unoxml \ + xmlsecurity/util/xsec_fw \ + xmlsecurity/util/xmlsecurity \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_CppunitTest_add_components,sc_filters_test,\ + xmlsecurity/util/xsec_xmlsec.windows \ +)) + +else +$(eval $(call gb_CppunitTest_add_components,sc_filters_test,\ + xmlsecurity/util/xsec_xmlsec \ +)) + +endif + +$(eval $(call gb_CppunitTest_add_old_components,sc_filters_test,\ + configmgr \ + ucb1 \ + ucpfile1 \ + ucptdoc1 \ )) $(eval $(call gb_CppunitTest_set_args,sc_filters_test,\ diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index 5d39769a3f15..d4ab3d2af901 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -92,8 +92,40 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_macros_test,\ types \ )) -$(eval $(call gb_CppunitTest_add_service_rdbs,sc_macros_test,\ - sc_macros_test \ +$(eval $(call gb_CppunitTest_add_components,sc_macros_test,\ + basic/util/sb \ + comphelper/util/comphelp \ + dbaccess/util/dba \ + fileaccess/source/fileacc \ + filter/source/config/cache/filterconfig1 \ + forms/util/frm \ + framework/util/fwk \ + i18npool/util/i18npool \ + oox/util/oox \ + package/source/xstor/xstor \ + package/util/package2 \ + sax/source/expatwrap/expwrap \ + sax/source/fastparser/fastsax \ + sc/util/sc \ + sc/util/scd \ + sc/util/scfilt \ + sc/util/vbaobj \ + scripting/source/basprov/basprov \ + scripting/util/scriptframe \ + sfx2/util/sfx \ + sot/util/sot \ + svl/source/fsstor/fsstorage \ + toolkit/util/tk \ + unotools/util/utl \ + unoxml/source/rdf/unordf \ + unoxml/source/service/unoxml \ +)) + +$(eval $(call gb_CppunitTest_add_old_components,sc_macros_test,\ + configmgr \ + ucb1 \ + ucpfile1 \ + ucptdoc1 \ )) $(eval $(call gb_CppunitTest_set_args,sc_macros_test,\ diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index fe853cc5fb68..6f0f5837a4dc 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -94,8 +94,16 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_ucalc,\ types \ )) -$(eval $(call gb_CppunitTest_add_service_rdbs,sc_ucalc,\ - sc_ucalc \ +$(eval $(call gb_CppunitTest_add_components,sc_ucalc,\ + framework/util/fwk \ + i18npool/util/i18npool \ + sfx2/util/sfx \ + unoxml/source/service/unoxml \ +)) + +$(eval $(call gb_CppunitTest_add_old_components,sc_ucalc,\ + ucb1 \ + ucpfile1 \ )) $(eval $(call gb_CppunitTest_set_args,sc_ucalc,\ diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 2aebe1ebb2fe..11ca2644fc88 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -38,9 +38,6 @@ $(eval $(call gb_Module_add_check_targets,sc,\ CppunitTest_sc_filters_test \ CppunitTest_sc_macros_test \ CppunitTest_sc_ucalc \ - RdbTarget_sc_filters_test \ - RdbTarget_sc_macros_test \ - RdbTarget_sc_ucalc \ )) diff --git a/sc/RdbTarget_sc_filters_test.mk b/sc/RdbTarget_sc_filters_test.mk deleted file mode 100644 index 319cea3010d0..000000000000 --- a/sc/RdbTarget_sc_filters_test.mk +++ /dev/null @@ -1,79 +0,0 @@ -# -*- 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 -# Caolán McNamara, Red Hat, Inc. -# 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,sc_filters_test)) - -$(eval $(call gb_RdbTarget_add_components,sc_filters_test,\ - basic/util/sb \ - comphelper/util/comphelp \ - dbaccess/util/dba \ - fileaccess/source/fileacc \ - filter/source/config/cache/filterconfig1 \ - forms/util/frm \ - framework/util/fwk \ - i18npool/util/i18npool \ - oox/util/oox \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - sax/source/fastparser/fastsax \ - sc/util/sc \ - sc/util/scfilt \ - sfx2/util/sfx \ - sot/util/sot \ - toolkit/util/tk \ - unotools/util/utl \ - unoxml/source/rdf/unordf \ - unoxml/source/service/unoxml \ - xmlsecurity/util/xsec_fw \ - xmlsecurity/util/xmlsecurity \ -)) - -ifeq ($(OS),WNT) -$(eval $(call gb_RdbTarget_add_components,sc_filters_test,\ - xmlsecurity/util/xsec_xmlsec.windows \ -)) - -else -$(eval $(call gb_RdbTarget_add_components,sc_filters_test,\ - xmlsecurity/util/xsec_xmlsec \ -)) - -endif - - -$(eval $(call gb_RdbTarget_add_old_components,sc_filters_test,\ - configmgr \ - ucb1 \ - ucpfile1 \ - ucptdoc1 \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sc/RdbTarget_sc_macros_test.mk b/sc/RdbTarget_sc_macros_test.mk deleted file mode 100644 index 4333184e5074..000000000000 --- a/sc/RdbTarget_sc_macros_test.mk +++ /dev/null @@ -1,69 +0,0 @@ -# -*- 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 -# Caolán McNamara, Red Hat, Inc. -# 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,sc_macros_test)) - -$(eval $(call gb_RdbTarget_add_components,sc_macros_test,\ - basic/util/sb \ - comphelper/util/comphelp \ - dbaccess/util/dba \ - fileaccess/source/fileacc \ - filter/source/config/cache/filterconfig1 \ - forms/util/frm \ - framework/util/fwk \ - i18npool/util/i18npool \ - oox/util/oox \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - sax/source/fastparser/fastsax \ - sc/util/sc \ - sc/util/scd \ - sc/util/scfilt \ - sc/util/vbaobj \ - scripting/source/basprov/basprov \ - scripting/util/scriptframe \ - sfx2/util/sfx \ - sot/util/sot \ - svl/source/fsstor/fsstorage \ - toolkit/util/tk \ - unotools/util/utl \ - unoxml/source/rdf/unordf \ - unoxml/source/service/unoxml \ -)) - -$(eval $(call gb_RdbTarget_add_old_components,sc_macros_test,\ - configmgr \ - ucb1 \ - ucpfile1 \ - ucptdoc1 \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sc/RdbTarget_sc_ucalc.mk b/sc/RdbTarget_sc_ucalc.mk deleted file mode 100644 index c33f4a0d46ee..000000000000 --- a/sc/RdbTarget_sc_ucalc.mk +++ /dev/null @@ -1,46 +0,0 @@ -# -*- 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. -# Portions created by the Initial Developer are Copyright (C) 2010 the -# Initial Developer. All Rights Reserved. -# -# Major Contributor(s): -# David Tardon, Red Hat Inc. -# -# 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,sc_ucalc)) - -$(eval $(call gb_RdbTarget_add_components,sc_ucalc,\ - framework/util/fwk \ - i18npool/util/i18npool \ - sfx2/util/sfx \ - unoxml/source/service/unoxml \ -)) - -$(eval $(call gb_RdbTarget_add_old_components,sc_ucalc,\ - ucb1 \ - ucpfile1 \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 193ef5c52dd4..b708aa9d3dc9 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -88,8 +88,37 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sd_filters_test,\ types \ )) -$(eval $(call gb_CppunitTest_add_service_rdbs,sd_filters_test,\ - sd_filters_test \ +$(eval $(call gb_CppunitTest_add_components,sd_filters_test,\ + basic/util/sb \ + comphelper/util/comphelp \ + dbaccess/util/dba \ + fileaccess/source/fileacc \ + filter/source/config/cache/filterconfig1 \ + forms/util/frm \ + framework/util/fwk \ + i18npool/util/i18npool \ + oox/util/oox \ + package/source/xstor/xstor \ + package/util/package2 \ + sax/source/expatwrap/expwrap \ + sax/source/fastparser/fastsax \ + sd/util/sd \ + sd/util/sdfilt \ + sfx2/util/sfx \ + sot/util/sot \ + toolkit/util/tk \ + unotools/util/utl \ + unoxml/source/rdf/unordf \ + unoxml/source/service/unoxml \ + xmlsecurity/util/xsec_fw \ + xmlsecurity/util/xmlsecurity \ +)) + +$(eval $(call gb_CppunitTest_add_old_components,sd_filters_test,\ + configmgr \ + ucb1 \ + ucpfile1 \ + ucptdoc1 \ )) $(eval $(call gb_CppunitTest_set_args,sd_filters_test,\ diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index 69d3b3aa7b87..8b8d909d5410 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -86,8 +86,9 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sd_uimpress,\ types \ )) -$(eval $(call gb_CppunitTest_add_service_rdbs,sd_uimpress,\ - sd_uimpress \ +$(eval $(call gb_CppunitTest_add_components,sd_uimpress,\ + framework/util/fwk \ + i18npool/util/i18npool \ )) $(eval $(call gb_CppunitTest_set_args,sd_uimpress,\ diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk index f65fcc7bdea8..796deb5b2c9c 100644 --- a/sd/Module_sd.mk +++ b/sd/Module_sd.mk @@ -44,8 +44,6 @@ ifneq ($(OS),DRAGONFLY) $(eval $(call gb_Module_add_check_targets,sd,\ CppunitTest_sd_uimpress \ CppunitTest_sd_filters_test \ - RdbTarget_sd_uimpress \ - RdbTarget_sd_filters_test \ )) endif diff --git a/sd/RdbTarget_sd_uimpress.mk b/sd/RdbTarget_sd_uimpress.mk deleted file mode 100644 index 9265695f3cfe..000000000000 --- a/sd/RdbTarget_sd_uimpress.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -*- 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. -# 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: diff --git a/solenv/bin/createcomponent.xslt b/solenv/bin/createcomponent.xslt index 7f7695d533b3..acda3e8a80b1 100644 --- a/solenv/bin/createcomponent.xslt +++ b/solenv/bin/createcomponent.xslt @@ -27,17 +27,21 @@ **********************************************************************--> - - - - - - - + + + + + + + + + diff --git a/solenv/bin/packcomponents.xslt b/solenv/bin/packcomponents.xslt index 6e037a677f73..6dd409cae5cd 100644 --- a/solenv/bin/packcomponents.xslt +++ b/solenv/bin/packcomponents.xslt @@ -27,6 +27,8 @@ **********************************************************************--> @@ -36,8 +38,8 @@ - - + + diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 8cc3d9901ba9..0169ccecba27 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -70,8 +70,8 @@ $(if $(strip $(UNO_TYPES)),\ $(call gb_CppunitTarget__make_url,$(call gb_CppunitTest__get_uno_type_target,$(rdb))))") \ $(if $(strip $(UNO_SERVICES)),\ "-env:UNO_SERVICES=$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/ure/services.rdb) \ - $(foreach rdb,$(UNO_SERVICES),\ - $(call gb_CppunitTarget__make_url,$(call gb_RdbTarget_get_target,$(rdb))))") \ + $(foreach item,$(UNO_SERVICES),\ + $(call gb_CppunitTarget__make_url,$(item)))") \ $(if $(URE),\ $(foreach dir,URE_INTERNAL_LIB_DIR LO_LIB_DIR,\ -env:$(dir)=$(call gb_CppunitTarget__make_url,$(gb_CppunitTest_LIBDIR)))) @@ -146,7 +146,8 @@ endef define gb_CppunitTest_add_service_rdb $(call gb_CppunitTest_get_target,$(1)) : $(call gb_RdbTarget_get_target,$(2)) $(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_RdbTarget_get_clean_target,$(2)) -$(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES += $(2) +$(call gb_CppunitTest_get_target,$(1)) : \ + UNO_SERVICES += $(call gb_RdbTarget_get_target,$(2)) endef @@ -155,6 +156,36 @@ $(foreach rdb,$(2),$(call gb_CppunitTest_add_service_rdb,$(1),$(rdb))) endef +define gb_CppunitTest_add_component +$(call gb_CppunitTest_get_target,$(1)) : \ + $(call gb_ComponentTarget_get_target,$(2)) +$(call gb_CppunitTest_get_clean_target,$(1)) : \ + $(call gb_ComponentTarget_get_clean_target,$(2)) +$(call gb_CppunitTest_get_target,$(1)) : \ + UNO_SERVICES += $(call gb_ComponentTarget_get_target,$(2)) + +endef + +define gb_CppunitTest_add_components +$(foreach component,$(2),$(call gb_CppunitTest_add_component,$(1),$(component))) + +endef + +define gb_CppunitTest_add_old_component +$(call gb_CppunitTest_get_target,$(1)) : \ + $(call gb_CppunitTest__get_old_component_target,$(2)) +$(call gb_CppunitTest_get_target,$(1)) : \ + UNO_SERVICES += $(call gb_ComponentTarget__get_old_component_target,$(2)) + +endef + +define gb_CppunitTest_add_old_components +$(foreach component,$(2),$(call gb_CppunitTest_add_old_component,$(1),$(component))) + +endef + +gb_ComponentTarget__get_old_component_target = $(OUTDIR)/xml/$(1).component + define gb_CppunitTest__forward_to_Linktarget gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_CppunitTest__get_linktargetname,$$(1)),$$(2),$$(3)) diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index 0adf9566c2a9..6a12bebb2853 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -84,10 +84,26 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,starmath_qa_cppunit,\ types \ )) -$(eval $(call gb_CppunitTest_add_service_rdbs,starmath_qa_cppunit,\ - starmath_qa_cppunit \ +$(eval $(call gb_CppunitTest_add_components,starmath_qa_cppunit,\ + framework/util/fwk \ + i18npool/util/i18npool \ + toolkit/util/tk \ + sfx2/util/sfx \ )) +$(eval $(call gb_CppunitTest_add_old_components,starmath_qa_cppunit,\ + component/vcl/vcl \ + configmgr \ + mcnttype \ +)) + +ifeq ($(strip $(OS)),WNT) +$(eval $(call gb_CppunitTest_add_old_components,starmath_qa_cppunit,\ + ftransl \ + sysdtrans \ +)) +endif + $(eval $(call gb_CppunitTest_set_args,starmath_qa_cppunit,\ --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ )) diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk index 6da29aa96e2d..7f8554c07a66 100644 --- a/starmath/Module_starmath.mk +++ b/starmath/Module_starmath.mk @@ -38,7 +38,6 @@ $(eval $(call gb_Module_add_targets,starmath,\ # 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,\ diff --git a/starmath/RdbTarget_starmath_qa_cppunit.mk b/starmath/RdbTarget_starmath_qa_cppunit.mk deleted file mode 100644 index 64b7baaf6aea..000000000000 --- a/starmath/RdbTarget_starmath_qa_cppunit.mk +++ /dev/null @@ -1,51 +0,0 @@ -# -*- 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. -# 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: diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 68087df11a2a..500405fd6206 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -80,8 +80,24 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sw_filters_test,\ types \ )) -$(eval $(call gb_CppunitTest_add_service_rdbs,sw_filters_test,\ - sw_filters_test \ +$(eval $(call gb_CppunitTest_add_components,sw_filters_test,\ + sw/util/sw \ + sw/util/msword \ + forms/util/frm \ + dbaccess/util/dba \ + sfx2/util/sfx \ + framework/util/fwk \ + toolkit/util/tk \ + unoxml/source/service/unoxml \ + fileaccess/source/fileacc \ + comphelper/util/comphelp \ + i18npool/util/i18npool \ + package/util/package2 \ +)) + +$(eval $(call gb_CppunitTest_add_old_components,sw_filters_test,\ + ucb1 \ + ucpfile1 \ )) $(eval $(call gb_CppunitTest_set_args,sw_filters_test,\ diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk index 42fe4eb9ff12..029088942fd9 100644 --- a/sw/CppunitTest_sw_swdoc_test.mk +++ b/sw/CppunitTest_sw_swdoc_test.mk @@ -94,8 +94,18 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sw_swdoc_test,\ types \ )) -$(eval $(call gb_CppunitTest_add_service_rdbs,sw_swdoc_test,\ - sw_swdoc_test \ +$(eval $(call gb_CppunitTest_add_components,sw_swdoc_test,\ + sfx2/util/sfx \ + framework/util/fwk \ + unoxml/source/service/unoxml \ + fileaccess/source/fileacc \ + comphelper/util/comphelp \ + i18npool/util/i18npool \ +)) + +$(eval $(call gb_CppunitTest_add_old_components,sw_swdoc_test,\ + ucb1 \ + ucpfile1 \ )) $(call gb_CppunitTest_get_target,sw_swdoc_test) : \ diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index 90d8a0c17d78..c66b92e37193 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Module_add_targets,sw,\ $(eval $(call gb_Module_add_check_targets,sw,\ CppunitTest_sw_filters_test \ CppunitTest_sw_swdoc_test \ - RdbTarget_sw_filters_test \ - RdbTarget_sw_swdoc_test \ )) $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\ diff --git a/sw/RdbTarget_sw_filters_test.mk b/sw/RdbTarget_sw_filters_test.mk deleted file mode 100644 index 3fdee3c36a64..000000000000 --- a/sw/RdbTarget_sw_filters_test.mk +++ /dev/null @@ -1,53 +0,0 @@ -# -*- 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 -# Caolán McNamara, Red Hat, Inc. -# 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,sw_filters_test)) - -$(eval $(call gb_RdbTarget_add_components,sw_filters_test,\ - sw/util/sw \ - sw/util/msword \ - forms/util/frm \ - dbaccess/util/dba \ - sfx2/util/sfx \ - framework/util/fwk \ - toolkit/util/tk \ - unoxml/source/service/unoxml \ - fileaccess/source/fileacc \ - comphelper/util/comphelp \ - i18npool/util/i18npool \ - package/util/package2 \ -)) - -$(eval $(call gb_RdbTarget_add_old_components,sw_filters_test,\ - ucb1 \ - ucpfile1 \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sw/RdbTarget_sw_swdoc_test.mk b/sw/RdbTarget_sw_swdoc_test.mk deleted file mode 100644 index 34dbdc49bb7c..000000000000 --- a/sw/RdbTarget_sw_swdoc_test.mk +++ /dev/null @@ -1,47 +0,0 @@ -# -*- 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 -# Caolán McNamara, Red Hat, Inc. -# 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,sw_swdoc_test)) - -$(eval $(call gb_RdbTarget_add_components,sw_swdoc_test,\ - sfx2/util/sfx \ - framework/util/fwk \ - unoxml/source/service/unoxml \ - fileaccess/source/fileacc \ - comphelper/util/comphelp \ - i18npool/util/i18npool \ -)) - -$(eval $(call gb_RdbTarget_add_old_components,sw_swdoc_test,\ - ucb1 \ - ucpfile1 \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index a104cfe756ff..dbb5582d1cf0 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -58,8 +58,13 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,writerfilter_rtftok,\ types \ )) -$(eval $(call gb_CppunitTest_add_service_rdbs,writerfilter_rtftok,\ - writerfilter_rtftok \ +$(eval $(call gb_CppunitTest_add_components,writerfilter_rtftok,\ + writerfilter/util/writerfilter \ +)) + +$(eval $(call gb_CppunitTest_add_old_components,writerfilter_rtftok,\ + ucb1 \ + ucpfile1 \ )) $(eval $(call gb_CppunitTest_set_args,writerfilter_rtftok,\ diff --git a/writerfilter/Module_writerfilter.mk b/writerfilter/Module_writerfilter.mk index ac782b510b69..83946c2c5edf 100644 --- a/writerfilter/Module_writerfilter.mk +++ b/writerfilter/Module_writerfilter.mk @@ -41,7 +41,6 @@ $(eval $(call gb_Module_add_targets,writerfilter,\ $(eval $(call gb_Module_add_check_targets,writerfilter,\ CppunitTest_writerfilter_doctok \ CppunitTest_writerfilter_rtftok \ - RdbTarget_writerfilter_rtftok \ )) $(eval $(call gb_Module_add_subsequentcheck_targets,writerfilter,\ diff --git a/writerfilter/RdbTarget_writerfilter_rtftok.mk b/writerfilter/RdbTarget_writerfilter_rtftok.mk deleted file mode 100644 index c8055b421c3a..000000000000 --- a/writerfilter/RdbTarget_writerfilter_rtftok.mk +++ /dev/null @@ -1,42 +0,0 @@ -# -*- 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 -# Miklos Vajna -# 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,writerfilter_rtftok)) - -$(eval $(call gb_RdbTarget_add_components,writerfilter_rtftok,\ - writerfilter/util/writerfilter \ -)) - -$(eval $(call gb_RdbTarget_add_old_components,writerfilter_rtftok,\ - ucb1 \ - ucpfile1 \ -)) - -# vim: set noet sw=4 ts=4: