Generally determine Rdb content from gb_*_set_componentfile calls

...instead of by listing the content somewhat redundantly in the Rdb_*.mk files, to avoid duplication of logic for components that are only built conditionally (and thus should only be included conditionally in the corresponding Rdb). To achieve that, add an "rdb" parameter to gb_ComponentTarget_ComponentTarget (and to the gb_*_set_componentfile macros that internally call gb_ComponentTarget_ComponentTarget), which is used to make the appropriate gb_Rdb_add_component call internally from within gb_ComponentTarget_ComponentTarget. (As a special case, gb_CppunitTest_set_componentfile shall not call gb_Rdb_add_component, as that has already been done by the corresponding gb_Library_set_componentfile call, so allow the gb_ComponentTarget_ComponentTarget "rdb" parameter to be empty to support that special case.) Most Rdb_*.mk files are thus mostly empty now. One exception is i18npool/Rdb_saxparser.mk, which duplicates some of the Rdb_services content as needed during the build in CustomTarget_i18npool/localedata. 1c9a40299d328c78c035ca63ccdf22c5c669a03b "gbuild: create services.rdb from built components" had already tried to do something similar (in addition to other things) under a new --enable-services-rdb-from-build option. However, that approach had four drawbacks that this approach here addresses (and which thus partly reverts 1c9a40299d328c78c035ca63ccdf22c5c669a03b): 1 Rdb_services shall not contain the component files of all libraries that are built. While that commit filtered out the component files that go into Rdb_ure/services (ure/Rdb_ure.mk), it failed to filter out the component files that go into others like Rdb_postgresql-sdbc (connectivity/Rdb_postgresql-sdbc.mk). 2 The code added by that commit to Makefile.gbuild codified the knowledge that there is an Rdb_services, which is brittle. 3 The code added by that commit to solenv/gbuild/Rdb.mk codified the knowledge (for gb_Rdb__URECOMPONENTS) that there is an Rdb_ure/services, which is brittle. 4 Introducing an --enable-services-rdb-from-build option needlessly provided two different ways how the content of Rdb_services is assembled. The changes done here would leave --enable-services-rdb-from-build as a misnomer, as it no longer controls how Rdb_services is assembled. I thus renamed it to --enable-customtarget-components, as that is apparently what it still does now. Change-Id: Ia5e8df4b640146c77421fcec6daa11a9cd260265 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126577 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
author: Stephan Bergmann <sbergman@redhat.com> 2021-12-09 10:15:05 +0100
committer: Stephan Bergmann <sbergman@redhat.com> 2021-12-10 08:14:24 +0100
commit: db3a61cd958f4a70417929cf8e1fa9bfd0bfe5a3 (patch)
tree: 20c4ceba87df6b65e218a670ae22e35d7a1da30f
parent: 5b0707f66e2c49a11f3a23e3ec9940b26d881165 (diff)
242 files changed, 266 insertions, 660 deletions
diff --git a/Makefile.gbuild b/Makefile.gbuild
index db049264f65d..9e7f205e22d4 100644
--- a/Makefile.gbuild
+++ b/Makefile.gbuild
@@ -24,11 +24,6 @@ ifneq (,$(DISABLE_DYNLOADING))
 $(if $(gb_LinkTarget__Lock),$(shell rm -f $(gb_LinkTarget__Lock)))
 endif
 
-ifeq ($(ENABLE_SERVICES_RDB_FROM_BUILD),TRUE)
-$(foreach comp,$(filter-out $(gb_Rdb__URECOMPONENTS),$(gb_ComponentTarget__ALLCOMPONENTS)), \
-    $(eval $(call gb_Rdb_add_components,services,$(comp))))
-endif
-
 upload-symbols:
 	bin/upload_symbols.py $(WORKDIR)/symbols.zip $(BREAKPAD_SYMBOL_CONFIG) "$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX)$(LIBO_VERSION_SUFFIX_SUFFIX)"
 
diff --git a/UnoControls/Library_ctl.mk b/UnoControls/Library_ctl.mk
index f6ef205f9615..e123a4a594e4 100644
--- a/UnoControls/Library_ctl.mk
+++ b/UnoControls/Library_ctl.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_Library_use_libraries,ctl,\
     tl \
 ))
 
-$(eval $(call gb_Library_set_componentfile,ctl,UnoControls/util/ctl))
+$(eval $(call gb_Library_set_componentfile,ctl,UnoControls/util/ctl,services))
 
 $(eval $(call gb_Library_add_exception_objects,ctl,\
     UnoControls/source/base/basecontainercontrol \
diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk
index 359688cd7812..ff35201c19d0 100644
--- a/animations/Library_animcore.mk
+++ b/animations/Library_animcore.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,animcore))
 
 $(eval $(call gb_Library_use_external,animcore,boost_headers))
 
-$(eval $(call gb_Library_set_componentfile,animcore,animations/source/animcore/animcore))
+$(eval $(call gb_Library_set_componentfile,animcore,animations/source/animcore/animcore,services))
 
 $(eval $(call gb_Library_use_sdk_api,animcore))
 
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index a9a9440346ba..83148b915c8d 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_use_externals,avmedia,\
     epoxy \
 ))
 
-$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
+$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia,services))
 
 $(eval $(call gb_Library_use_libraries,avmedia,\
 	i18nlangtag \
diff --git a/avmedia/Library_avmediaMacAVF.mk b/avmedia/Library_avmediaMacAVF.mk
index de6373632df7..388a9fba1386 100644
--- a/avmedia/Library_avmediaMacAVF.mk
+++ b/avmedia/Library_avmediaMacAVF.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,avmediaMacAVF))
 
-$(eval $(call gb_Library_set_componentfile,avmediaMacAVF,avmedia/source/macavf/avmediaMacAVF))
+$(eval $(call gb_Library_set_componentfile,avmediaMacAVF,avmedia/source/macavf/avmediaMacAVF,services))
 
 $(eval $(call gb_Library_set_include,avmediaMacAVF,\
 	$$(INCLUDE) \
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
index 699d0197b50e..923c474280b4 100644
--- a/avmedia/Library_avmediagst.mk
+++ b/avmedia/Library_avmediagst.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,avmediagst))
 
-$(eval $(call gb_Library_set_componentfile,avmediagst,avmedia/source/gstreamer/avmediagstreamer))
+$(eval $(call gb_Library_set_componentfile,avmediagst,avmedia/source/gstreamer/avmediagstreamer,services))
 
 $(eval $(call gb_Library_set_include,avmediagst,\
 	$$(INCLUDE) \
diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk
index 320ba2b36073..318e28265530 100644
--- a/avmedia/Library_avmediawin.mk
+++ b/avmedia/Library_avmediawin.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,avmediawin))
 
-$(eval $(call gb_Library_set_componentfile,avmediawin,avmedia/source/win/avmediawin))
+$(eval $(call gb_Library_set_componentfile,avmediawin,avmedia/source/win/avmediawin,services))
 
 $(eval $(call gb_Library_use_external,avmediawin,boost_headers))
 
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index f874dfe9cc54..32ebe55c2bb3 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,basctl))
 
-$(eval $(call gb_Library_set_componentfile,basctl,basctl/util/basctl))
+$(eval $(call gb_Library_set_componentfile,basctl,basctl/util/basctl,services))
 
 $(eval $(call gb_Library_set_include,basctl,\
 	-I$(SRCDIR)/basctl/inc \
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 6bee8df435cb..17fbcbd1010e 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -58,7 +58,7 @@ $(eval $(call gb_Library_use_libraries,sb,\
 
 ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
 
-$(eval $(call gb_Library_set_componentfile,sb,basic/util/sb))
+$(eval $(call gb_Library_set_componentfile,sb,basic/util/sb,services))
 
 $(eval $(call gb_Library_add_exception_objects,sb,\
 	basic/source/basmgr/basicmanagerrepository \
diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk
index 51efc35a5375..439f1f7d41aa 100644
--- a/binaryurp/Library_binaryurp.mk
+++ b/binaryurp/Library_binaryurp.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,binaryurp))
 
-$(eval $(call gb_Library_set_componentfile,binaryurp,binaryurp/source/binaryurp))
+$(eval $(call gb_Library_set_componentfile,binaryurp,binaryurp/source/binaryurp,ure/services))
 
 $(eval $(call gb_Library_use_udk_api,binaryurp))
 
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index 7a587c84d941..b7cd8d86b5f0 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Library_set_include,cairocanvas,\
 
 $(eval $(call gb_Library_set_precompiled_header,cairocanvas,canvas/inc/pch/precompiled_cairocanvas))
 
-$(eval $(call gb_Library_set_componentfile,cairocanvas,canvas/source/cairo/cairocanvas))
+$(eval $(call gb_Library_set_componentfile,cairocanvas,canvas/source/cairo/cairocanvas,services))
 
 $(eval $(call gb_Library_use_sdk_api,cairocanvas))
 
diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk
index 81a38c4f69b3..7f2567fde006 100644
--- a/canvas/Library_canvasfactory.mk
+++ b/canvas/Library_canvasfactory.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_set_include,canvasfactory,\
     -I$(SRCDIR)/canvas/inc \
 ))
 
-$(eval $(call gb_Library_set_componentfile,canvasfactory,canvas/source/factory/canvasfactory))
+$(eval $(call gb_Library_set_componentfile,canvasfactory,canvas/source/factory/canvasfactory,services))
 
 $(eval $(call gb_Library_use_external,canvasfactory,boost_headers))
 
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index 28b10bb116d8..4369de32d636 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_set_include,directx9canvas,\
     -I$(SRCDIR)/canvas/inc \
 ))
 
-$(eval $(call gb_Library_set_componentfile,directx9canvas,canvas/source/directx/directx9canvas))
+$(eval $(call gb_Library_set_componentfile,directx9canvas,canvas/source/directx/directx9canvas,services))
 
 $(eval $(call gb_Library_use_sdk_api,directx9canvas))
 
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index 86634d401f94..a67a19df4120 100644
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_set_include,gdipluscanvas,\
     -I$(SRCDIR)/canvas/inc \
 ))
 
-$(eval $(call gb_Library_set_componentfile,gdipluscanvas,canvas/source/directx/gdipluscanvas))
+$(eval $(call gb_Library_set_componentfile,gdipluscanvas,canvas/source/directx/gdipluscanvas,services))
 
 $(eval $(call gb_Library_use_external,gdipluscanvas,boost_headers))
 
diff --git a/canvas/Library_oglcanvas.mk b/canvas/Library_oglcanvas.mk
index 189ebf83a999..21a14dc2a72b 100644
--- a/canvas/Library_oglcanvas.mk
+++ b/canvas/Library_oglcanvas.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_Library_set_include,oglcanvas,\
 
 $(eval $(call gb_Library_set_precompiled_header,oglcanvas,canvas/inc/pch/precompiled_oglcanvas))
 
-$(eval $(call gb_Library_set_componentfile,oglcanvas,canvas/source/opengl/oglcanvas))
+$(eval $(call gb_Library_set_componentfile,oglcanvas,canvas/source/opengl/oglcanvas,services))
 
 $(eval $(call gb_Library_use_sdk_api,oglcanvas))
 
diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk
index 4e9006b35de5..e4762ae82487 100644
--- a/canvas/Library_simplecanvas.mk
+++ b/canvas/Library_simplecanvas.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_set_include,simplecanvas,\
     -I$(SRCDIR)/canvas/inc \
 ))
 
-$(eval $(call gb_Library_set_componentfile,simplecanvas,canvas/source/simplecanvas/simplecanvas))
+$(eval $(call gb_Library_set_componentfile,simplecanvas,canvas/source/simplecanvas/simplecanvas,services))
 
 $(eval $(call gb_Library_use_external,simplecanvas,boost_headers))
 
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index 5192857d87b5..0f10d2a3c241 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Library_set_include,vclcanvas,\
 
 $(eval $(call gb_Library_set_precompiled_header,vclcanvas,canvas/inc/pch/precompiled_vclcanvas))
 
-$(eval $(call gb_Library_set_componentfile,vclcanvas,canvas/source/vcl/vclcanvas))
+$(eval $(call gb_Library_set_componentfile,vclcanvas,canvas/source/vcl/vclcanvas,services))
 
 $(eval $(call gb_Library_use_external,vclcanvas,boost_headers))
 
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index 05f031415213..f73d335eca69 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -50,7 +50,7 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\
     vcl \
 ))
 
-$(eval $(call gb_Library_set_componentfile,chartcontroller,chart2/source/controller/chartcontroller))
+$(eval $(call gb_Library_set_componentfile,chartcontroller,chart2/source/controller/chartcontroller,services))
 
 $(eval $(call gb_Library_add_exception_objects,chartcontroller,\
     chart2/source/controller/accessibility/AccessibleBase \
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index 73945d783d3a..f5069c7c5670 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -63,7 +63,7 @@ $(eval $(call gb_Library_use_libraries,chartcore,\
     vcl \
 ))
 
-$(eval $(call gb_Library_set_componentfile,chartcore,chart2/source/chartcore))
+$(eval $(call gb_Library_set_componentfile,chartcore,chart2/source/chartcore,services))
 
 # view pieces ...
 $(eval $(call gb_Library_add_exception_objects,chartcore,\
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index c4d9e4587f3c..6bd5f0f6492d 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Library_use_custom_headers,comphelper,\
 	officecfg/registry \
 ))
 
-$(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp))
+$(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp,services))
 
 $(eval $(call gb_Library_set_precompiled_header,comphelper,comphelper/inc/pch/precompiled_comphelper))
 
diff --git a/config_host.mk.in b/config_host.mk.in
index 59546a8f02e0..8888355642ef 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -201,7 +201,7 @@ export ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@
 export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@
 export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@
 export ENABLE_SDREMOTE_BLUETOOTH=@ENABLE_SDREMOTE_BLUETOOTH@
-export ENABLE_SERVICES_RDB_FROM_BUILD=@ENABLE_SERVICES_RDB_FROM_BUILD@
+export ENABLE_CUSTOMTARGET_COMPONENTS=@ENABLE_CUSTOMTARGET_COMPONENTS@
 export ENABLE_SILENT_MSI=@ENABLE_SILENT_MSI@
 export ENABLE_SKIA=@ENABLE_SKIA@
 export ENABLE_SKIA_DEBUG=@ENABLE_SKIA_DEBUG@
diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk
index e09abc6ad6c1..11bba5f0f4cf 100644
--- a/configmgr/Library_configmgr.mk
+++ b/configmgr/Library_configmgr.mk
@@ -64,4 +64,4 @@ $(eval $(call gb_Library_use_libraries,configmgr, \
     i18nlangtag \
 ))
 
-$(eval $(call gb_Library_set_componentfile,configmgr,configmgr/source/configmgr))
+$(eval $(call gb_Library_set_componentfile,configmgr,configmgr/source/configmgr,services))
diff --git a/configure.ac b/configure.ac
index 0cae3577a0ba..52b3b5f14d1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1970,11 +1970,9 @@ AC_ARG_ENABLE(xmlhelp,
         [Disable XML help support]),
 ,enable_xmlhelp=yes)
 
-AC_ARG_ENABLE(services-rdb-from-build,
-    AS_HELP_STRING([--enable-services-rdb-from-build],
-        [Automatically creates the services.rdb from all built components.
-         Splitting the component files and adapting the Library_*.mk files
-         is WIP and probably just works together with --enable-wasm-strip.]))
+AC_ARG_ENABLE(customtarget-components,
+    AS_HELP_STRING([--enable-customtarget-components],
+        [This is WIP and probably just works together with --enable-wasm-strip.]))
 
 
 dnl ===================================================================
@@ -2953,14 +2951,14 @@ if test $_os != iOS -a $_os != Android -a $_os != Emscripten -a "$enable_fuzzers
     AC_DEFINE(HAVE_FEATURE_MULTIUSER_ENVIRONMENT)
 fi
 
-ENABLE_SERVICES_RDB_FROM_BUILD=
-if test "$enable_services_rdb_from_build" = yes; then
-    ENABLE_SERVICES_RDB_FROM_BUILD=TRUE
+ENABLE_CUSTOMTARGET_COMPONENTS=
+if test "$enable_customtarget_components" = yes; then
+    ENABLE_CUSTOMTARGET_COMPONENTS=TRUE
     if test -n "$with_locales" -a "$with_locales" != en -a "$with_locales" != ALL; then
-        AC_MSG_ERROR([Currently just --with-locales=all or en is supported with --enable-services-rdb-from-build])
+        AC_MSG_ERROR([Currently just --with-locales=all or en is supported with --enable-customtarget-components])
     fi
 fi
-AC_SUBST(ENABLE_SERVICES_RDB_FROM_BUILD)
+AC_SUBST(ENABLE_CUSTOMTARGET_COMPONENTS)
 
 # Whether to build "avmedia" functionality or not.
 
@@ -5534,7 +5532,7 @@ if test "$cross_compiling" = "yes"; then
         --disable-opencl \
         --disable-pdfimport \
         --disable-postgresql-sdbc \
-        --disable-services-rdb-from-build \
+        --disable-customtarget-components \
         --disable-skia \
         --enable-icecream="$enable_icecream" \
         --without-doxygen \
diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk
index 4886c5aa6d61..8cfd5485fe15 100644
--- a/connectivity/Library_ado.mk
+++ b/connectivity/Library_ado.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,ado))
 
-$(eval $(call gb_Library_set_componentfile,ado,connectivity/source/drivers/ado/ado))
+$(eval $(call gb_Library_set_componentfile,ado,connectivity/source/drivers/ado/ado,services))
 
 $(eval $(call gb_Library_set_include,ado,\
 	-I$(SRCDIR)/connectivity/inc \
diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk
index b751ce16bfe3..925b6ec8fa49 100644
--- a/connectivity/Library_calc.mk
+++ b/connectivity/Library_calc.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,calc))
 
-$(eval $(call gb_Library_set_componentfile,calc,connectivity/source/drivers/calc/calc))
+$(eval $(call gb_Library_set_componentfile,calc,connectivity/source/drivers/calc/calc,services))
 
 $(eval $(call gb_Library_use_external,calc,boost_headers))
 
diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk
index 1779b49cf21d..b69b25cb206e 100644
--- a/connectivity/Library_dbase.mk
+++ b/connectivity/Library_dbase.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,dbase))
 
-$(eval $(call gb_Library_set_componentfile,dbase,connectivity/source/drivers/dbase/dbase))
+$(eval $(call gb_Library_set_componentfile,dbase,connectivity/source/drivers/dbase/dbase,services))
 
 $(eval $(call gb_Library_use_external,dbase,boost_headers))
 
diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk
index fee4d3477087..334a225c8975 100644
--- a/connectivity/Library_dbpool2.mk
+++ b/connectivity/Library_dbpool2.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,dbpool2))
 
-$(eval $(call gb_Library_set_componentfile,dbpool2,connectivity/source/cpool/dbpool2))
+$(eval $(call gb_Library_set_componentfile,dbpool2,connectivity/source/cpool/dbpool2,services))
 
 $(eval $(call gb_Library_set_include,dbpool2,\
 	$$(INCLUDE) \
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 1b9f444a9ab1..f8f457e5aa35 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,dbtools,\
 	-DOOO_DLLIMPLEMENTATION_DBTOOLS \
 ))
 
-$(eval $(call gb_Library_set_componentfile,dbtools,connectivity/source/dbtools/dbtools))
+$(eval $(call gb_Library_set_componentfile,dbtools,connectivity/source/dbtools/dbtools,services))
 
 $(eval $(call gb_Library_set_include,dbtools,\
 	$$(INCLUDE) \
diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk
index 28327f060bcf..978838ca86f6 100644
--- a/connectivity/Library_evoab.mk
+++ b/connectivity/Library_evoab.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_Library_use_externals,evoab,\
 	gobject \
 ))
 
-$(eval $(call gb_Library_set_componentfile,evoab,connectivity/source/drivers/evoab2/evoab))
+$(eval $(call gb_Library_set_componentfile,evoab,connectivity/source/drivers/evoab2/evoab,services))
 
 $(eval $(call gb_Library_use_sdk_api,evoab))
 
diff --git a/connectivity/Library_firebird_sdbc.mk b/connectivity/Library_firebird_sdbc.mk
index 5fb596ef8fb4..ce0dbe6902ed 100644
--- a/connectivity/Library_firebird_sdbc.mk
+++ b/connectivity/Library_firebird_sdbc.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_use_libraries,firebird_sdbc, \
     vcl \
 ))
 
-$(eval $(call gb_Library_set_componentfile,firebird_sdbc,connectivity/source/drivers/firebird/firebird_sdbc))
+$(eval $(call gb_Library_set_componentfile,firebird_sdbc,connectivity/source/drivers/firebird/firebird_sdbc,services))
 
 $(eval $(call gb_Library_add_exception_objects,firebird_sdbc,\
     connectivity/source/drivers/firebird/Blob \
diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk
index 77e2dee405e2..0fdf43276034 100644
--- a/connectivity/Library_flat.mk
+++ b/connectivity/Library_flat.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,flat))
 
-$(eval $(call gb_Library_set_componentfile,flat,connectivity/source/drivers/flat/flat))
+$(eval $(call gb_Library_set_componentfile,flat,connectivity/source/drivers/flat/flat,services))
 
 $(eval $(call gb_Library_use_external,flat,boost_headers))
 
diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk
index 3c85fc462240..40764b9237d8 100644
--- a/connectivity/Library_hsqldb.mk
+++ b/connectivity/Library_hsqldb.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_use_libraries,hsqldb,\
 	i18nlangtag \
 ))
 
-$(eval $(call gb_Library_set_componentfile,hsqldb,connectivity/source/drivers/hsqldb/hsqldb))
+$(eval $(call gb_Library_set_componentfile,hsqldb,connectivity/source/drivers/hsqldb/hsqldb,services))
 
 $(eval $(call gb_Library_add_exception_objects,hsqldb,\
 	connectivity/source/drivers/hsqldb/HCatalog \
diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk
index 396369e8fc5b..578c7013db85 100644
--- a/connectivity/Library_jdbc.mk
+++ b/connectivity/Library_jdbc.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,jdbc))
 
-$(eval $(call gb_Library_set_componentfile,jdbc,connectivity/source/drivers/jdbc/jdbc))
+$(eval $(call gb_Library_set_componentfile,jdbc,connectivity/source/drivers/jdbc/jdbc,services))
 
 $(eval $(call gb_Library_use_external,jdbc,boost_headers))
 
diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk
index 58eca126917a..82e3cf489b18 100644
--- a/connectivity/Library_macab1.mk
+++ b/connectivity/Library_macab1.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,macab1))
 
-$(eval $(call gb_Library_set_componentfile,macab1,connectivity/source/drivers/macab/macab1))
+$(eval $(call gb_Library_set_componentfile,macab1,connectivity/source/drivers/macab/macab1,services))
 
 $(eval $(call gb_Library_use_external,macab1,boost_headers))
 
diff --git a/connectivity/Library_mozbootstrap.mk b/connectivity/Library_mozbootstrap.mk
index 237726caf8a8..dfa587fa0e7a 100644
--- a/connectivity/Library_mozbootstrap.mk
+++ b/connectivity/Library_mozbootstrap.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,mozbootstrap))
 
-$(eval $(call gb_Library_set_componentfile,mozbootstrap,connectivity/source/drivers/mozab/bootstrap/mozbootstrap))
+$(eval $(call gb_Library_set_componentfile,mozbootstrap,connectivity/source/drivers/mozab/bootstrap/mozbootstrap,services))
 
 $(eval $(call gb_Library_set_include,mozbootstrap,\
 	-I$(SRCDIR)/connectivity/source/drivers/mozab \
diff --git a/connectivity/Library_mysql_jdbc.mk b/connectivity/Library_mysql_jdbc.mk
index ce4649f88580..21317ad697da 100644
--- a/connectivity/Library_mysql_jdbc.mk
+++ b/connectivity/Library_mysql_jdbc.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,mysql_jdbc))
 
-$(eval $(call gb_Library_set_componentfile,mysql_jdbc,connectivity/source/drivers/mysql_jdbc/mysql_jdbc))
+$(eval $(call gb_Library_set_componentfile,mysql_jdbc,connectivity/source/drivers/mysql_jdbc/mysql_jdbc,services))
 
 $(eval $(call gb_Library_use_external,mysql_jdbc,boost_headers))
 
diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk
index f765fb1e305f..9cbab05bd7a7 100644
--- a/connectivity/Library_mysqlc.mk
+++ b/connectivity/Library_mysqlc.mk
@@ -62,6 +62,6 @@ $(eval $(call gb_Library_add_exception_objects,mysqlc,\
 	connectivity/source/drivers/mysqlc/mysqlc_general \
 ))
 
-$(eval $(call gb_Library_set_componentfile,mysqlc,connectivity/source/drivers/mysqlc/mysqlc))
+$(eval $(call gb_Library_set_componentfile,mysqlc,connectivity/source/drivers/mysqlc/mysqlc,services))
 
 # vim: set noet sw=4 ts=4:
diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk
index 9ab70270cfc7..b14412932083 100644
--- a/connectivity/Library_odbc.mk
+++ b/connectivity/Library_odbc.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,odbc))
 
-$(eval $(call gb_Library_set_componentfile,odbc,connectivity/source/drivers/odbc/odbc))
+$(eval $(call gb_Library_set_componentfile,odbc,connectivity/source/drivers/odbc/odbc,services))
 
 $(eval $(call gb_Library_use_sdk_api,odbc))
 
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index c372f3f0c6f6..8aa02ae169d5 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -66,7 +66,7 @@ $(eval $(call gb_Library_add_libs,postgresql-sdbc-impl,\
 endif
 endif
 
-$(eval $(call gb_Library_set_componentfile,postgresql-sdbc-impl,connectivity/source/drivers/postgresql/postgresql-sdbc-impl))
+$(eval $(call gb_Library_set_componentfile,postgresql-sdbc-impl,connectivity/source/drivers/postgresql/postgresql-sdbc-impl,postgresql-sdbc))
 
 $(eval $(call gb_Library_add_exception_objects,postgresql-sdbc-impl,\
 	connectivity/source/drivers/postgresql/pq_array \
diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk
index 48613ab91bfc..b8b39faec9ca 100644
--- a/connectivity/Library_postgresql-sdbc.mk
+++ b/connectivity/Library_postgresql-sdbc.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\
 	salhelper \
 ))
 
-$(eval $(call gb_Library_set_componentfile,postgresql-sdbc,connectivity/source/drivers/postgresql/postgresql-sdbc))
+$(eval $(call gb_Library_set_componentfile,postgresql-sdbc,connectivity/source/drivers/postgresql/postgresql-sdbc,postgresql-sdbc))
 
 $(eval $(call gb_Library_add_exception_objects,postgresql-sdbc,\
 	connectivity/source/drivers/postgresql/pq_driver \
diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk
index 5685d1af1de1..e7296a2efc59 100644
--- a/connectivity/Library_sdbc2.mk
+++ b/connectivity/Library_sdbc2.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,sdbc2))
 
-$(eval $(call gb_Library_set_componentfile,sdbc2,connectivity/source/manager/sdbc2))
+$(eval $(call gb_Library_set_componentfile,sdbc2,connectivity/source/manager/sdbc2,services))
 
 $(eval $(call gb_Library_use_external,sdbc2,boost_headers))
 
diff --git a/connectivity/Library_writer.mk b/connectivity/Library_writer.mk
index 242d684c9de0..a653e5502d83 100644
--- a/connectivity/Library_writer.mk
+++ b/connectivity/Library_writer.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,writer))
 
-$(eval $(call gb_Library_set_componentfile,writer,connectivity/source/drivers/writer/writer))
+$(eval $(call gb_Library_set_componentfile,writer,connectivity/source/drivers/writer/writer,services))
 
 $(eval $(call gb_Library_use_external,writer,boost_headers))
 
diff --git a/connectivity/Rdb_postgresql-sdbc.mk b/connectivity/Rdb_postgresql-sdbc.mk
index 6162b309d6ba..e6c3b06e0695 100644
--- a/connectivity/Rdb_postgresql-sdbc.mk
+++ b/connectivity/Rdb_postgresql-sdbc.mk
@@ -9,9 +9,4 @@
 
 $(eval $(call gb_Rdb_Rdb_install,postgresql-sdbc))
 
-$(eval $(call gb_Rdb_add_components,postgresql-sdbc,\
-	connectivity/source/drivers/postgresql/postgresql-sdbc \
-	connectivity/source/drivers/postgresql/postgresql-sdbc-impl \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/Library_mtfrenderer.mk b/cppcanvas/Library_mtfrenderer.mk
index e94f12bccdde..ba3d5be3a959 100644
--- a/cppcanvas/Library_mtfrenderer.mk
+++ b/cppcanvas/Library_mtfrenderer.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,mtfrenderer))
 
-$(eval $(call gb_Library_set_componentfile,mtfrenderer,cppcanvas/source/uno/mtfrenderer))
+$(eval $(call gb_Library_set_componentfile,mtfrenderer,cppcanvas/source/uno/mtfrenderer,services))
 
 $(eval $(call gb_Library_use_external,mtfrenderer,boost_headers))
 
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 686bd039f251..735b357c26b3 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Library_Library,cui))
 
 $(eval $(call gb_Library_set_plugin_for,cui,vcl))
 
-$(eval $(call gb_Library_set_componentfile,cui,cui/util/cui))
+$(eval $(call gb_Library_set_componentfile,cui,cui/util/cui,services))
 
 $(eval $(call gb_Library_set_include,cui,\
     $$(INCLUDE) \
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index 90f775d146ef..2021bb22a876 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -55,7 +55,7 @@ $(eval $(call gb_Library_use_libraries,dba,\
     xo \
 ))
 
-$(eval $(call gb_Library_set_componentfile,dba,dbaccess/util/dba))
+$(eval $(call gb_Library_set_componentfile,dba,dbaccess/util/dba,services))
 
 $(eval $(call gb_Library_add_exception_objects,dba,\
     dbaccess/source/core/api/BookmarkSet \
diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk
index a9f2d96991c0..502c4058d8ac 100644
--- a/dbaccess/Library_dbaxml.mk
+++ b/dbaccess/Library_dbaxml.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_Library_use_libraries,dbaxml,\
     xo \
 ))
 
-$(eval $(call gb_Library_set_componentfile,dbaxml,dbaccess/source/filter/xml/dbaxml))
+$(eval $(call gb_Library_set_componentfile,dbaxml,dbaccess/source/filter/xml/dbaxml,services))
 
 $(eval $(call gb_Library_add_exception_objects,dbaxml,\
     dbaccess/source/filter/xml/dbloader2 \
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 895343591bf4..1157c6ffa8e5 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -66,7 +66,7 @@ $(eval $(call gb_Library_use_system_win32_libs,dbu,\
 ))
 endif
 
-$(eval $(call gb_Library_set_componentfile,dbu,dbaccess/util/dbu))
+$(eval $(call gb_Library_set_componentfile,dbu,dbaccess/util/dbu,services))
 
 $(eval $(call gb_Library_add_exception_objects,dbu,\
     dbaccess/source/ui/app/AppController \
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index d941cc05fc97..c6109b6e6c65 100644
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Library_use_libraries,sdbt,\
     utl \
 ))
 
-$(eval $(call gb_Library_set_componentfile,sdbt,dbaccess/util/sdbt))
+$(eval $(call gb_Library_set_componentfile,sdbt,dbaccess/util/sdbt,services))
 
 $(eval $(call gb_Library_add_exception_objects,sdbt,\
     dbaccess/source/sdbtools/connection/connectiontools \
diff --git a/desktop/Jar_passive_java.mk b/desktop/Jar_passive_java.mk
index e2408ae5a09f..0c8c4af5bc64 100644
--- a/desktop/Jar_passive_java.mk
+++ b/desktop/Jar_passive_java.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_Jar_add_sourcefiles,passive_java, \
     desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Services \
 ))
 
-$(eval $(call gb_Jar_set_componentfile,passive_java,desktop/test/deployment/passive/passive_java,OXT))
+$(eval $(call gb_Jar_set_componentfile,passive_java,desktop/test/deployment/passive/passive_java,OXT,passive_generic))
 
 $(eval $(call gb_Jar_set_manifest,passive_java,$(SRCDIR)/desktop/test/deployment/passive/MANIFEST.MF))
 
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index 57fe1c55a0b6..faab6887a2f0 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_Library_use_libraries,deployment,\
     i18nlangtag \
 ))
 
-$(eval $(call gb_Library_set_componentfile,deployment,desktop/source/deployment/deployment))
+$(eval $(call gb_Library_set_componentfile,deployment,desktop/source/deployment/deployment,services))
 
 $(eval $(call gb_Library_add_exception_objects,deployment,\
     desktop/source/deployment/dp_log \
diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk
index 900406002ce6..325a29b55946 100644
--- a/desktop/Library_deploymentgui.mk
+++ b/desktop/Library_deploymentgui.mk
@@ -54,7 +54,7 @@ $(eval $(call gb_Library_use_system_win32_libs,deploymentgui,\
 endif
 
 
-$(eval $(call gb_Library_set_componentfile,deploymentgui,desktop/source/deployment/gui/deploymentgui))
+$(eval $(call gb_Library_set_componentfile,deploymentgui,desktop/source/deployment/gui/deploymentgui,services))
 
 $(eval $(call gb_Library_add_exception_objects,deploymentgui,\
     desktop/source/deployment/gui/dp_gui_dependencydialog \
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk
index fdc8d8a661f5..2314d56976d9 100644
--- a/desktop/Library_migrationoo2.mk
+++ b/desktop/Library_migrationoo2.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_use_libraries,migrationoo2,\
     utl \
 ))
 
-$(eval $(call gb_Library_set_componentfile,migrationoo2,desktop/source/migration/services/migrationoo2))
+$(eval $(call gb_Library_set_componentfile,migrationoo2,desktop/source/migration/services/migrationoo2,services))
 
 $(eval $(call gb_Library_add_exception_objects,migrationoo2,\
     desktop/source/migration/services/basicmigration \
diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk
index 10e1b9013b4c..10a63e3d841e 100644
--- a/desktop/Library_migrationoo3.mk
+++ b/desktop/Library_migrationoo3.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Library_use_libraries,migrationoo3,\
     utl \
 ))
 
-$(eval $(call gb_Library_set_componentfile,migrationoo3,desktop/source/migration/services/migrationoo3))
+$(eval $(call gb_Library_set_componentfile,migrationoo3,desktop/source/migration/services/migrationoo3,services))
 
 $(eval $(call gb_Library_add_exception_objects,migrationoo3,\
     desktop/source/migration/services/oo3extensionmigration \
diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk
index b50dd4441dce..a7f560379627 100644
--- a/desktop/Library_offacc.mk
+++ b/desktop/Library_offacc.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Library_use_libraries,offacc,\
     tl \
 ))
 
-$(eval $(call gb_Library_set_componentfile,offacc,desktop/source/offacc/offacc))
+$(eval $(call gb_Library_set_componentfile,offacc,desktop/source/offacc/offacc,services))
 
 $(eval $(call gb_Library_add_exception_objects,offacc,\
     desktop/source/offacc/acceptor \
diff --git a/desktop/Library_passive_native.mk b/desktop/Library_passive_native.mk
index 8bc14b5c48f6..c09743edc93b 100644
--- a/desktop/Library_passive_native.mk
+++ b/desktop/Library_passive_native.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_Library_add_exception_objects,passive_native, \
     desktop/test/deployment/passive/passive_native \
 ))
 
-$(eval $(call gb_Library_set_componentfile,passive_native,desktop/test/deployment/passive/passive_native))
+$(eval $(call gb_Library_set_componentfile,passive_native,desktop/test/deployment/passive/passive_native,passive_platform))
 
 $(eval $(call gb_Library_set_external_code,passive_native))
 
diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk
index c79e57b91b1d..ec43e6326c34 100644
--- a/desktop/Library_spl.mk
+++ b/desktop/Library_spl.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_use_libraries,spl,\
     vcl \
 ))
 
-$(eval $(call gb_Library_set_componentfile,spl,desktop/source/splash/spl))
+$(eval $(call gb_Library_set_componentfile,spl,desktop/source/splash/spl,services))
 
 $(eval $(call gb_Library_add_exception_objects,spl,\
     desktop/source/splash/splash \
diff --git a/desktop/Pyuno_passive_python.mk b/desktop/Pyuno_passive_python.mk
index 348de4aacfb6..c6a56db06a50 100644
--- a/desktop/Pyuno_passive_python.mk
+++ b/desktop/Pyuno_passive_python.mk
@@ -13,6 +13,6 @@ $(eval $(call gb_Pyuno_add_files,passive_python,,\
     passive_python.py \
 ))
 
-$(eval $(call gb_Pyuno_set_componentfile_full,passive_python,desktop/test/deployment/passive/passive_python,./,passive_python.py))
+$(eval $(call gb_Pyuno_set_componentfile_full,passive_python,desktop/test/deployment/passive/passive_python,./,passive_python.py,passive_generic))
 
 # vim: set noet sw=4 ts=4:
diff --git a/desktop/Rdb_passive_generic.mk b/desktop/Rdb_passive_generic.mk
index f05d9c26cf31..70b17947dd74 100644
--- a/desktop/Rdb_passive_generic.mk
+++ b/desktop/Rdb_passive_generic.mk
@@ -9,9 +9,4 @@
 
 $(eval $(call gb_Rdb_Rdb,passive_generic))
 
-$(eval $(call gb_Rdb_add_components,passive_generic, \
-    desktop/test/deployment/passive/passive_java \
-    desktop/test/deployment/passive/passive_python \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/desktop/Rdb_passive_platform.mk b/desktop/Rdb_passive_platform.mk
index 72ffe6c19a69..51d0928df6ce 100644
--- a/desktop/Rdb_passive_platform.mk
+++ b/desktop/Rdb_passive_platform.mk
@@ -9,8 +9,4 @@
 
 $(eval $(call gb_Rdb_Rdb,passive_platform))
 
-$(eval $(call gb_Rdb_add_components,passive_platform, \
-    desktop/test/deployment/passive/passive_native \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk
index 11edeae98c92..0091a291f6e2 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_Library_add_defs,drawinglayer,\
 
 $(eval $(call gb_Library_set_precompiled_header,drawinglayer,drawinglayer/inc/pch/precompiled_drawinglayer))
 
-$(eval $(call gb_Library_set_componentfile,drawinglayer,drawinglayer/drawinglayer))
+$(eval $(call gb_Library_set_componentfile,drawinglayer,drawinglayer/drawinglayer,services))
 
 $(eval $(call gb_Library_use_sdk_api,drawinglayer))
 
diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk
index 000a710ac0f4..35a654835dae 100644
--- a/embeddedobj/Library_embobj.mk
+++ b/embeddedobj/Library_embobj.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Library_use_custom_headers,embobj,\
 	officecfg/registry \
 ))
 
-$(eval $(call gb_Library_set_componentfile,embobj,embeddedobj/util/embobj))
+$(eval $(call gb_Library_set_componentfile,embobj,embeddedobj/util/embobj,services))
 
 $(eval $(call gb_Library_set_include,embobj,\
 	-I$(SRCDIR)/embeddedobj/source/inc \
diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk
index 38472c5cbf89..b7fde953c466 100644
--- a/embeddedobj/Library_emboleobj.mk
+++ b/embeddedobj/Library_emboleobj.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,emboleobj))
 
-$(eval $(call gb_Library_set_componentfile,emboleobj,embeddedobj/source/msole/emboleobj$(if $(filter WNT,$(OS)),.windows)))
+$(eval $(call gb_Library_set_componentfile,emboleobj,embeddedobj/source/msole/emboleobj$(if $(filter WNT,$(OS)),.windows),services))
 
 $(eval $(call gb_Library_set_include,emboleobj,\
 	-I$(SRCDIR)/embeddedobj/source/inc \
diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk
index 07f433da0116..d80d63d0c758 100644
--- a/embedserv/Library_emser.mk
+++ b/embedserv/Library_emser.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,emser))
 
-$(eval $(call gb_Library_set_componentfile,emser,embedserv/util/emser))
+$(eval $(call gb_Library_set_componentfile,emser,embedserv/util/emser,services))
 
 $(eval $(call gb_Library_set_include,emser,\
 	-I$(SRCDIR)/embedserv/source/inc \
diff --git a/emfio/Library_emfio.mk b/emfio/Library_emfio.mk
index cd877c52fa5b..1753189090cf 100644
--- a/emfio/Library_emfio.mk
+++ b/emfio/Library_emfio.mk
@@ -18,7 +18,7 @@
 
 $(eval $(call gb_Library_Library,emfio))
 
-$(eval $(call gb_Library_set_componentfile,emfio,emfio/emfio))
+$(eval $(call gb_Library_set_componentfile,emfio,emfio/emfio,services))
 
 $(eval $(call gb_Library_set_include,emfio,\
     $$(INCLUDE) \
diff --git a/eventattacher/Library_evtatt.mk b/eventattacher/Library_evtatt.mk
index 71ec10f86a18..969c2b4b7106 100644
--- a/eventattacher/Library_evtatt.mk
+++ b/eventattacher/Library_evtatt.mk
@@ -11,7 +11,7 @@
 
 $(eval $(call gb_Library_Library,evtatt))
 
-$(eval $(call gb_Library_set_componentfile,evtatt,eventattacher/source/evtatt))
+$(eval $(call gb_Library_set_componentfile,evtatt,eventattacher/source/evtatt,services))
 
 $(eval $(call gb_Library_use_libraries,evtatt,\
 	comphelper \
diff --git a/extensions/Library_WinUserInfoBe.mk b/extensions/Library_WinUserInfoBe.mk
index 34a635851a82..3d5932f3b279 100644
--- a/extensions/Library_WinUserInfoBe.mk
+++ b/extensions/Library_WinUserInfoBe.mk
@@ -11,7 +11,7 @@
 
 $(eval $(call gb_Library_Library,WinUserInfoBe))
 
-$(eval $(call gb_Library_set_componentfile,WinUserInfoBe,extensions/source/config/WinUserInfo/WinUserInfoBe))
+$(eval $(call gb_Library_set_componentfile,WinUserInfoBe,extensions/source/config/WinUserInfo/WinUserInfoBe,services))
 
 $(eval $(call gb_Library_use_sdk_api,WinUserInfoBe))
 
diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk
index 0262b3a02e0b..85d0942efd25 100644
--- a/extensions/Library_abp.mk
+++ b/extensions/Library_abp.mk
@@ -11,7 +11,7 @@
 
 $(eval $(call gb_Library_Library,abp))
 
-$(eval $(call gb_Library_set_componentfile,abp,extensions/source/abpilot/abp))
+$(eval $(call gb_Library_set_componentfile,abp,extensions/source/abpilot/abp,services))
 
 $(eval $(call gb_Library_set_include,abp,\
 	$$(INCLUDE) \
diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk
index 04787f16058e..147b8034f3e4 100644
--- a/extensions/Library_bib.mk
+++ b/extensions/Library_bib.mk
@@ -11,7 +11,7 @@
 
 $(eval $(call gb_Library_Library,bib))
 
-$(eval $(call gb_Library_set_componentfile,bib,extensions/source/bibliography/bib))
+$(eval $(call gb_Library_set_componentfile,bib,extensions/source/bibliography/bib,services))
 
 $(eval $(call gb_Library_set_include,bib,\
 	$$(INCLUDE) \
diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk
index 38c58e4f1f0d..ec5f75c127a2 100644
--- a/extensions/Library_dbp.mk
+++ b/extensions/Library_dbp.mk
@@ -11,7 +11,7 @@
 
 $(eval $(call gb_Library_Library,dbp))
 
-$(eval $(call gb_Library_set_componentfile,dbp,extensions/source/dbpilots/dbp))
+$(eval $(call gb_Library_set_componentfile,dbp,extensions/source/dbpilots/dbp,services))
 
 $(eval $(call gb_Library_set_include,dbp,\
 	$$(INCLUDE) \
diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk
index 6d81426ad53e..58ea11b2d0ce 100644
--- a/extensions/Library_ldapbe2.mk
+++ b/extensions/Library_ldapbe2.mk
@@ -11,7 +11,7 @@
 
 $(eval $(call gb_Library_Library,ldapbe2))
 
-$(eval $(call gb_Library_set_componentfile,ldapbe2,extensions/source/config/ldap/ldapbe2))
+$(eval $(call gb_Library_set_componentfile,ldapbe2,extensions/source/config/ldap/ldapbe2,services))
 
 $(eval $(call gb_Library_use_sdk_api,ldapbe2))
 
diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk
index 4db9012adaa1..edf42d35e1dc 100644
--- a/extensions/Library_log.mk
+++ b/extensions/Library_log.mk
@@ -11,7 +11,7 @@
 
 $(eval $(call gb_Library_Library,log))
 
-$(eval $(call gb_Library_set_componentfile,log,extensions/source/logging/log))
+$(eval $(call gb_Library_set_componentfile,log,extensions/source/logging/log,services))
 
 $(eval $(call gb_Library_use_external,log,boost_headers))
 
diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk
index ec59f715c504..aa6c6d0cf2a6 100644
--- a/extensions/Library_oleautobridge.mk
+++ b/extensions/Library_oleautobridge.mk
@@ -11,7 +11,7 @@
 
 $(eval $(call gb_Library_Library,oleautobridge))
 
-$(eval $(call gb_Library_set_componentfile,oleautobridge,extensions/source/ole/oleautobridge))
+$(eval $(call gb_Library_set_componentfile,oleautobridge,extensions/source/ole/oleautobridge,services))
 
 $(eval $(call gb_Library_use_api,oleautobridge,\
     offapi \
diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk
index f01c00233dee..14187b9608bc 100644
--- a/extensions/Library_pcr.mk
+++ b/extensions/Library_pcr.mk
@@ -11,7 +11,7 @@
 
 $(eval $(call gb_Library_Library,pcr))
 
-$(eval $(call gb_Library_set_componentfile,pcr,extensions/source/propctrlr/pcr))
+$(eval $(call gb_Library_set_componentfile,pcr,extensions/source/propctrlr/pcr,services))
 
 $(eval $(call gb_Library_use_sdk_api,pcr))
 
diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk
index 4fc8788e851d..51c48fbfdf68 100644
--- a/extensions/Library_scn.mk
+++ b/extensions/Library_scn.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_Library_set_include,scn,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_set_componentfile,scn,extensions/source/scanner/scn))
+$(eval $(call gb_Library_set_componentfile,scn,extensions/source/scanner/scn,services))
 
 $(eval $(call gb_Library_use_sdk_api,scn))
 
diff --git a/extensions/Library_updatecheckui.mk b/extensions/Library_updatecheckui.mk
index 86c59b608389..d889defa89c2 100644
--- a/extensions/Library_updatecheckui.mk
+++ b/extensions/Library_updatecheckui.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Library_set_include,updatecheckui,\
        $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_set_componentfile,updatecheckui,extensions/source/update/ui/updchk))
+$(eval $(call gb_Library_set_componentfile,updatecheckui,extensions/source/update/ui/updchk,services))
 
 $(eval $(call gb_Library_use_external,updatecheckui,boost_headers))
 
diff --git a/extensions/Library_updatefeed.mk b/extensions/Library_updatefeed.mk
index 8b9328e30e23..5b9baa7b1be7 100644
--- a/extensions/Library_updatefeed.mk
+++ b/extensions/Library_updatefeed.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,updatefeed))
 
-$(eval $(call gb_Library_set_componentfile,updatefeed,extensions/source/update/feed/updatefeed))
+$(eval $(call gb_Library_set_componentfile,updatefeed,extensions/source/update/feed/updatefeed,services))
 
 $(eval $(call gb_Library_use_externals,updatefeed, \
     boost_headers \
diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk
index c7f1a54bb65e..bd05a3a26500 100644
--- a/extensions/Library_updchk.mk
+++ b/extensions/Library_updchk.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,updchk))
 
-$(eval $(call gb_Library_set_componentfile,updchk,extensions/source/update/check/updchk.uno))
+$(eval $(call gb_Library_set_componentfile,updchk,extensions/source/update/check/updchk.uno,services))
 
 $(eval $(call gb_Library_set_include,updchk,\
 	$$(INCLUDE) \
diff --git a/filter/Library_filterconfig.mk b/filter/Library_filterconfig.mk
index 79557890786c..38251aa313f0 100644
--- a/filter/Library_filterconfig.mk
+++ b/filter/Library_filterconfig.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,filterconfig))
 
-$(eval $(call gb_Library_set_componentfile,filterconfig,filter/source/config/cache/filterconfig1))
+$(eval $(call gb_Library_set_componentfile,filterconfig,filter/source/config/cache/filterconfig1,services))
 
 $(eval $(call gb_Library_use_external,filterconfig,boost_headers))
 
diff --git a/filter/Library_graphicfilter.mk b/filter/Library_graphicfilter.mk
index 110e9b4d8a13..34f9662d0aa1 100644
--- a/filter/Library_graphicfilter.mk
+++ b/filter/Library_graphicfilter.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,graphicfilter))
 
-$(eval $(call gb_Library_set_componentfile,graphicfilter,filter/source/graphic/graphicfilter))
+$(eval $(call gb_Library_set_componentfile,graphicfilter,filter/source/graphic/graphicfilter,services))
 
 $(eval $(call gb_Library_use_external,graphicfilter,boost_headers))
 
diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk
index 22c765f20d78..0429a6e31874 100644
--- a/filter/Library_msfilter.mk
+++ b/filter/Library_msfilter.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,msfilter))
 
-$(eval $(call gb_Library_set_componentfile,msfilter,filter/source/msfilter/msfilter))
+$(eval $(call gb_Library_set_componentfile,msfilter,filter/source/msfilter/msfilter,services))
 
 $(eval $(call gb_Library_use_external,msfilter,boost_headers))
 
diff --git a/filter/Library_odfflatxml.mk b/filter/Library_odfflatxml.mk
index 8ed2aa4ce199..176530035ddd 100644
--- a/filter/Library_odfflatxml.mk
+++ b/filter/Library_odfflatxml.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,odfflatxml))
 
-$(eval $(call gb_Library_set_componentfile,odfflatxml,filter/source/odfflatxml/odfflatxml))
+$(eval $(call gb_Library_set_componentfile,odfflatxml,filter/source/odfflatxml/odfflatxml,services))
 
 $(eval $(call gb_Library_use_sdk_api,odfflatxml))
 
diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk
index a7cb47a65231..23afd08b4595 100644
--- a/filter/Library_pdffilter.mk
+++ b/filter/Library_pdffilter.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,pdffilter))
 
-$(eval $(call gb_Library_set_componentfile,pdffilter,filter/source/pdf/pdffilter))
+$(eval $(call gb_Library_set_componentfile,pdffilter,filter/source/pdf/pdffilter,services))
 
 $(eval $(call gb_Library_use_external,pdffilter,boost_headers))
 
diff --git a/filter/Library_storagefd.mk b/filter/Library_storagefd.mk
index 938096ecef0f..4d2fd1dfeed7 100644
--- a/filter/Library_storagefd.mk
+++ b/filter/Library_storagefd.mk
@@ -11,7 +11,7 @@
 
 $(eval $(call gb_Library_Library,storagefd))
 
-$(eval $(call gb_Library_set_componentfile,storagefd,filter/source/storagefilterdetect/storagefd))
+$(eval $(call gb_Library_set_componentfile,storagefd,filter/source/storagefilterdetect/storagefd,services))
 
 $(eval $(call gb_Library_use_external,storagefd,boost_headers))
 
diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk
index 21318aa1fd03..07da0cc4a3cc 100644
--- a/filter/Library_svgfilter.mk
+++ b/filter/Library_svgfilter.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,svgfilter))
 
 $(eval $(call gb_Library_use_custom_headers,svgfilter,filter/source/svg))
 
-$(eval $(call gb_Library_set_componentfile,svgfilter,filter/source/svg/svgfilter))
+$(eval $(call gb_Library_set_componentfile,svgfilter,filter/source/svg/svgfilter,services))
 
 $(eval $(call gb_Library_add_defs,svgfilter,\
 	-DBOOST_ALL_NO_LIB \
diff --git a/filter/Library_t602filter.mk b/filter/Library_t602filter.mk
index 90f834e1238d..f8ad92b9680e 100644
--- a/filter/Library_t602filter.mk
+++ b/filter/Library_t602filter.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_set_include,t602filter,\
     -I$(SRCDIR)/filter/inc \
 ))
 
-$(eval $(call gb_Library_set_componentfile,t602filter,filter/source/t602/t602filter))
+$(eval $(call gb_Library_set_componentfile,t602filter,filter/source/t602/t602filter,services))
 
 $(eval $(call gb_Library_use_external,t602filter,boost_headers))
 
diff --git a/filter/Library_textfd.mk b/filter/Library_textfd.mk
index c6155f1e9876..d3318dcbdb35 100644
--- a/filter/Library_textfd.mk
+++ b/filter/Library_textfd.mk
@@ -11,7 +11,7 @@
 
 $(eval $(call gb_Library_Library,textfd))
 
-$(eval $(call gb_Library_set_componentfile,textfd,filter/source/textfilterdetect/textfd))
+$(eval $(call gb_Library_set_componentfile,textfd,filter/source/textfilterdetect/textfd,services))
 
 $(eval $(call gb_Library_use_external,textfd,boost_headers))
 
diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk
index 147bed21d7c6..35a2dd9ff9b6 100644
--- a/filter/Library_xmlfa.mk
+++ b/filter/Library_xmlfa.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,xmlfa))
 
-$(eval $(call gb_Library_set_componentfile,xmlfa,filter/source/xmlfilteradaptor/xmlfa))
+$(eval $(call gb_Library_set_componentfile,xmlfa,filter/source/xmlfilteradaptor/xmlfa,services))
 
 $(eval $(call gb_Library_use_external,xmlfa,boost_headers))
 
diff --git a/filter/Library_xmlfd.mk b/filter/Library_xmlfd.mk
index 8ec02c3c0ff7..a5c1d190c8f7 100644
--- a/filter/Library_xmlfd.mk
+++ b/filter/Library_xmlfd.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,xmlfd))
 
-$(eval $(call gb_Library_set_componentfile,xmlfd,filter/source/xmlfilterdetect/xmlfd))
+$(eval $(call gb_Library_set_componentfile,xmlfd,filter/source/xmlfilterdetect/xmlfd,services))
 
 $(eval $(call gb_Library_use_external,xmlfd,boost_headers))
 
diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk
index 737f79e7b225..fd5f480e7fa5 100644
--- a/filter/Library_xsltdlg.mk
+++ b/filter/Library_xsltdlg.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,xsltdlg))
 
-$(eval $(call gb_Library_set_componentfile,xsltdlg,filter/source/xsltdialog/xsltdlg))
+$(eval $(call gb_Library_set_componentfile,xsltdlg,filter/source/xsltdialog/xsltdlg,services))
 
 $(eval $(call gb_Library_use_external,xsltdlg,boost_headers))
 
diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk
index 92e2e11e2f64..42f426c945ea 100644
--- a/filter/Library_xsltfilter.mk
+++ b/filter/Library_xsltfilter.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,xsltfilter))
 
-$(eval $(call gb_Library_set_componentfile,xsltfilter,filter/source/xsltfilter/xsltfilter))
+$(eval $(call gb_Library_set_componentfile,xsltfilter,filter/source/xsltfilter/xsltfilter,services))
 
 $(eval $(call gb_Library_use_sdk_api,xsltfilter))
 
diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk
index 5739c28c0c80..8fc09fc700d7 100644
--- a/forms/Library_frm.mk
+++ b/forms/Library_frm.mk
@@ -53,7 +53,7 @@ $(eval $(call gb_Library_use_externals,frm,\
     libxml2 \
 ))
 
-$(eval $(call gb_Library_set_componentfile,frm,forms/util/frm))
+$(eval $(call gb_Library_set_componentfile,frm,forms/util/frm,services))
 
 $(eval $(call gb_Library_add_exception_objects,frm,\
     forms/source/component/Button \
diff --git a/formula/Library_for.mk b/formula/Library_for.mk
index a646b4a9598a..5ff739b2acd8 100644
--- a/formula/Library_for.mk
+++ b/formula/Library_for.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_use_libraries,for,\
     vcl \
 ))
 
-$(eval $(call gb_Library_set_componentfile,for,formula/util/for))
+$(eval $(call gb_Library_set_componentfile,for,formula/util/for,services))
 
 $(eval $(call gb_Library_add_exception_objects,for,\
     formula/source/core/api/FormulaCompiler \
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index 047e888e3954..3e14f03b7ec2 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Library_use_custom_headers,fps,\
 	officecfg/registry \
 ))
 
-$(eval $(call gb_Library_set_componentfile,fps,fpicker/source/win32/fps))
+$(eval $(call gb_Library_set_componentfile,fps,fpicker/source/win32/fps,services))
 
 $(eval $(call gb_Library_set_include,fps,\
     $$(INCLUDE) \
diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
index 4c033a838bc5..0b8db2e37729 100644
--- a/fpicker/Library_fps_aqua.mk
+++ b/fpicker/Library_fps_aqua.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,fps_aqua))
 
-$(eval $(call gb_Library_set_componentfile,fps_aqua,fpicker/source/aqua/fps_aqua))
+$(eval $(call gb_Library_set_componentfile,fps_aqua,fpicker/source/aqua/fps_aqua,services))
 
 $(eval $(call gb_Library_set_include,fps_aqua,\
     $$(INCLUDE) \
diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk
index 147dceb34da2..d7e41e66eb17 100644
--- a/fpicker/Library_fps_office.mk
+++ b/fpicker/Library_fps_office.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,fps_office))
 
-$(eval $(call gb_Library_set_componentfile,fps_office,fpicker/source/office/fps_office))
+$(eval $(call gb_Library_set_componentfile,fps_office,fpicker/source/office/fps_office,services))
 
 $(eval $(call gb_Library_set_include,fps_office,\
     $$(INCLUDE) \
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index c8ffb1f1b36b..fa75122a8729 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Library_add_defs,fwk,\
     -DFWK_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_set_componentfile,fwk,framework/util/fwk))
+$(eval $(call gb_Library_set_componentfile,fwk,framework/util/fwk,services))
 
 $(eval $(call gb_Library_set_include,fwk,\
     -I$(SRCDIR)/framework/source/inc \
diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk
index 1f6ee38b691f..bd670f285bc4 100644
--- a/hwpfilter/Library_hwp.mk
+++ b/hwpfilter/Library_hwp.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_Library_use_system_win32_libs,hwp,\
 
 endif
 
-$(eval $(call gb_Library_set_componentfile,hwp,hwpfilter/source/hwp))
+$(eval $(call gb_Library_set_componentfile,hwp,hwpfilter/source/hwp,services))
 
 $(eval $(call gb_Library_add_exception_objects,hwp,\
     hwpfilter/source/attributes \
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index 09293b0856f0..97a79be3910b 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -10,9 +10,9 @@
 $(eval $(call gb_Library_Library,i18npool))
 
 ifeq ($(WITH_LOCALES),en)
-$(eval $(call gb_Library_set_componentfile,i18npool,i18npool/util/i18npool.en))
+$(eval $(call gb_Library_set_componentfile,i18npool,i18npool/util/i18npool.en,services))
 else
-$(eval $(call gb_Library_set_componentfile,i18npool,i18npool/util/i18npool))
+$(eval $(call gb_Library_set_componentfile,i18npool,i18npool/util/i18npool,services))
 endif
 
 $(eval $(call gb_Library_set_include,i18npool,\
diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk
index 64d5adbd65ae..e69aebb32722 100644
--- a/i18npool/Library_i18nsearch.mk
+++ b/i18npool/Library_i18nsearch.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,i18nsearch))
 
-$(eval $(call gb_Library_set_componentfile,i18nsearch,i18npool/source/search/i18nsearch))
+$(eval $(call gb_Library_set_componentfile,i18nsearch,i18npool/source/search/i18nsearch,services))
 
 $(eval $(call gb_Library_use_sdk_api,i18nsearch))
 
diff --git a/i18npool/Rdb_saxparser.mk b/i18npool/Rdb_saxparser.mk
index f3c2dda7cded..b5eede60caae 100644
--- a/i18npool/Rdb_saxparser.mk
+++ b/i18npool/Rdb_saxparser.mk
@@ -7,6 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+# Rdb_saxparser duplicates some of the Rdb_services content, as needed during the build in
+# CustomTarget_i18npool/localedata:
+
 $(eval $(call gb_Rdb_Rdb,saxparser))
 
 $(eval $(call gb_Rdb_add_components,saxparser,\
diff --git a/io/Library_io.mk b/io/Library_io.mk
index 6512cfac8122..a22a522f7bbc 100644
--- a/io/Library_io.mk
+++ b/io/Library_io.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_Library_use_libraries,io,\
     tl \
 ))
 
-$(eval $(call gb_Library_set_componentfile,io,io/source/io))
+$(eval $(call gb_Library_set_componentfile,io,io/source/io,ure/services))
 
 $(eval $(call gb_Library_set_include,io,\
 	-I$(SRCDIR)/io/source \
diff --git a/lingucomponent/Library_MacOSXSpell.mk b/lingucomponent/Library_MacOSXSpell.mk
index d49ee47a73bd..df77686d1c22 100644
--- a/lingucomponent/Library_MacOSXSpell.mk
+++ b/lingucomponent/Library_MacOSXSpell.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,MacOSXSpell))
 
-$(eval $(call gb_Library_set_componentfile,MacOSXSpell,lingucomponent/source/spellcheck/macosxspell/MacOSXSpell))
+$(eval $(call gb_Library_set_componentfile,MacOSXSpell,lingucomponent/source/spellcheck/macosxspell/MacOSXSpell,services))
 
 $(eval $(call gb_Library_set_include,MacOSXSpell,\
 	$$(INCLUDE) \
diff --git a/lingucomponent/Library_guesslang.mk b/lingucomponent/Library_guesslang.mk
index 55f9225722a5..c421f2154dc3 100644
--- a/lingucomponent/Library_guesslang.mk
+++ b/lingucomponent/Library_guesslang.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,guesslang))
 
-$(eval $(call gb_Library_set_componentfile,guesslang,lingucomponent/source/languageguessing/guesslang))
+$(eval $(call gb_Library_set_componentfile,guesslang,lingucomponent/source/languageguessing/guesslang,services))
 
 $(eval $(call gb_Library_use_externals,guesslang,\
 	boost_headers \
diff --git a/lingucomponent/Library_hyphen.mk b/lingucomponent/Library_hyphen.mk
index b1b6ea23ec87..dd172e080e4a 100644
--- a/lingucomponent/Library_hyphen.mk
+++ b/lingucomponent/Library_hyphen.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,hyphen))
 
-$(eval $(call gb_Library_set_componentfile,hyphen,lingucomponent/source/hyphenator/hyphen/hyphen))
+$(eval $(call gb_Library_set_componentfile,hyphen,lingucomponent/source/hyphenator/hyphen/hyphen,services))
 
 $(eval $(call gb_Library_set_include,hyphen,\
 	$$(INCLUDE) \
diff --git a/lingucomponent/Library_lnth.mk b/lingucomponent/Library_lnth.mk
index 1351a2f406d8..00d16790e241 100644
--- a/lingucomponent/Library_lnth.mk
+++ b/lingucomponent/Library_lnth.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,lnth))
 
-$(eval $(call gb_Library_set_componentfile,lnth,lingucomponent/source/thesaurus/libnth/lnth))
+$(eval $(call gb_Library_set_componentfile,lnth,lingucomponent/source/thesaurus/libnth/lnth,services))
 
 $(eval $(call gb_Library_set_include,lnth,\
 	$$(INCLUDE) \
diff --git a/lingucomponent/Library_numbertext.mk b/lingucomponent/Library_numbertext.mk
index 68c50e209fba..6cb6ba10a50f 100644
--- a/lingucomponent/Library_numbertext.mk
+++ b/lingucomponent/Library_numbertext.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,numbertext))
 
-$(eval $(call gb_Library_set_componentfile,numbertext,lingucomponent/source/numbertext/numbertext))
+$(eval $(call gb_Library_set_componentfile,numbertext,lingucomponent/source/numbertext/numbertext,services))
 
 $(eval $(call gb_Library_use_externals,numbertext,\
 	libnumbertext \
diff --git a/lingucomponent/Library_spell.mk b/lingucomponent/Library_spell.mk
index fd55ca0ebc76..c00ea8d90601 100644
--- a/lingucomponent/Library_spell.mk
+++ b/lingucomponent/Library_spell.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,spell))
 
-$(eval $(call gb_Library_set_componentfile,spell,lingucomponent/source/spellcheck/spell/spell))
+$(eval $(call gb_Library_set_componentfile,spell,lingucomponent/source/spellcheck/spell/spell,services))
 
 $(eval $(call gb_Library_set_include,spell,\
 	$$(INCLUDE) \
diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk
index 517177ec393d..cff45e3a68ac 100644
--- a/linguistic/Library_lng.mk
+++ b/linguistic/Library_lng.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,lng))
 
-$(eval $(call gb_Library_set_componentfile,lng,linguistic/source/lng))
+$(eval $(call gb_Library_set_componentfile,lng,linguistic/source/lng,services))
 
 $(eval $(call gb_Library_set_include,lng,\
 	$$(INCLUDE) \
diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index af0f940cc666..ffd7f7e40335 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -45,7 +45,7 @@ $(eval $(call gb_Library_use_externals,lwpft,\
     icu_headers \
 ))
 
-$(eval $(call gb_Library_set_componentfile,lwpft,lotuswordpro/util/lwpfilter))
+$(eval $(call gb_Library_set_componentfile,lwpft,lotuswordpro/util/lwpfilter,services))
 
 $(eval $(call gb_Library_add_exception_objects,lwpft,\
     lotuswordpro/source/filter/bencont \
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 6550a3942c88..f9a059b30147 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -81,7 +81,7 @@ $(eval $(call gb_Library_use_externals,oox,\
 endif
 endif
 
-$(eval $(call gb_Library_set_componentfile,oox,oox/util/oox))
+$(eval $(call gb_Library_set_componentfile,oox,oox/util/oox,services))
 
 $(eval $(call gb_Library_add_exception_objects,oox,\
     oox/source/core/binarycodec \
diff --git a/package/Library_package2.mk b/package/Library_package2.mk
index 9bb7e3194b98..c78786632555 100644
--- a/package/Library_package2.mk
+++ b/package/Library_package2.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,package2))
 
-$(eval $(call gb_Library_set_componentfile,package2,package/util/package2))
+$(eval $(call gb_Library_set_componentfile,package2,package/util/package2,services))
 
 $(eval $(call gb_Library_set_include,package2,\
 	$$(INCLUDE) \
diff --git a/package/Library_xstor.mk b/package/Library_xstor.mk
index c47b0c1fa8fe..fecf9c8da4eb 100644
--- a/package/Library_xstor.mk
+++ b/package/Library_xstor.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,xstor))
 
-$(eval $(call gb_Library_set_componentfile,xstor,package/source/xstor/xstor))
+$(eval $(call gb_Library_set_componentfile,xstor,package/source/xstor/xstor,services))
 
 $(eval $(call gb_Library_set_include,xstor,\
 	$$(INCLUDE) \
diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk
index 369feff99367..8a8ec0891540 100644
--- a/postprocess/Module_postprocess.mk
+++ b/postprocess/Module_postprocess.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_Module_Module,postprocess))
 # is reused in Package_registry!
 
 $(eval $(call gb_Module_add_targets,postprocess,\
-    $(if $(ENABLE_SERVICES_RDB_FROM_BUILD),CustomTarget_components) \
+    $(if $(ENABLE_CUSTOMTARGET_COMPONENTS),CustomTarget_components) \
 	CustomTarget_registry \
 	Rdb_services \
 ))
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index f193e567779f..6814fc4a11a7 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -9,340 +9,4 @@
 
 $(eval $(call gb_Rdb_Rdb_install,services))
 
-# see Makefile.gbuild for the gb_Rdb_add_components,services calls
-ifeq (,$(ENABLE_SERVICES_RDB_FROM_BUILD))
-
-#
-# "minimal" list of services for cross-compiling build tools
-#
-$(eval $(call gb_Rdb_add_components,services,\
-	$(if $(DISABLE_GUI),,$(call gb_Helper_optional,AVMEDIA,avmedia/util/avmedia)) \
-	$(call gb_Helper_optional,SCRIPTING,basic/util/sb) \
-	canvas/source/factory/canvasfactory \
-	canvas/source/simplecanvas/simplecanvas \
-	canvas/source/vcl/vclcanvas \
-	$(if $(ENABLE_CAIRO_CANVAS),canvas/source/cairo/cairocanvas) \
-	$(if $(ENABLE_OPENGL_CANVAS),canvas/source/opengl/oglcanvas) \
-	$(if $(filter WNT,$(OS)), \
-		canvas/source/directx/directx9canvas \
-		canvas/source/directx/gdipluscanvas \
-	) \
-	comphelper/util/comphelp \
-	configmgr/source/configmgr \
-	$(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)), \
-		connectivity/source/dbtools/dbtools \
-		connectivity/source/drivers/dbase/dbase \
-	) \
-	cppcanvas/source/uno/mtfrenderer \
-	drawinglayer/drawinglayer \
-	emfio/emfio \
-	filter/source/config/cache/filterconfig1 \
-	filter/source/graphic/graphicfilter \
-	filter/source/svg/svgfilter \
-	framework/util/fwk \
-	i18npool/source/search/i18nsearch \
-	$(if $(filter en,$(WITH_LOCALES)),i18npool/util/i18npool.en,i18npool/util/i18npool) \
-	package/source/xstor/xstor \
-	package/util/package2 \
-	sax/source/expatwrap/expwrap \
-	sfx2/util/sfx \
-	sot/util/sot \
-	svgio/svgio \
-	svl/source/fsstor/fsstorage \
-	svl/source/passwordcontainer/passwordcontainer \
-	svl/util/svl \
-	svtools/util/svt \
-	svx/util/svxcore \
-	toolkit/util/tk \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	unotools/util/utl \
-	unoxml/source/service/unoxml \
-	uui/util/uui \
-	vcl/vcl.common \
-	$(if $(filter ANDROID,$(OS)),vcl/vcl.android) \
-	$(if $(DISABLE_GUI),vcl/vcl.headless) \
-	$(if $(filter iOS,$(OS)),vcl/vcl.ios) \
-	$(if $(filter MACOSX,$(OS)),vcl/vcl.macosx) \
-	$(if $(filter WNT,$(OS)),\
-		vcl/vcl.windows \
-		vcl/vclplug_win \
-	) \
-))
-
-ifeq ($(gb_Side),host)
-
-$(eval $(call gb_Rdb_add_components,services,\
-	animations/source/animcore/animcore \
-	chart2/source/controller/chartcontroller \
-	chart2/source/chartcore \
-	cui/util/cui \
-	desktop/source/deployment/deployment \
-	embeddedobj/util/embobj \
-	eventattacher/source/evtatt \
-	filter/source/msfilter/msfilter \
-	filter/source/odfflatxml/odfflatxml \
-	filter/source/pdf/pdffilter \
-	filter/source/storagefilterdetect/storagefd \
-	filter/source/t602/t602filter \
-	filter/source/textfilterdetect/textfd \
-	filter/source/xmlfilteradaptor/xmlfa \
-	filter/source/xmlfilterdetect/xmlfd \
-	filter/source/xsltdialog/xsltdlg \
-	filter/source/xsltfilter/xsltfilter \
-	formula/util/for \
-	$(call gb_Helper_optional,DESKTOP,fpicker/source/office/fps_office) \
-	$(if $(filter MACOSX,$(OS)),fpicker/source/aqua/fps_aqua) \
-	hwpfilter/source/hwp \
-	lingucomponent/source/hyphenator/hyphen/hyphen \
-	lingucomponent/source/languageguessing/guesslang \
-	lingucomponent/source/spellcheck/spell/spell \
-	lingucomponent/source/thesaurus/libnth/lnth \
-	lingucomponent/source/numbertext/numbertext \
-	linguistic/source/lng \
-	$(if $(ENABLE_LWP), \
-	    lotuswordpro/util/lwpfilter \
-	) \
-	oox/util/oox \
-	sc/util/sc \
-	sc/util/scd \
-	sc/util/scfilt \
-	scaddins/source/analysis/analysis \
-	scaddins/source/datefunc/date \
-	scaddins/source/pricing/pricing \
-	sd/util/sd \
-	sd/util/sdd \
-	sd/util/sdfilt \
-	sdext/source/presenter/presenter \
-	sdext/source/minimizer/minimizer \
-	slideshow/util/slideshow \
-	starmath/util/sm \
-	starmath/util/smd \
-    $(call gb_Helper_optional,BREAKPAD,svx/util/crashreport) \
-	svx/util/svx \
-	svx/util/textconversiondlgs \
-	sw/util/msword \
-	sw/util/sw \
-	sw/util/swd \
-	ucb/source/sorter/srtrs1 \
-	ucb/source/cacher/cached1 \
-	$(if $(ENABLE_LIBCMIS),ucb/source/ucp/cmis/ucpcmis1) \
-	ucb/source/ucp/expand/ucpexpand1 \
-	ucb/source/ucp/ext/ucpext \
-	$(if $(ENABLE_CURL),ucb/source/ucp/ftp/ucpftp1) \
-	ucb/source/ucp/hierarchy/ucphier1 \
-	ucb/source/ucp/image/ucpimage \
-	ucb/source/ucp/package/ucppkg1 \
-	ucb/source/ucp/tdoc/ucptdoc1 \
-	UnoControls/util/ctl \
-	unoxml/source/rdf/unordf \
-	xmloff/source/transform/xof \
-	xmloff/util/xo \
-	xmlscript/util/xmlscript \
-	$(if $(ENABLE_NSS), \
-		xmlsecurity/util/xmlsecurity \
-		xmlsecurity/util/xsec_xmlsec) \
-	$(if $(ENABLE_COINMP), \
-		sccomp/source/solver/coinmpsolver \
-	) \
-	$(if $(ENABLE_LPSOLVE), \
-		sccomp/source/solver/lpsolvesolver \
-	) \
-	sccomp/source/solver/swarmsolver \
-	writerfilter/util/writerfilter \
-	writerperfect/source/draw/wpftdraw \
-	writerperfect/source/impress/wpftimpress \
-	writerperfect/source/writer/wpftwriter \
-	writerperfect/source/calc/wpftcalc \
-	$(if $(filter MACOSX,$(OS)), \
-		$(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
-		shell/source/backends/macbe/macbe1 \
-	) \
-	$(if $(filter iOS MACOSX,$(OS)), \
-		lingucomponent/source/spellcheck/macosxspell/MacOSXSpell \
-	) \
-	$(if $(filter WNT,$(OS)), \
-		$(call gb_Helper_optional,AVMEDIA,avmedia/source/win/avmediawin) \
-		embeddedobj/source/msole/emboleobj.windows \
-		embedserv/util/emser \
-		extensions/source/ole/oleautobridge \
-		fpicker/source/win32/fps \
-		shell/source/backends/wininetbe/wininetbe1 \
-		shell/source/win32/simplemail/smplmail \
-		shell/source/win32/syssh \
-		winaccessibility/source/service/winaccessibility \
-	) \
-	$(if $(filter-out WNT,$(OS)), \
-		embeddedobj/source/msole/emboleobj \
-	) \
-	$(if $(filter neon,$(WITH_WEBDAV)), \
-		ucb/source/ucp/webdav-neon/ucpdav1 \
-	) \
-	$(if $(filter serf,$(WITH_WEBDAV)), \
-		ucb/source/ucp/webdav/ucpdav1 \
-	) \
-	$(if $(filter curl,$(WITH_WEBDAV)), \
-		ucb/source/ucp/webdav-curl/ucpdav1 \
-	) \
-	$(call gb_Helper_optional,SCRIPTING, \
-		basctl/util/basctl \
-		sc/util/vbaobj \
-		scripting/source/basprov/basprov \
-		scripting/source/dlgprov/dlgprov \
-		scripting/source/protocolhandler/protocolhandler \
-		scripting/source/stringresource/stringresource \
-		scripting/source/vbaevents/vbaevents \
-		scripting/util/scriptframe \
-		sw/util/vbaswobj \
-		vbahelper/util/msforms \
-		$(if $(DISABLE_PYTHON),, \
-			scripting/source/pyprov/mailmerge \
-			wizards/com/sun/star/wizards/agenda/agenda \
-			wizards/com/sun/star/wizards/fax/fax \
-			wizards/com/sun/star/wizards/letter/letter \
-		) \
-	) \
-	$(if $(ENABLE_GIO), \
-		shell/source/sessioninstall/losessioninstall \
-		ucb/source/ucp/gio/ucpgio \
-	) \
-	$(if $(ENABLE_GSTREAMER_1_0), \
-		$(call gb_Helper_optional,AVMEDIA,avmedia/source/gstreamer/avmediagstreamer) \
-	) \
-	$(if $(ENABLE_KF5), \
-		shell/source/backends/kf5be/kf5be1 \
-	) \
-	$(if $(ENABLE_ONLINE_UPDATE), \
-		extensions/source/update/check/updchk.uno \
-		extensions/source/update/ui/updchk \
-	) \
-	$(if $(ENABLE_OPENGL_TRANSITIONS), \
-		slideshow/source/engine/opengl/ogltrans \
-	) \
-	$(if $(ENABLE_JAVA), \
-		xmerge/source/bridge/XMergeBridge \
-		scripting/java/ScriptFramework \
-		scripting/java/ScriptProviderForJava \
-		smoketest/org/libreoffice/smoketest/smoketest \
-		wizards/com/sun/star/wizards/form/form \
-		wizards/com/sun/star/wizards/query/query \
-		wizards/com/sun/star/wizards/report/report \
-		wizards/com/sun/star/wizards/table/table \
-	) \
-    $(call gb_Helper_optional,XMLHELP,xmlhelp/util/ucpchelp1) \
-))
-
-$(eval $(call gb_Rdb_add_components,services,\
-	extensions/source/bibliography/bib \
-	dbaccess/util/dba \
-))
-
-ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
-
-$(eval $(call gb_Rdb_add_components,services,\
-	extensions/source/dbpilots/dbp \
-	extensions/source/propctrlr/pcr \
-	connectivity/source/cpool/dbpool2 \
-	$(if $(filter WNT,$(OS)), \
-		connectivity/source/drivers/ado/ado \
-	) \
-	connectivity/source/drivers/calc/calc \
-	$(if $(ENABLE_EVOAB2), \
-		connectivity/source/drivers/evoab2/evoab \
-	) \
-	$(if $(filter $(ENABLE_FIREBIRD_SDBC),TRUE), \
-		connectivity/source/drivers/firebird/firebird_sdbc \
-	) \
-	connectivity/source/drivers/flat/flat \
-	$(if $(ENABLE_MARIADBC), \
-		connectivity/source/drivers/mysqlc/mysqlc \
-	) \
-	$(if $(filter MACOSX,$(OS)), \
-		connectivity/source/drivers/macab/macab1 \
-	) \
-	$(if $(ENABLE_JAVA), \
-		connectivity/source/drivers/hsqldb/hsqldb \
-		connectivity/source/drivers/jdbc/jdbc \
-	) \
-	connectivity/source/drivers/mysql_jdbc/mysql_jdbc \
-	connectivity/source/manager/sdbc2 \
-	connectivity/source/drivers/writer/writer \
-	dbaccess/source/filter/xml/dbaxml \
-	dbaccess/util/dbu \
-	dbaccess/util/sdbt \
-	forms/util/frm \
-	reportdesign/util/rpt \
-	reportdesign/util/rptui \
-	reportdesign/util/rptxml \
-	shell/source/backends/localebe/localebe1 \
-    sw/util/sw_mm \
-	$(if $(filter-out ANDROID iOS,$(OS)),\
-		connectivity/source/drivers/odbc/odbc \
-	) \
-))
-
-ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
-$(eval $(call gb_Rdb_add_components,services,\
-	connectivity/source/drivers/mozab/bootstrap/mozbootstrap \
-))
-endif # DESKTOP
-
-endif # DBCONNECTIVITY
-
-ifeq (DESKTOP,$(filter DESKTOP,$(BUILD_TYPE)))
-
-$(eval $(call gb_Rdb_add_components,services,\
-	desktop/source/deployment/gui/deploymentgui \
-	desktop/source/migration/services/migrationoo2 \
-	desktop/source/migration/services/migrationoo3 \
-	desktop/source/offacc/offacc \
-	$(if $(DISABLE_GUI),,desktop/source/splash/spl) \
-	extensions/source/abpilot/abp \
-	$(if $(ENABLE_LDAP),extensions/source/config/ldap/ldapbe2) \
-	$(if $(filter WNT,$(OS)),\
-		extensions/source/config/WinUserInfo/WinUserInfoBe \
-	) \
-	extensions/source/logging/log \
-	extensions/source/scanner/scn \
-	extensions/source/update/feed/updatefeed \
-	$(if $(filter-out WNT,$(OS)),\
-		shell/source/cmdmail/cmdmail \
-	) \
-	$(if $(filter-out WNT,$(OS)),\
-		shell/source/unix/exec/syssh \
-	) \
-	$(if $(filter-out MACOSX WNT,$(OS)), \
-		$(if $(DISABLE_GUI),, \
-			shell/source/backends/desktopbe/desktopbe1 \
-			vcl/vcl.unx \
-		) \
-	) \
-))
-
-else # DESKTOP
-
-$(eval $(call gb_Rdb_add_components,services,\
-	$(if $(filter ANDROID,$(OS)),\
-		extensions/source/logging/log \
-	) \
-))
-
-endif # DESKTOP
-
-ifeq ($(ENABLE_PDFIMPORT),TRUE)
-$(eval $(call gb_Rdb_add_components,services,\
-	sdext/source/pdfimport/pdfimport \
-))
-endif
-
-ifeq ($(ENABLE_REPORTBUILDER),TRUE)
-$(eval $(call gb_Rdb_add_components,services,\
-	reportbuilder/java/reportbuilder \
-))
-endif
-
-endif # $(gb_Side),host
-
-endif # !ENABLE_SERVICES_RDB_FROM_BUILD
-
 # vim: set noet sw=4 ts=4:
diff --git a/pyuno/Library_pythonloader.mk b/pyuno/Library_pythonloader.mk
index adc622ee57b2..4e3776b84897 100644
--- a/pyuno/Library_pythonloader.mk
+++ b/pyuno/Library_pythonloader.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,pythonloader))
 
-$(eval $(call gb_Library_set_componentfile,pythonloader,pyuno/source/loader/pythonloader))
+$(eval $(call gb_Library_set_componentfile,pythonloader,pyuno/source/loader/pythonloader,pyuno))
 
 $(eval $(call gb_Library_set_include,pythonloader,\
     -I$(SRCDIR)/pyuno/source/loader \
diff --git a/pyuno/Rdb_pyuno.mk b/pyuno/Rdb_pyuno.mk
index c14185742044..f4e3fc7a79fe 100644
--- a/pyuno/Rdb_pyuno.mk
+++ b/pyuno/Rdb_pyuno.mk
@@ -9,8 +9,4 @@
 
 $(eval $(call gb_Rdb_Rdb_install,pyuno))
 
-$(eval $(call gb_Rdb_add_components,pyuno, \
-    pyuno/source/loader/pythonloader \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/remotebridges/Library_uuresolver.mk b/remotebridges/Library_uuresolver.mk
index 6c735102a7f8..bb41a3f1b204 100644
--- a/remotebridges/Library_uuresolver.mk
+++ b/remotebridges/Library_uuresolver.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,uuresolver))
 
-$(eval $(call gb_Library_set_componentfile,uuresolver,remotebridges/source/unourl_resolver/uuresolver))
+$(eval $(call gb_Library_set_componentfile,uuresolver,remotebridges/source/unourl_resolver/uuresolver,ure/services))
 
 $(eval $(call gb_Library_use_udk_api,uuresolver))
 
diff --git a/reportbuilder/Jar_reportbuilder.mk b/reportbuilder/Jar_reportbuilder.mk
index 7abcf796a0d0..0a01e0621ec9 100644
--- a/reportbuilder/Jar_reportbuilder.mk
+++ b/reportbuilder/Jar_reportbuilder.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Jar_use_externals,reportbuilder,\
 
 $(eval $(call gb_Jar_set_manifest,reportbuilder,$(SRCDIR)/reportbuilder/java/manifest.mf))
 
-$(eval $(call gb_Jar_set_componentfile,reportbuilder,reportbuilder/java/reportbuilder,OOO))
+$(eval $(call gb_Jar_set_componentfile,reportbuilder,reportbuilder/java/reportbuilder,OOO,services))
 
 $(eval $(call gb_Jar_set_packageroot,reportbuilder,org))
 
diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk
index c3f63a678881..f785485bc4fa 100644
--- a/reportdesign/Library_rpt.mk
+++ b/reportdesign/Library_rpt.mk
@@ -52,7 +52,7 @@ $(eval $(call gb_Library_use_libraries,rpt,\
     vcl \
 ))
 
-$(eval $(call gb_Library_set_componentfile,rpt,reportdesign/util/rpt))
+$(eval $(call gb_Library_set_componentfile,rpt,reportdesign/util/rpt,services))
 
 $(eval $(call gb_Library_add_exception_objects,rpt,\
     reportdesign/source/core/api/FixedLine \
diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk
index ea98fb830b50..c64e57994c07 100644
--- a/reportdesign/Library_rptui.mk
+++ b/reportdesign/Library_rptui.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_Library_use_libraries,rptui,\
     vcl \
 ))
 
-$(eval $(call gb_Library_set_componentfile,rptui,reportdesign/util/rptui))
+$(eval $(call gb_Library_set_componentfile,rptui,reportdesign/util/rptui,services))
 
 $(eval $(call gb_Library_add_exception_objects,rptui,\
     reportdesign/source/ui/dlg/AddField \
diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk
index 5a1707c2af4c..c7ac8309814b 100644
--- a/reportdesign/Library_rptxml.mk
+++ b/reportdesign/Library_rptxml.mk
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_use_libraries,rptxml,\
     xo \
 ))
 
-$(eval $(call gb_Library_set_componentfile,rptxml,reportdesign/util/rptxml))
+$(eval $(call gb_Library_set_componentfile,rptxml,reportdesign/util/rptxml,services))
 
 $(eval $(call gb_Library_add_exception_objects,rptxml,\
     reportdesign/source/filter/xml/dbloader2 \
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index 7f4e9004c25a..3f79ba31b8f2 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,expwrap))
 
-$(eval $(call gb_Library_set_componentfile,expwrap,sax/source/expatwrap/expwrap))
+$(eval $(call gb_Library_set_componentfile,expwrap,sax/source/expatwrap/expwrap,services))
 
 $(eval $(call gb_Library_set_include,expwrap,\
 	-I$(SRCDIR)/sax/inc \
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index f71517536338..f8848f48ba3b 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Library_Library,sc))
 
 $(eval $(call gb_Library_add_sdi_headers,sc,sc/sdi/scslots))
 
-$(eval $(call gb_Library_set_componentfile,sc,sc/util/sc))
+$(eval $(call gb_Library_set_componentfile,sc,sc/util/sc,services))
 
 $(eval $(call gb_Library_set_precompiled_header,sc,sc/inc/pch/precompiled_sc))
 
diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk
index a4862fd266f0..e330ab66bc09 100644
--- a/sc/Library_scd.mk
+++ b/sc/Library_scd.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,scd))
 
-$(eval $(call gb_Library_set_componentfile,scd,sc/util/scd))
+$(eval $(call gb_Library_set_componentfile,scd,sc/util/scd,services))
 
 $(eval $(call gb_Library_set_include,scd,\
 	-I$(SRCDIR)/sc/inc \
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index d7da0cd95f44..79170313b121 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,scfilt))
 
-$(eval $(call gb_Library_set_componentfile,scfilt,sc/util/scfilt))
+$(eval $(call gb_Library_set_componentfile,scfilt,sc/util/scfilt,services))
 
 $(eval $(call gb_Library_set_include,scfilt,\
 	-I$(SRCDIR)/sc/source/core/inc \
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 1f62462d67bd..a2adeecca076 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Library_set_include,vbaobj,\
 
 $(eval $(call gb_Library_set_precompiled_header,vbaobj,sc/inc/pch/precompiled_vbaobj))
 
-$(eval $(call gb_Library_set_componentfile,vbaobj,sc/util/vbaobj))
+$(eval $(call gb_Library_set_componentfile,vbaobj,sc/util/vbaobj,services))
 
 $(eval $(call gb_Library_use_externals,vbaobj,\
 	boost_headers \
diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk
index 0fff21bb416a..b1a97049098b 100644
--- a/scaddins/Library_analysis.mk
+++ b/scaddins/Library_analysis.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,analysis))
 
-$(eval $(call gb_Library_set_componentfile,analysis,scaddins/source/analysis/analysis))
+$(eval $(call gb_Library_set_componentfile,analysis,scaddins/source/analysis/analysis,services))
 
 $(eval $(call gb_Library_set_include,analysis,\
     $$(INCLUDE) \
diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk
index d469a82457df..b39cfeeb8287 100644
--- a/scaddins/Library_date.mk
+++ b/scaddins/Library_date.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,date))
 
-$(eval $(call gb_Library_set_componentfile,date,scaddins/source/datefunc/date))
+$(eval $(call gb_Library_set_componentfile,date,scaddins/source/datefunc/date,services))
 
 $(eval $(call gb_Library_set_include,date,\
     $$(INCLUDE) \
diff --git a/scaddins/Library_pricing.mk b/scaddins/Library_pricing.mk
index 927839a8c7c7..1d1626ba5ede 100644
--- a/scaddins/Library_pricing.mk
+++ b/scaddins/Library_pricing.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,pricing))
 
-$(eval $(call gb_Library_set_componentfile,pricing,scaddins/source/pricing/pricing))
+$(eval $(call gb_Library_set_componentfile,pricing,scaddins/source/pricing/pricing,services))
 
 $(eval $(call gb_Library_set_include,pricing,\
     $$(INCLUDE) \
diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
index e23ecac7a5bb..900dcbd96072 100644
--- a/sccomp/Library_solver.mk
+++ b/sccomp/Library_solver.mk
@@ -19,10 +19,10 @@
 
 $(eval $(call gb_Library_Library,solver))
 
-$(if $(ENABLE_COINMP),$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/coinmpsolver)))
-$(if $(ENABLE_LPSOLVE),$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/lpsolvesolver)))
+$(if $(ENABLE_COINMP),$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/coinmpsolver,services)))
+$(if $(ENABLE_LPSOLVE),$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/lpsolvesolver,services)))
 
-$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/swarmsolver))
+$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/swarmsolver,services))
 
 $(eval $(call gb_Library_use_sdk_api,solver))
 
diff --git a/scripting/Jar_ScriptFramework.mk b/scripting/Jar_ScriptFramework.mk
index bd15b243f9b2..5c3b2077641c 100644
--- a/scripting/Jar_ScriptFramework.mk
+++ b/scripting/Jar_ScriptFramework.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_Jar_use_jars,ScriptFramework,\
 	libreoffice \
 ))
 
-$(eval $(call gb_Jar_set_componentfile,ScriptFramework,scripting/java/ScriptFramework,OOO))
+$(eval $(call gb_Jar_set_componentfile,ScriptFramework,scripting/java/ScriptFramework,OOO,services))
 
 $(eval $(call gb_Jar_set_manifest,ScriptFramework,$(SRCDIR)/scripting/java/Framework/MANIFEST.MF))
 
diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk
index 6f362818d7b3..0d1535d07d81 100644
--- a/scripting/Jar_ScriptProviderForBeanShell.mk
+++ b/scripting/Jar_ScriptProviderForBeanShell.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_Jar_use_externals,ScriptProviderForBeanShell,\
 
 $(eval $(call gb_Jar_set_manifest,ScriptProviderForBeanShell,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/beanshell/MANIFEST.MF))
 
-$(eval $(call gb_Jar_set_componentfile,ScriptProviderForBeanShell,scripting/java/ScriptProviderForBeanShell,OOO))
+$(eval $(call gb_Jar_set_componentfile,ScriptProviderForBeanShell,scripting/java/ScriptProviderForBeanShell,OOO,scriptproviderforbeanshell))
 
 $(eval $(call gb_Jar_set_packageroot,ScriptProviderForBeanShell,com))
 
diff --git a/scripting/Jar_ScriptProviderForJava.mk b/scripting/Jar_ScriptProviderForJava.mk
index 8e7d3e2d17a9..d87310d9c09b 100644
--- a/scripting/Jar_ScriptProviderForJava.mk
+++ b/scripting/Jar_ScriptProviderForJava.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Jar_use_jars,ScriptProviderForJava,\
 	ScriptFramework \
 ))
 
-$(eval $(call gb_Jar_set_componentfile,ScriptProviderForJava,scripting/java/ScriptProviderForJava,OOO))
+$(eval $(call gb_Jar_set_componentfile,ScriptProviderForJava,scripting/java/ScriptProviderForJava,OOO,services))
 
 $(eval $(call gb_Jar_set_manifest,ScriptProviderForJava,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF))
 
diff --git a/scripting/Jar_ScriptProviderForJavaScript.mk b/scripting/Jar_ScriptProviderForJavaScript.mk
index c777cbcab302..0366016bb7a5 100644
--- a/scripting/Jar_ScriptProviderForJavaScript.mk
+++ b/scripting/Jar_ScriptProviderForJavaScript.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_Jar_use_externals,ScriptProviderForJavaScript,\
 
 $(eval $(call gb_Jar_set_manifest,ScriptProviderForJavaScript,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/javascript/MANIFEST.MF))
 
-$(eval $(call gb_Jar_set_componentfile,ScriptProviderForJavaScript,scripting/java/ScriptProviderForJavaScript,OOO))
+$(eval $(call gb_Jar_set_componentfile,ScriptProviderForJavaScript,scripting/java/ScriptProviderForJavaScript,OOO,scriptproviderforjavascript))
 
 $(eval $(call gb_Jar_set_packageroot,ScriptProviderForJavaScript,com))
 
diff --git a/scripting/Library_basprov.mk b/scripting/Library_basprov.mk
index 473dee22371f..41706800165e 100644
--- a/scripting/Library_basprov.mk
+++ b/scripting/Library_basprov.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,basprov))
 
-$(eval $(call gb_Library_set_componentfile,basprov,scripting/source/basprov/basprov))
+$(eval $(call gb_Library_set_componentfile,basprov,scripting/source/basprov/basprov,services))
 
 $(eval $(call gb_Library_set_include,basprov,\
 	$$(INCLUDE) \
diff --git a/scripting/Library_dlgprov.mk b/scripting/Library_dlgprov.mk
index 9ccdfa5ffa36..5f53a9f30381 100644
--- a/scripting/Library_dlgprov.mk
+++ b/scripting/Library_dlgprov.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,dlgprov))
 
-$(eval $(call gb_Library_set_componentfile,dlgprov,scripting/source/dlgprov/dlgprov))
+$(eval $(call gb_Library_set_componentfile,dlgprov,scripting/source/dlgprov/dlgprov,services))
 
 $(eval $(call gb_Library_set_include,dlgprov,\
 	$$(INCLUDE) \
diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk
index 2037bdb362c4..31599c3d865b 100644
--- a/scripting/Library_protocolhandler.mk
+++ b/scripting/Library_protocolhandler.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,protocolhandler))
 
-$(eval $(call gb_Library_set_componentfile,protocolhandler,scripting/source/protocolhandler/protocolhandler))
+$(eval $(call gb_Library_set_componentfile,protocolhandler,scripting/source/protocolhandler/protocolhandler,services))
 
 $(eval $(call gb_Library_set_include,protocolhandler,\
 	$$(INCLUDE) \
diff --git a/scripting/Library_scriptframe.mk b/scripting/Library_scriptframe.mk
index 31057f9c111f..2cf22376e8f8 100644
--- a/scripting/Library_scriptframe.mk
+++ b/scripting/Library_scriptframe.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,scriptframe))
 
-$(eval $(call gb_Library_set_componentfile,scriptframe,scripting/util/scriptframe))
+$(eval $(call gb_Library_set_componentfile,scriptframe,scripting/util/scriptframe,services))
 
 $(eval $(call gb_Library_set_include,scriptframe,\
 	$$(INCLUDE) \
diff --git a/scripting/Library_stringresource.mk b/scripting/Library_stringresource.mk
index 08b8c6131122..fa9055421bc9 100644
--- a/scripting/Library_stringresource.mk
+++ b/scripting/Library_stringresource.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,stringresource))
 
-$(eval $(call gb_Library_set_componentfile,stringresource,scripting/source/stringresource/stringresource))
+$(eval $(call gb_Library_set_componentfile,stringresource,scripting/source/stringresource/stringresource,services))
 
 $(eval $(call gb_Library_set_include,stringresource,\
 	$$(INCLUDE) \
diff --git a/scripting/Library_vbaevents.mk b/scripting/Library_vbaevents.mk
index 712cfb68229b..2990a892a622 100644
--- a/scripting/Library_vbaevents.mk
+++ b/scripting/Library_vbaevents.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,vbaevents))
 
-$(eval $(call gb_Library_set_componentfile,vbaevents,scripting/source/vbaevents/vbaevents))
+$(eval $(call gb_Library_set_componentfile,vbaevents,scripting/source/vbaevents/vbaevents,services))
 
 $(eval $(call gb_Library_set_include,vbaevents,\
 	$$(INCLUDE) \
diff --git a/scripting/Pyuno_mailmerge.mk b/scripting/Pyuno_mailmerge.mk
index 69845477b51f..f5cce752cf69 100644
--- a/scripting/Pyuno_mailmerge.mk
+++ b/scripting/Pyuno_mailmerge.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Pyuno_Pyuno,mailmerge,$(SRCDIR)/scripting/source/pyprov))
 
-$(eval $(call gb_Pyuno_set_componentfile,mailmerge,scripting/source/pyprov/mailmerge))
+$(eval $(call gb_Pyuno_set_componentfile,mailmerge,scripting/source/pyprov/mailmerge,services))
 
 $(eval $(call gb_Pyuno_add_files,mailmerge,,\
 	mailmerge.py \
diff --git a/scripting/Rdb_scriptproviderforbeanshell.mk b/scripting/Rdb_scriptproviderforbeanshell.mk
index 5781610fabee..5b19a1523565 100644
--- a/scripting/Rdb_scriptproviderforbeanshell.mk
+++ b/scripting/Rdb_scriptproviderforbeanshell.mk
@@ -9,8 +9,4 @@
 
 $(eval $(call gb_Rdb_Rdb_install,scriptproviderforbeanshell))
 
-$(eval $(call gb_Rdb_add_components,scriptproviderforbeanshell,\
-	scripting/java/ScriptProviderForBeanShell \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/scripting/Rdb_scriptproviderforjavascript.mk b/scripting/Rdb_scriptproviderforjavascript.mk
index 5d7f56ddd1f0..06db18fa11c6 100644
--- a/scripting/Rdb_scriptproviderforjavascript.mk
+++ b/scripting/Rdb_scriptproviderforjavascript.mk
@@ -9,8 +9,4 @@
 
 $(eval $(call gb_Rdb_Rdb_install,scriptproviderforjavascript))
 
-$(eval $(call gb_Rdb_add_components,scriptproviderforjavascript,\
-	scripting/java/ScriptProviderForJavaScript \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 647f975e1f16..f8e77848e4d3 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -125,7 +125,7 @@ $(eval $(call gb_Library_use_system_win32_libs,sd,\
 ))
 endif
 
-$(eval $(call gb_Library_set_componentfile,sd,sd/util/sd))
+$(eval $(call gb_Library_set_componentfile,sd,sd/util/sd,services))
 
 $(eval $(call gb_Library_add_exception_objects,sd,\
 	sd/source/core/CustomAnimationCloner \
diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk
index ea4902fc2758..997556407d4f 100644
--- a/sd/Library_sdd.mk
+++ b/sd/Library_sdd.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Library_use_libraries,sdd,\
     vcl \
 ))
 
-$(eval $(call gb_Library_set_componentfile,sdd,sd/util/sdd))
+$(eval $(call gb_Library_set_componentfile,sdd,sd/util/sdd,services))
 
 $(eval $(call gb_Library_use_common_precompiled_header,sdd))
 
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
index 8bbcc56cf4ea..2db739d36bba 100644
--- a/sd/Library_sdfilt.mk
+++ b/sd/Library_sdfilt.mk
@@ -53,7 +53,7 @@ $(eval $(call gb_Library_use_libraries,sdfilt,\
     basegfx \
 ))
 
-$(eval $(call gb_Library_set_componentfile,sdfilt,sd/util/sdfilt))
+$(eval $(call gb_Library_set_componentfile,sdfilt,sd/util/sdfilt,services))
 
 $(eval $(call gb_Library_use_common_precompiled_header,sdfilt))
 
diff --git a/sdext/Library_PresentationMinimizer.mk b/sdext/Library_PresentationMinimizer.mk
index 891b46a5514f..5409d53a9c68 100644
--- a/sdext/Library_PresentationMinimizer.mk
+++ b/sdext/Library_PresentationMinimizer.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,PresentationMinimizer))
 
-$(eval $(call gb_Library_set_componentfile,PresentationMinimizer,sdext/source/minimizer/minimizer))
+$(eval $(call gb_Library_set_componentfile,PresentationMinimizer,sdext/source/minimizer/minimizer,services))
 
 $(eval $(call gb_Library_set_precompiled_header,PresentationMinimizer,sdext/inc/pch/precompiled_PresentationMinimizer))
 
diff --git a/sdext/Library_PresenterScreen.mk b/sdext/Library_PresenterScreen.mk
index 6a2d0af4ca1e..61a060c74483 100644
--- a/sdext/Library_PresenterScreen.mk
+++ b/sdext/Library_PresenterScreen.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,PresenterScreen))
 
-$(eval $(call gb_Library_set_componentfile,PresenterScreen,sdext/source/presenter/presenter))
+$(eval $(call gb_Library_set_componentfile,PresenterScreen,sdext/source/presenter/presenter,services))
 
 $(eval $(call gb_Library_set_precompiled_header,PresenterScreen,sdext/inc/pch/precompiled_PresenterScreen))
 
diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk
index 3359ef5e6a46..b68c106268ae 100644
--- a/sdext/Library_pdfimport.mk
+++ b/sdext/Library_pdfimport.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,pdfimport))
 
-$(eval $(call gb_Library_set_componentfile,pdfimport,sdext/source/pdfimport/pdfimport))
+$(eval $(call gb_Library_set_componentfile,pdfimport,sdext/source/pdfimport/pdfimport,services))
 
 $(eval $(call gb_Library_use_sdk_api,pdfimport))
 
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index d5f1c28ed436..8be46c6a19e6 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,sfx))
 
 $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots))
 
-$(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx))
+$(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx,services))
 
 $(eval $(call gb_Library_set_precompiled_header,sfx,sfx2/inc/pch/precompiled_sfx))
 
diff --git a/shell/Library_cmdmail.mk b/shell/Library_cmdmail.mk
index e3af3fb51a67..6e0683738453 100644
--- a/shell/Library_cmdmail.mk
+++ b/shell/Library_cmdmail.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_Library_use_libraries,cmdmail,\
 	tl \
 ))
 
-$(eval $(call gb_Library_set_componentfile,cmdmail,shell/source/cmdmail/cmdmail))
+$(eval $(call gb_Library_set_componentfile,cmdmail,shell/source/cmdmail/cmdmail,services))
 
 $(eval $(call gb_Library_add_exception_objects,cmdmail,\
     shell/source/cmdmail/cmdmailmsg \
diff --git a/shell/Library_desktopbe.mk b/shell/Library_desktopbe.mk
index e70f7c95c03e..c494b5e1cdb3 100644
--- a/shell/Library_desktopbe.mk
+++ b/shell/Library_desktopbe.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_Library_use_libraries,desktopbe1,\
 	vcl \
 ))
 
-$(eval $(call gb_Library_set_componentfile,desktopbe1,shell/source/backends/desktopbe/desktopbe1))
+$(eval $(call gb_Library_set_componentfile,desktopbe1,shell/source/backends/desktopbe/desktopbe1,services))
 
 $(eval $(call gb_Library_add_exception_objects,desktopbe1,\
     shell/source/backends/desktopbe/desktopbackend \
diff --git a/shell/Library_kf5be.mk b/shell/Library_kf5be.mk
index 628145176e0f..61262c567516 100644
--- a/shell/Library_kf5be.mk
+++ b/shell/Library_kf5be.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_Library_use_libraries,kf5be1,\
 	sal \
 ))
 
-$(eval $(call gb_Library_set_componentfile,kf5be1,shell/source/backends/kf5be/kf5be1))
+$(eval $(call gb_Library_set_componentfile,kf5be1,shell/source/backends/kf5be/kf5be1,services))
 
 $(eval $(call gb_Library_add_exception_objects,kf5be1,\
     shell/source/backends/kf5be/kf5access \
diff --git a/shell/Library_localebe.mk b/shell/Library_localebe.mk
index dd598dacdbe9..b185655ce6fc 100644
--- a/shell/Library_localebe.mk
+++ b/shell/Library_localebe.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_Library_use_libraries,localebe1,\
 	i18nlangtag \
 ))
 
-$(eval $(call gb_Library_set_componentfile,localebe1,shell/source/backends/localebe/localebe1))
+$(eval $(call gb_Library_set_componentfile,localebe1,shell/source/backends/localebe/localebe1,services))
 
 $(eval $(call gb_Library_add_exception_objects,localebe1,\
     shell/source/backends/localebe/localebackend \
diff --git a/shell/Library_losessioninstall.mk b/shell/Library_losessioninstall.mk
index c83b8fa9c358..1c95a2dd7cd8 100644
--- a/shell/Library_losessioninstall.mk
+++ b/shell/Library_losessioninstall.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,losessioninstall))
 
-$(eval $(call gb_Library_set_componentfile,losessioninstall,shell/source/sessioninstall/losessioninstall))
+$(eval $(call gb_Library_set_componentfile,losessioninstall,shell/source/sessioninstall/losessioninstall,services))
 
 $(eval $(call gb_Library_use_api,losessioninstall,\
     offapi \
diff --git a/shell/Library_macbe.mk b/shell/Library_macbe.mk
index e8dbdb4fe090..091b6d43a15a 100644
--- a/shell/Library_macbe.mk
+++ b/shell/Library_macbe.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_use_libraries,macbe1,\
 	sal \
 ))
 
-$(eval $(call gb_Library_set_componentfile,macbe1,shell/source/backends/macbe/macbe1))
+$(eval $(call gb_Library_set_componentfile,macbe1,shell/source/backends/macbe/macbe1,services))
 
 $(eval $(call gb_Library_add_objcxxobjects,macbe1,\
     shell/source/backends/macbe/macbackend \
diff --git a/shell/Library_smplmail.mk b/shell/Library_smplmail.mk
index fa96b41d35f3..9a72551b9ace 100644
--- a/shell/Library_smplmail.mk
+++ b/shell/Library_smplmail.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_use_libraries,smplmail,\
 	utl \
 ))
 
-$(eval $(call gb_Library_set_componentfile,smplmail,shell/source/win32/simplemail/smplmail))
+$(eval $(call gb_Library_set_componentfile,smplmail,shell/source/win32/simplemail/smplmail,services))
 
 $(eval $(call gb_Library_add_exception_objects,smplmail,\
     shell/source/win32/simplemail/smplmailclient \
diff --git a/shell/Library_syssh.mk b/shell/Library_syssh.mk
index 43d52ea2ee0c..e83a85262dcf 100644
--- a/shell/Library_syssh.mk
+++ b/shell/Library_syssh.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_Library_use_system_win32_libs,syssh,\
 	shell32 \
 ))
 
-$(eval $(call gb_Library_set_componentfile,syssh,shell/source/win32/syssh))
+$(eval $(call gb_Library_set_componentfile,syssh,shell/source/win32/syssh,services))
 
 $(eval $(call gb_Library_add_exception_objects,syssh,\
 	shell/source/win32/SysShExec \
@@ -37,7 +37,7 @@ $(eval $(call gb_Library_use_static_libraries,syssh,\
 	shell_xmlparser \
 ))
 
-$(eval $(call gb_Library_set_componentfile,syssh,shell/source/unix/exec/syssh))
+$(eval $(call gb_Library_set_componentfile,syssh,shell/source/unix/exec/syssh,services))
 
 $(eval $(call gb_Library_add_exception_objects,syssh,\
 	shell/source/unix/exec/shellexec \
diff --git a/shell/Library_wininetbe.mk b/shell/Library_wininetbe.mk
index c5dd87df7d4c..c2029baee025 100644
--- a/shell/Library_wininetbe.mk
+++ b/shell/Library_wininetbe.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_Library_use_libraries,wininetbe1,\
 	sal \
 ))
 
-$(eval $(call gb_Library_set_componentfile,wininetbe1,shell/source/backends/wininetbe/wininetbe1))
+$(eval $(call gb_Library_set_componentfile,wininetbe1,shell/source/backends/wininetbe/wininetbe1,services))
 
 $(eval $(call gb_Library_add_exception_objects,wininetbe1,\
     shell/source/backends/wininetbe/wininetbackend \
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index 4eca2a1ecaa3..d059dc1813d6 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_Library_use_externals,OGLTrans,\
 	glm_headers \
 ))
 
-$(eval $(call gb_Library_set_componentfile,OGLTrans,slideshow/source/engine/opengl/ogltrans))
+$(eval $(call gb_Library_set_componentfile,OGLTrans,slideshow/source/engine/opengl/ogltrans,services))
 
 $(eval $(call gb_Library_add_exception_objects,OGLTrans,\
     slideshow/source/engine/opengl/TransitionerImpl \
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index de589f210602..74a397cc2b02 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -52,7 +52,7 @@ $(eval $(call gb_Library_use_libraries,slideshow,\
     vcl \
 ))
 
-$(eval $(call gb_Library_set_componentfile,slideshow,slideshow/util/slideshow))
+$(eval $(call gb_Library_set_componentfile,slideshow,slideshow/util/slideshow,services))
 
 $(eval $(call gb_Library_add_exception_objects,slideshow,\
     slideshow/source/engine/activities/activitiesfactory \
diff --git a/smoketest/Jar_smoketest.mk b/smoketest/Jar_smoketest.mk
index 19259910f03c..a62022031978 100644
--- a/smoketest/Jar_smoketest.mk
+++ b/smoketest/Jar_smoketest.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Jar_add_sourcefiles,smoketest, \
     smoketest/org/libreoffice/smoketest/SmoketestCommandEnvironment \
 ))
 
-$(eval $(call gb_Jar_set_componentfile,smoketest,smoketest/org/libreoffice/smoketest/smoketest,OOO))
+$(eval $(call gb_Jar_set_componentfile,smoketest,smoketest/org/libreoffice/smoketest/smoketest,OOO,services))
 
 $(eval $(call gb_Jar_set_manifest,smoketest,$(SRCDIR)/smoketest/org/libreoffice/smoketest/manifest))
 
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index de88ae1f5177..8aef599dc59a 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -60,7 +60,10 @@ $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTSOURCE := $(call gb_Compon
 
 $(call gb_ComponentTarget_get_target,$(1)) : $(call gb_ComponentTarget_get_source,$(patsubst CppunitTest/%,%,$(1)))
 
-$(if $(filter $(1),$(patsubst CppunitTest/%,%,$(1))),$(eval gb_ComponentTarget__ALLCOMPONENTS += $(1)))
+ifneq ($(4),)
+$$(eval $$(call gb_Rdb_add_component,$(4),$(1)))
+endif
+$(if $(4),$(eval gb_ComponentTarget__ALLCOMPONENTS += $(1)))
 
 endef
 
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 9592fbbad6a6..d1a84cebaabe 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -278,7 +278,7 @@ gb_Jar__get_componentprefix = \
 
 # layer must be specified explicitly in this macro (different to libraries)
 define gb_Jar_set_componentfile
-$(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Jar__get_componentprefix,$(3)),$(notdir $(call gb_Jar_get_target,$(1))))
+$(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Jar__get_componentprefix,$(3)),$(notdir $(call gb_Jar_get_target,$(1))),$(4))
 $(call gb_Jar_get_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2))
 $(call gb_Jar_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2))
 
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 36911dee31a0..6dc2b9591104 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -134,11 +134,11 @@ endef
 # gb_Library_get_exports_target for that purpose, since it is already
 # the "final" target of the Library...
 #
-# call gb_Library_set_componentfile,library,componentfile
+# call gb_Library_set_componentfile,library,componentfile,rdb
 define gb_Library_set_componentfile
 $(call gb_ComponentTarget_ComponentTarget,$(2),\
 	$(call gb_Library__get_componentprefix,$(gb_Library__get_name)),\
-	$(call gb_Library_get_runtime_filename,$(gb_Library__get_name)))
+	$(call gb_Library_get_runtime_filename,$(gb_Library__get_name)),$(3))
 $(call gb_Library_get_exports_target,$(gb_Library__get_name)) :| \
 	$(call gb_ComponentTarget_get_target,$(2))
 $(call gb_ComponentTarget_get_target,$(2)) :| \
@@ -148,9 +148,9 @@ $(call gb_Library_get_clean_target,$(gb_Library__get_name)) : \
 
 endef
 
-# call gb_Library_set_componentfiles,library,componentfiles
+# call gb_Library_set_componentfiles,library,componentfiles,rdb
 define gb_Library_set_componentfiles
-$(foreach comp,$(2),$(call gb_Library_set_componentfile,$(1),$(comp)))
+$(foreach comp,$(2),$(call gb_Library_set_componentfile,$(1),$(comp),$(3)))
 
 endef
 
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index 334a21cbc70a..3e5cb820fcd5 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -63,7 +63,7 @@ endef
 gb_Pyuno__COMPONENTPREFIX := vnd.openoffice.pymodule:
 
 define gb_Pyuno_set_componentfile_full
-$(call gb_ComponentTarget_ComponentTarget,$(2),$(3),$(4))
+$(call gb_ComponentTarget_ComponentTarget,$(2),$(3),$(4),$(5))
 $(call gb_Pyuno_get_final_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2))
 $(call gb_ComponentTarget_get_target,$(2)) : $(call gb_Pyuno_get_target,$(1))
 $(call gb_Pyuno_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2))
@@ -72,7 +72,7 @@ endef
 
 # Set .component file for the component.
 define gb_Pyuno_set_componentfile
-$(call gb_Pyuno_set_componentfile_full,$(1),$(2),$(gb_Pyuno__COMPONENTPREFIX),$(1))
+$(call gb_Pyuno_set_componentfile_full,$(1),$(2),$(gb_Pyuno__COMPONENTPREFIX),$(1),$(3))
 
 endef
 
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index d59ab043180a..45058888d02a 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -7,8 +7,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-gb_Rdb__URECOMPONENTS :=
-
 gb_Rdb__get_install_target = $(INSTROOT)/$(LIBO_ETC_FOLDER)/services/$(1).rdb
 
 define gb_Rdb__command
@@ -37,7 +35,12 @@ $(call gb_Rdb_get_clean_target,%) :
 		rm -f $(call gb_Rdb__get_install_target,$*) $(call gb_Rdb_get_target,$*))
 
 define gb_Rdb__Rdb_impl
-$(call gb_Rdb_get_target,$(1)) : COMPONENTS :=
+# gb_Rdb_add_component, which adds to the target-specific COMPONENTS variable, can be called (from
+# gb_ComponentTarget_ComponentTarget) before gb_Rdb__Rdb_impl is called, so using `COMPONENTS :=`
+# here could lose content; but still use `COMPONENTS ?=` here to establish COMPONENTS as target-
+# specific even in the corner case of an empty Rdb with no gb_Rdb_add_component calls, so that the
+# use of $(COMPONENTS) in gb_Rdb__command would not accidentally pick a global COMPONENTS variable:
+$(call gb_Rdb_get_target,$(1)) : COMPONENTS ?=
 $(call gb_Rdb_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
 $$(eval $$(call gb_Module_register_target,$(2),$(call gb_Rdb_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),Rdb,$(2))
@@ -61,7 +64,6 @@ endef
 define gb_Rdb_add_component
 $(call gb_Rdb_get_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2))
 $(call gb_Rdb_get_target,$(1)) : COMPONENTS += $(2)
-$(if $(filter ure/services,$(1)),$(eval gb_Rdb__URECOMPONENTS += $(2)))
 
 endef
 
diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk
index 88f010d7a50e..61caabac5a04 100644
--- a/sot/Library_sot.mk
+++ b/sot/Library_sot.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,sot))
 
-$(eval $(call gb_Library_set_componentfile,sot,sot/util/sot))
+$(eval $(call gb_Library_set_componentfile,sot,sot/util/sot,services))
 
 $(eval $(call gb_Library_use_external,sot,boost_headers))
 
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 613a8cbdb7cd..2a7aeffcfb40 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Library_Library,sm))
 
 $(eval $(call gb_Library_add_sdi_headers,sm,starmath/sdi/smslots))
 
-$(eval $(call gb_Library_set_componentfile,sm,starmath/util/sm))
+$(eval $(call gb_Library_set_componentfile,sm,starmath/util/sm,services))
 
 $(eval $(call gb_Library_set_precompiled_header,sm,starmath/inc/pch/precompiled_sm))
 
diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk
index 565f7e9c04a4..3bea24b08ec3 100644
--- a/starmath/Library_smd.mk
+++ b/starmath/Library_smd.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,smd))
 
-$(eval $(call gb_Library_set_componentfile,smd,starmath/util/smd))
+$(eval $(call gb_Library_set_componentfile,smd,starmath/util/smd,services))
 
 $(eval $(call gb_Library_set_include,smd,\
         -I$(SRCDIR)/starmath/inc \
diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk
index 49fbafc12a09..f7a308590184 100644
--- a/stoc/Library_bootstrap.mk
+++ b/stoc/Library_bootstrap.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_use_libraries,bootstrap,\
     tl \
 ))
 
-$(eval $(call gb_Library_set_componentfile,bootstrap,stoc/util/bootstrap))
+$(eval $(call gb_Library_set_componentfile,bootstrap,stoc/util/bootstrap,ure/services))
 
 $(eval $(call gb_Library_add_exception_objects,bootstrap,\
     stoc/source/defaultregistry/defaultregistry \
diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk
index b12465d75be7..58ce9e404de5 100644
--- a/stoc/Library_introspection.mk
+++ b/stoc/Library_introspection.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_Library_use_libraries,introspection,\
     salhelper \
 ))
 
-$(eval $(call gb_Library_set_componentfile,introspection,stoc/source/inspect/introspection))
+$(eval $(call gb_Library_set_componentfile,introspection,stoc/source/inspect/introspection,ure/services))
 
 $(eval $(call gb_Library_add_exception_objects,introspection,\
     stoc/source/inspect/introspection \
diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk
index 93f748893c09..8166cfadcb7d 100644
--- a/stoc/Library_invocadapt.mk
+++ b/stoc/Library_invocadapt.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Library_use_libraries,invocadapt,\
     sal \
 ))
 
-$(eval $(call gb_Library_set_componentfile,invocadapt,stoc/source/invocation_adapterfactory/invocadapt))
+$(eval $(call gb_Library_set_componentfile,invocadapt,stoc/source/invocation_adapterfactory/invocadapt,ure/services))
 
 $(eval $(call gb_Library_add_exception_objects,invocadapt,\
     stoc/source/invocation_adapterfactory/iafactory \
diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk
index 42f17556433c..d62de01f4133 100644
--- a/stoc/Library_invocation.mk
+++ b/stoc/Library_invocation.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Library_use_libraries,invocation,\
     sal \
 ))
 
-$(eval $(call gb_Library_set_componentfile,invocation,stoc/source/invocation/invocation))
+$(eval $(call gb_Library_set_componentfile,invocation,stoc/source/invocation/invocation,ure/services))
 
 $(eval $(call gb_Library_add_exception_objects,invocation,\
     stoc/source/invocation/invocation \
diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk
index caf4a1e27df6..5b13b39c29eb 100644
--- a/stoc/Library_javaloader.mk
+++ b/stoc/Library_javaloader.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_Library_use_libraries,javaloader,\
     tl \
 ))
 
-$(eval $(call gb_Library_set_componentfile,javaloader,stoc/source/javaloader/javaloader))
+$(eval $(call gb_Library_set_componentfile,javaloader,stoc/source/javaloader/javaloader,ure/services))
 
 $(eval $(call gb_Library_add_exception_objects,javaloader,\
     stoc/source/javaloader/javaloader \
diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk
index ce5f773ef394..b281e8aa247c 100644
--- a/stoc/Library_javavm.mk
+++ b/stoc/Library_javavm.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_use_libraries,javavm,\
     tl \
 ))
 
-$(eval $(call gb_Library_set_componentfile,javavm,stoc/source/javavm/javavm))
+$(eval $(call gb_Library_set_componentfile,javavm,stoc/source/javavm/javavm,ure/services))
 
 $(eval $(call gb_Library_add_exception_objects,javavm,\
     stoc/source/javavm/interact \
diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk
index ace77b7e92cd..6822635f0024 100644
--- a/stoc/Library_namingservice.mk
+++ b/stoc/Library_namingservice.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Library_use_libraries,namingservice,\
     sal \
 ))
 
-$(eval $(call gb_Library_set_componentfile,namingservice,stoc/source/namingservice/namingservice))
+$(eval $(call gb_Library_set_componentfile,namingservice,stoc/source/namingservice/namingservice,ure/services))
 
 $(eval $(call gb_Library_add_exception_objects,namingservice,\
     stoc/source/namingservice/namingservice \
diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk
index cf95b717281e..9cd7be33a3db 100644
--- a/stoc/Library_proxyfac.mk
+++ b/stoc/Library_proxyfac.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_Library_use_libraries,proxyfac,\
     sal \
 ))
 
-$(eval $(call gb_Library_set_componentfile,proxyfac,stoc/source/proxy_factory/proxyfac))
+$(eval $(call gb_Library_set_componentfile,proxyfac,stoc/source/proxy_factory/proxyfac,ure/services))
 
 $(eval $(call gb_Library_add_exception_objects,proxyfac,\
     stoc/source/proxy_factory/proxyfac \
diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk
index 442c5ec6e581..eac448030f14 100644
--- a/stoc/Library_reflection.mk
+++ b/stoc/Library_reflection.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Library_use_libraries,reflection,\
     sal \
 ))
 
-$(eval $(call gb_Library_set_componentfile,reflection,stoc/source/corereflection/reflection))
+$(eval $(call gb_Library_set_componentfile,reflection,stoc/source/corereflection/reflection,ure/services))
 
 $(eval $(call gb_Library_add_exception_objects,reflection,\
     stoc/source/corereflection/crarray \
diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk
index 970ce9c8ad11..4d276129d805 100644
--- a/stoc/Library_stocservices.mk
+++ b/stoc/Library_stocservices.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Library_use_libraries,stocservices,\
 
 $(eval $(call gb_Library_use_external,stocservices,boost_headers))
 
-$(eval $(call gb_Library_set_componentfile,stocservices,stoc/util/stocservices))
+$(eval $(call gb_Library_set_componentfile,stocservices,stoc/util/stocservices,ure/services))
 
 $(eval $(call gb_Library_add_exception_objects,stocservices,\
     stoc/source/typeconv/convert \
diff --git a/svgio/Library_svgio.mk b/svgio/Library_svgio.mk
index 09b3695bb162..99b2eb48c1d7 100644
--- a/svgio/Library_svgio.mk
+++ b/svgio/Library_svgio.mk
@@ -18,7 +18,7 @@
 
 $(eval $(call gb_Library_Library,svgio))
 
-$(eval $(call gb_Library_set_componentfile,svgio,svgio/svgio))
+$(eval $(call gb_Library_set_componentfile,svgio,svgio/svgio,services))
 
 $(eval $(call gb_Library_set_include,svgio,\
     $$(INCLUDE) \
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index 4d2c3fbc4d93..eee275df541e 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,fsstorage))
 
-$(eval $(call gb_Library_set_componentfile,fsstorage,svl/source/fsstor/fsstorage))
+$(eval $(call gb_Library_set_componentfile,fsstorage,svl/source/fsstor/fsstorage,services))
 
 $(eval $(call gb_Library_set_include,fsstorage,\
     -I$(SRCDIR)/svl/source/inc \
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index dfe35c5d8d34..b0040a8c7281 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,passwordcontainer))
 
-$(eval $(call gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer))
+$(eval $(call gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer,services))
 
 $(eval $(call gb_Library_use_external,passwordcontainer,boost_headers))
 
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 4e388ca0d471..8dd746b2462c 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Library_use_externals,svl,\
     libxml2 \
 ))
 
-$(eval $(call gb_Library_set_componentfile,svl,svl/util/svl))
+$(eval $(call gb_Library_set_componentfile,svl,svl/util/svl,services))
 
 $(eval $(call gb_Library_set_include,svl,\
     -I$(SRCDIR)/svl/source/inc \
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index bbcce42ac65b..59bd29ac240e 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,svt))
 
 $(eval $(call gb_Library_set_precompiled_header,svt,svtools/inc/pch/precompiled_svt))
 
-$(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt))
+$(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt,services))
 
 $(eval $(call gb_Library_use_custom_headers,svt,\
 	officecfg/registry \
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 206b3c39b738..c11aac85071c 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_Library_Library,svx))
 $(eval $(call gb_Library_set_componentfiles,svx, \
     $(call gb_Helper_optional,BREAKPAD,svx/util/crashreport) \
     svx/util/svx \
-))
+,services))
 
 $(eval $(call gb_Library_set_include,svx,\
     -I$(SRCDIR)/svx/inc \
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 0490b04c25be..efbb3de41154 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,svxcore))
 
-$(eval $(call gb_Library_set_componentfile,svxcore,svx/util/svxcore))
+$(eval $(call gb_Library_set_componentfile,svxcore,svx/util/svxcore,services))
 
 $(eval $(call gb_Library_add_sdi_headers,svxcore,svx/sdi/svxslots))
 
diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk
index 3c623988081a..dcf88536904b 100644
--- a/svx/Library_textconversiondlgs.mk
+++ b/svx/Library_textconversiondlgs.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,textconversiondlgs))
 
-$(eval $(call gb_Library_set_componentfile,textconversiondlgs,svx/util/textconversiondlgs))
+$(eval $(call gb_Library_set_componentfile,textconversiondlgs,svx/util/textconversiondlgs,services))
 
 $(eval $(call gb_Library_set_include,textconversiondlgs,\
     -I$(SRCDIR)/svx/inc \
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index 74a7cf0b539a..bf1ed7d09322 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,msword))
 
-$(eval $(call gb_Library_set_componentfile,msword,sw/util/msword))
+$(eval $(call gb_Library_set_componentfile,msword,sw/util/msword,services))
 
 $(eval $(call gb_Library_use_custom_headers,msword,\
 	officecfg/registry \
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 582a41ae99e2..7ff8190b8858 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_add_sdi_headers,sw,sw/sdi/swslots))
 $(eval $(call gb_Library_set_componentfiles,sw, \
     $(call gb_Helper_optional,DBCONNECTIVITY,sw/util/sw_mm) \
     sw/util/sw \
-))
+,services))
 
 $(eval $(call gb_Library_set_precompiled_header,sw,sw/inc/pch/precompiled_sw))
 
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
index 81c93b35ed38..3f5f202788f6 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,swd))
 
-$(eval $(call gb_Library_set_componentfile,swd,sw/util/swd))
+$(eval $(call gb_Library_set_componentfile,swd,sw/util/swd,services))
 
 $(eval $(call gb_Library_set_include,swd,\
     $$(INCLUDE) \
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index 8867fcf5ede4..434e1af4a506 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,vbaswobj))
 
-$(eval $(call gb_Library_set_componentfile,vbaswobj,sw/util/vbaswobj))
+$(eval $(call gb_Library_set_componentfile,vbaswobj,sw/util/vbaswobj,services))
 
 $(eval $(call gb_Library_set_precompiled_header,vbaswobj,sw/inc/pch/precompiled_vbaswobj))
 
diff --git a/testtools/Jar_testComponent.mk b/testtools/Jar_testComponent.mk
index f3969a42277d..c5d789d1cb7e 100644
--- a/testtools/Jar_testComponent.mk
+++ b/testtools/Jar_testComponent.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_Jar_set_packageroot,testComponent,com))
 
 $(eval $(call gb_Jar_set_manifest,testComponent,$(SRCDIR)/testtools/com/sun/star/comp/bridge/manifest))
 
-$(eval $(call gb_Jar_set_componentfile,testComponent,testtools/source/bridgetest/testComponent,NONE))
+$(eval $(call gb_Jar_set_componentfile,testComponent,testtools/source/bridgetest/testComponent,NONE,uno_services))
 
 $(eval $(call gb_Jar_add_packagedirs,testComponent,\
     $(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker)/test \
diff --git a/testtools/Library_bridgetest.mk b/testtools/Library_bridgetest.mk
index 52f335761fdf..a9fb4558faa5 100644
--- a/testtools/Library_bridgetest.mk
+++ b/testtools/Library_bridgetest.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,testtools_bridgetest))
 
-$(eval $(call gb_Library_set_componentfile,testtools_bridgetest,testtools/source/bridgetest/bridgetest))
+$(eval $(call gb_Library_set_componentfile,testtools_bridgetest,testtools/source/bridgetest/bridgetest,uno_services))
 
 $(eval $(call gb_Library_use_internal_api,testtools_bridgetest,\
     bridgetest \
diff --git a/testtools/Library_constructors.mk b/testtools/Library_constructors.mk
index 516c05d62db8..3d5cdf5779c4 100644
--- a/testtools/Library_constructors.mk
+++ b/testtools/Library_constructors.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,testtools_constructors))
 
-$(eval $(call gb_Library_set_componentfile,testtools_constructors,testtools/source/bridgetest/constructors))
+$(eval $(call gb_Library_set_componentfile,testtools_constructors,testtools/source/bridgetest/constructors,uno_services))
 
 $(eval $(call gb_Executable_set_include,testtools_constructors,\
     -I$(SRCDIR)/testtools/source/bridgetest \
diff --git a/testtools/Library_cppobj.mk b/testtools/Library_cppobj.mk
index 086b1fa0b6f5..3019b330da90 100644
--- a/testtools/Library_cppobj.mk
+++ b/testtools/Library_cppobj.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,testtools_cppobj))
 
-$(eval $(call gb_Library_set_componentfile,testtools_cppobj,testtools/source/bridgetest/cppobj))
+$(eval $(call gb_Library_set_componentfile,testtools_cppobj,testtools/source/bridgetest/cppobj,uno_services))
 
 $(eval $(call gb_Executable_set_include,testtools_cppobj,\
     -I$(SRCDIR)/testtools/source/bridgetest \
diff --git a/testtools/Rdb_uno_services.mk b/testtools/Rdb_uno_services.mk
index b2ff7d9c73a7..ad83542a4803 100644
--- a/testtools/Rdb_uno_services.mk
+++ b/testtools/Rdb_uno_services.mk
@@ -9,16 +9,4 @@
 
 $(eval $(call gb_Rdb_Rdb,uno_services))
 
-$(eval $(call gb_Rdb_add_components,uno_services,\
-    testtools/source/bridgetest/cppobj \
-    testtools/source/bridgetest/constructors \
-    testtools/source/bridgetest/bridgetest \
-))
-
-ifneq ($(ENABLE_JAVA),)
-$(eval $(call gb_Rdb_add_components,uno_services,\
-    testtools/source/bridgetest/testComponent \
-))
-endif
-
 # vim:set noet sw=4 ts=4:
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index b6186e66c962..60321c5f3b90 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,tk))
 
-$(eval $(call gb_Library_set_componentfile,tk,toolkit/util/tk))
+$(eval $(call gb_Library_set_componentfile,tk,toolkit/util/tk,services))
 
 $(eval $(call gb_Library_use_externals,tk,\
     boost_headers \
diff --git a/ucb/Library_cached1.mk b/ucb/Library_cached1.mk
index d2b84a95f23e..279c3dd81c92 100644
--- a/ucb/Library_cached1.mk
+++ b/ucb/Library_cached1.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,cached1))
 
-$(eval $(call gb_Library_set_componentfile,cached1,ucb/source/cacher/cached1))
+$(eval $(call gb_Library_set_componentfile,cached1,ucb/source/cacher/cached1,services))
 
 $(eval $(call gb_Library_use_external,cached1,boost_headers))
 
diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk
index c04647907bf0..603b7e43b0e1 100644
--- a/ucb/Library_srtrs1.mk
+++ b/ucb/Library_srtrs1.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,srtrs1))
 
-$(eval $(call gb_Library_set_componentfile,srtrs1,ucb/source/sorter/srtrs1))
+$(eval $(call gb_Library_set_componentfile,srtrs1,ucb/source/sorter/srtrs1,services))
 
 $(eval $(call gb_Library_use_external,srtrs1,boost_headers))
 
diff --git a/ucb/Library_ucb1.mk b/ucb/Library_ucb1.mk
index 6dbb347c1043..b278622bc824 100644
--- a/ucb/Library_ucb1.mk
+++ b/ucb/Library_ucb1.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,ucb1))
 
-$(eval $(call gb_Library_set_componentfile,ucb1,ucb/source/core/ucb1))
+$(eval $(call gb_Library_set_componentfile,ucb1,ucb/source/core/ucb1,services))
 
 $(eval $(call gb_Library_set_include,ucb1,\
 	-I$(SRCDIR)/ucb/source/inc \
diff --git a/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk
index 60761adbc08e..f18f9e04aad5 100644
--- a/ucb/Library_ucpcmis1.mk
+++ b/ucb/Library_ucpcmis1.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,ucpcmis1))
 
-$(eval $(call gb_Library_set_componentfile,ucpcmis1,ucb/source/ucp/cmis/ucpcmis1))
+$(eval $(call gb_Library_set_componentfile,ucpcmis1,ucb/source/ucp/cmis/ucpcmis1,services))
 
 $(eval $(call gb_Library_use_sdk_api,ucpcmis1))
 
diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk
index b8cbb2be48e1..b8f85d24767c 100644
--- a/ucb/Library_ucpdav1.mk
+++ b/ucb/Library_ucpdav1.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_use_libraries,ucpdav1,\
 
 ifeq ($(WITH_WEBDAV),curl)
 
-$(eval $(call gb_Library_set_componentfile,ucpdav1,ucb/source/ucp/webdav-curl/ucpdav1))
+$(eval $(call gb_Library_set_componentfile,ucpdav1,ucb/source/ucp/webdav-curl/ucpdav1,services))
 
 $(eval $(call gb_Library_use_externals,ucpdav1,\
 	curl \
@@ -62,7 +62,7 @@ $(eval $(call gb_Library_add_exception_objects,ucpdav1,\
 else
 ifeq ($(WITH_WEBDAV),neon)
 
-$(eval $(call gb_Library_set_componentfile,ucpdav1,ucb/source/ucp/webdav-neon/ucpdav1))
+$(eval $(call gb_Library_set_componentfile,ucpdav1,ucb/source/ucp/webdav-neon/ucpdav1,services))
 
 $(eval $(call gb_Library_use_externals,ucpdav1,\
 	boost_headers \
@@ -102,7 +102,7 @@ $(eval $(call gb_Library_add_exception_objects,ucpdav1,\
 
 else # WITH_WEBDAV == serf
 
-$(eval $(call gb_Library_set_componentfile,ucpdav1,ucb/source/ucp/webdav/ucpdav1))
+$(eval $(call gb_Library_set_componentfile,ucpdav1,ucb/source/ucp/webdav/ucpdav1,services))
 
 $(eval $(call gb_Library_use_externals,ucpdav1,\
 	boost_headers \
diff --git a/ucb/Library_ucpexpand1.mk b/ucb/Library_ucpexpand1.mk
index a0af1d0ffd4e..f66277874963 100644
--- a/ucb/Library_ucpexpand1.mk
+++ b/ucb/Library_ucpexpand1.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,ucpexpand1))
 
-$(eval $(call gb_Library_set_componentfile,ucpexpand1,ucb/source/ucp/expand/ucpexpand1))
+$(eval $(call gb_Library_set_componentfile,ucpexpand1,ucb/source/ucp/expand/ucpexpand1,services))
 
 $(eval $(call gb_Library_use_sdk_api,ucpexpand1))
 
diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk
index 55722b058693..563815acc83e 100644
--- a/ucb/Library_ucpext.mk
+++ b/ucb/Library_ucpext.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,ucpext))
 
-$(eval $(call gb_Library_set_componentfile,ucpext,ucb/source/ucp/ext/ucpext))
+$(eval $(call gb_Library_set_componentfile,ucpext,ucb/source/ucp/ext/ucpext,services))
 
 $(eval $(call gb_Library_use_external,ucpext,boost_headers))
 
diff --git a/ucb/Library_ucpfile1.mk b/ucb/Library_ucpfile1.mk
index f676eacbde3f..2f9684955ec5 100644
--- a/ucb/Library_ucpfile1.mk
+++ b/ucb/Library_ucpfile1.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,ucpfile1))
 
-$(eval $(call gb_Library_set_componentfile,ucpfile1,ucb/source/ucp/file/ucpfile1))
+$(eval $(call gb_Library_set_componentfile,ucpfile1,ucb/source/ucp/file/ucpfile1,services))
 
 $(eval $(call gb_Library_use_external,ucpfile1,boost_headers))
 
diff --git a/ucb/Library_ucpftp1.mk b/ucb/Library_ucpftp1.mk
index 94e2f3bc18f9..87c48e7021ec 100644
--- a/ucb/Library_ucpftp1.mk
+++ b/ucb/Library_ucpftp1.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,ucpftp1))
 
-$(eval $(call gb_Library_set_componentfile,ucpftp1,ucb/source/ucp/ftp/ucpftp1))
+$(eval $(call gb_Library_set_componentfile,ucpftp1,ucb/source/ucp/ftp/ucpftp1,services))
 
 $(eval $(call gb_Library_use_external,ucpftp1,boost_headers))
 
diff --git a/ucb/Library_ucpgio1.mk b/ucb/Library_ucpgio1.mk
index b67c9bb3c89e..c56fce2ead2b 100644
--- a/ucb/Library_ucpgio1.mk
+++ b/ucb/Library_ucpgio1.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,ucpgio1))
 
-$(eval $(call gb_Library_set_componentfile,ucpgio1,ucb/source/ucp/gio/ucpgio))
+$(eval $(call gb_Library_set_componentfile,ucpgio1,ucb/source/ucp/gio/ucpgio,services))
 
 $(eval $(call gb_Library_use_external,ucpgio1,boost_headers))
 
diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk
index 3a0a0fa32e99..89f8d2be5935 100644
--- a/ucb/Library_ucphier1.mk
+++ b/ucb/Library_ucphier1.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,ucphier1))
 
-$(eval $(call gb_Library_set_componentfile,ucphier1,ucb/source/ucp/hierarchy/ucphier1))
+$(eval $(call gb_Library_set_componentfile,ucphier1,ucb/source/ucp/hierarchy/ucphier1,services))
 
 $(eval $(call gb_Library_use_external,ucphier1,boost_headers))
 
diff --git a/ucb/Library_ucpimage.mk b/ucb/Library_ucpimage.mk
index 5a1273e6fb04..67dafcbe229c 100644
--- a/ucb/Library_ucpimage.mk
+++ b/ucb/Library_ucpimage.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_Library_add_exception_objects,ucpimage, \
     ucb/source/ucp/image/ucpimage \
 ))
 
-$(eval $(call gb_Library_set_componentfile,ucpimage,ucb/source/ucp/image/ucpimage))
+$(eval $(call gb_Library_set_componentfile,ucpimage,ucb/source/ucp/image/ucpimage,services))
 
 $(eval $(call gb_Library_use_externals,ucpimage, \
     boost_headers \
diff --git a/ucb/Library_ucppkg1.mk b/ucb/Library_ucppkg1.mk
index 3910ac1f449f..20ff90ef383a 100644
--- a/ucb/Library_ucppkg1.mk
+++ b/ucb/Library_ucppkg1.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,ucppkg1))
 
-$(eval $(call gb_Library_set_componentfile,ucppkg1,ucb/source/ucp/package/ucppkg1))
+$(eval $(call gb_Library_set_componentfile,ucppkg1,ucb/source/ucp/package/ucppkg1,services))
 
 $(eval $(call gb_Library_use_external,ucppkg1,boost_headers))
 
diff --git a/ucb/Library_ucptdoc1.mk b/ucb/Library_ucptdoc1.mk
index b04e43beabac..7c2a81e38fbf 100644
--- a/ucb/Library_ucptdoc1.mk
+++ b/ucb/Library_ucptdoc1.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Library_Library,ucptdoc1))
 
-$(eval $(call gb_Library_set_componentfile,ucptdoc1,ucb/source/ucp/tdoc/ucptdoc1))
+$(eval $(call gb_Library_set_componentfile,ucptdoc1,ucb/source/ucp/tdoc/ucptdoc1,services))
 
 $(eval $(call gb_Library_use_sdk_api,ucptdoc1))
 
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index 07603acb5213..15c7b5a0960f 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_Library_use_custom_headers,utl,\
 ))
 
 # in case UNO services are exported: declare location of component file
-$(eval $(call gb_Library_set_componentfile,utl,unotools/util/utl))
+$(eval $(call gb_Library_set_componentfile,utl,unotools/util/utl,services))
 
 $(eval $(call gb_Library_set_include,utl, \
     $$(INCLUDE) \
diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk
index 8998c6aac73b..02aa74fb80b1 100644
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,unordf))
 
-$(eval $(call gb_Library_set_componentfile,unordf,unoxml/source/rdf/unordf))
+$(eval $(call gb_Library_set_componentfile,unordf,unoxml/source/rdf/unordf,services))
 
 $(eval $(call gb_Library_use_sdk_api,unordf))
 
diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk
index 34d9fe555e63..a0a9d805ab29 100644
--- a/unoxml/Library_unoxml.mk
+++ b/unoxml/Library_unoxml.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,unoxml))
 
-$(eval $(call gb_Library_set_componentfile,unoxml,unoxml/source/service/unoxml))
+$(eval $(call gb_Library_set_componentfile,unoxml,unoxml/source/service/unoxml,services))
 
 $(eval $(call gb_Library_set_precompiled_header,unoxml,unoxml/inc/pch/precompiled_unoxml))
 
diff --git a/ure/Rdb_ure.mk b/ure/Rdb_ure.mk
index 7a64cfb225fc..475db4ec3cff 100644
--- a/ure/Rdb_ure.mk
+++ b/ure/Rdb_ure.mk
@@ -9,25 +9,4 @@
 
 $(eval $(call gb_Rdb_Rdb_install,ure/services,$(LIBO_URE_MISC_FOLDER)/services.rdb))
 
-$(eval $(call gb_Rdb_add_components,ure/services,\
-    binaryurp/source/binaryurp \
-    io/source/io \
-    stoc/util/bootstrap \
-    stoc/source/inspect/introspection \
-    stoc/source/invocation_adapterfactory/invocadapt \
-    stoc/source/invocation/invocation \
-    stoc/source/namingservice/namingservice \
-    stoc/source/proxy_factory/proxyfac \
-    stoc/source/corereflection/reflection \
-    stoc/util/stocservices \
-    remotebridges/source/unourl_resolver/uuresolver \
-))
-
-ifneq ($(ENABLE_JAVA),)
-$(eval $(call gb_Rdb_add_components,ure/services,\
-    stoc/source/javaloader/javaloader \
-    stoc/source/javavm/javavm \
-))
-endif
-
 # vim:set noet sw=4 ts=4:
diff --git a/uui/Library_uui.mk b/uui/Library_uui.mk
index 105c32d889e4..a04f3de5b051 100644
--- a/uui/Library_uui.mk
+++ b/uui/Library_uui.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Library_set_include,uui,\
     -I$(SRCDIR)/uui/inc \
 ))
 
-$(eval $(call gb_Library_set_componentfile,uui,uui/util/uui))
+$(eval $(call gb_Library_set_componentfile,uui,uui/util/uui,services))
 
 $(eval $(call gb_Library_use_external,uui,boost_headers))
 
diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk
index 2a5cb1ed942d..b78aead072ab 100644
--- a/vbahelper/Library_msforms.mk
+++ b/vbahelper/Library_msforms.mk
@@ -24,7 +24,7 @@
 $(eval $(call gb_Library_Library,msforms))
 
 # in case UNO services are exported: declare location of component file
-$(eval $(call gb_Library_set_componentfile,msforms,vbahelper/util/msforms))
+$(eval $(call gb_Library_set_componentfile,msforms,vbahelper/util/msforms,services))
 
 $(eval $(call gb_Library_use_external,msforms,boost_headers))
 
diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk
index fe76b63f4690..ab93f91f3295 100644
--- a/vbahelper/Library_vbahelper.mk
+++ b/vbahelper/Library_vbahelper.mk
@@ -20,7 +20,7 @@
 $(eval $(call gb_Library_Library,vbahelper))
 
 # in case UNO services are exported: declare location of component file
-#$(eval $(call gb_Library_set_componentfile,vbahelper,vbahelper/COMPONENT_FILE))
+#$(eval $(call gb_Library_set_componentfile,vbahelper,vbahelper/COMPONENT_FILE,services))
 
 $(eval $(call gb_Library_add_defs,vbahelper,\
     -DVBAHELPER_DLLIMPLEMENTATION \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 5f56c38f252b..790be1b1e734 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -19,20 +19,20 @@
 
 $(eval $(call gb_Library_Library,vcl))
 
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.common))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.common,services))
 
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx,services))
 else ifeq ($(OS),WNT)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows,services))
 else ifeq ($(OS),ANDROID)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.android))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.android,services))
 else ifeq ($(OS),iOS)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.ios))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.ios,services))
 else ifeq ($(DISABLE_GUI),TRUE)
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.headless))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.headless,services))
 else
-$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx))
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx,services))
 endif
 
 $(eval $(call gb_Library_set_precompiled_header,vcl,vcl/inc/pch/precompiled_vcl))
diff --git a/vcl/Library_vclplug_win.mk b/vcl/Library_vclplug_win.mk
index 2fd00d7bd03b..57f736bae928 100644
--- a/vcl/Library_vclplug_win.mk
+++ b/vcl/Library_vclplug_win.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,vclplug_win))
 
 $(eval $(call gb_Library_set_plugin_for,vclplug_win,vcl))
 
-$(eval $(call gb_Library_set_componentfile,vclplug_win,vcl/vclplug_win))
+$(eval $(call gb_Library_set_componentfile,vclplug_win,vcl/vclplug_win,services))
 
 $(eval $(call gb_Library_set_include,vclplug_win,\
     $$(INCLUDE) \
diff --git a/winaccessibility/Library_winaccessibility.mk b/winaccessibility/Library_winaccessibility.mk
index 611dad981acf..4b182a996419 100644
--- a/winaccessibility/Library_winaccessibility.mk
+++ b/winaccessibility/Library_winaccessibility.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_Library_set_include,winaccessibility,\
 
 $(eval $(call gb_Library_use_sdk_api,winaccessibility))
 
-$(eval $(call gb_Library_set_componentfile,winaccessibility,winaccessibility/source/service/winaccessibility))
+$(eval $(call gb_Library_set_componentfile,winaccessibility,winaccessibility/source/service/winaccessibility,services))
 
 $(eval $(call gb_Library_use_common_precompiled_header,winaccessibility))
 
diff --git a/wizards/Jar_form.mk b/wizards/Jar_form.mk
index caad29b16702..e5d4c6449420 100644
--- a/wizards/Jar_form.mk
+++ b/wizards/Jar_form.mk
@@ -42,6 +42,6 @@ $(eval $(call gb_Jar_add_sourcefiles,form,\
 	wizards/com/sun/star/wizards/form/UIControlArranger \
 ))
 
-$(eval $(call gb_Jar_set_componentfile,form,wizards/com/sun/star/wizards/form/form,OOO))
+$(eval $(call gb_Jar_set_componentfile,form,wizards/com/sun/star/wizards/form/form,OOO,services))
 
 # vim: set noet sw=4 ts=4:
diff --git a/wizards/Jar_query.mk b/wizards/Jar_query.mk
index 16c27e991435..0bec761ec694 100644
--- a/wizards/Jar_query.mk
+++ b/wizards/Jar_query.mk
@@ -35,6 +35,6 @@ $(eval $(call gb_Jar_add_sourcefiles,query,\
 	wizards/com/sun/star/wizards/query/QueryWizard \
 ))
 
-$(eval $(call gb_Jar_set_componentfile,query,wizards/com/sun/star/wizards/query/query,OOO))
+$(eval $(call gb_Jar_set_componentfile,query,wizards/com/sun/star/wizards/query/query,OOO,services))
 
 # vim: set noet sw=4 ts=4:
diff --git a/wizards/Jar_report.mk b/wizards/Jar_report.mk
index db16bc65716a..92958233c735 100644
--- a/wizards/Jar_report.mk
+++ b/wizards/Jar_report.mk
@@ -48,6 +48,6 @@ $(eval $(call gb_Jar_add_sourcefiles,report,\
 	wizards/com/sun/star/wizards/report/ReportWizard \
 ))
 
-$(eval $(call gb_Jar_set_componentfile,report,wizards/com/sun/star/wizards/report/report,OOO))
+$(eval $(call gb_Jar_set_componentfile,report,wizards/com/sun/star/wizards/report/report,OOO,services))
 
 # vim: set noet sw=4 ts=4:
diff --git a/wizards/Jar_table.mk b/wizards/Jar_table.mk
index cd1568ed6107..ff7ba3929475 100644
--- a/wizards/Jar_table.mk
+++ b/wizards/Jar_table.mk
@@ -41,6 +41,6 @@ $(eval $(call gb_Jar_add_sourcefiles,table,\
 	wizards/com/sun/star/wizards/table/TableWizard \
 ))
 
-$(eval $(call gb_Jar_set_componentfile,table,wizards/com/sun/star/wizards/table/table,OOO))
+$(eval $(call gb_Jar_set_componentfile,table,wizards/com/sun/star/wizards/table/table,OOO,services))
 
 # vim: set noet sw=4 ts=4:
diff --git a/wizards/Pyuno_agenda.mk b/wizards/Pyuno_agenda.mk
index 2fe25bc373fa..d1f822cb33f8 100644
--- a/wizards/Pyuno_agenda.mk
+++ b/wizards/Pyuno_agenda.mk
@@ -22,6 +22,6 @@ $(eval $(call gb_Pyuno_add_files,agenda,wizards/agenda,\
     TemplateConsts.py \
     TopicsControl.py \
 ))
-$(eval $(call gb_Pyuno_set_componentfile_full,agenda,wizards/com/sun/star/wizards/agenda/agenda,vnd.openoffice.pymodule:wizards.agenda,.CallWizard))
+$(eval $(call gb_Pyuno_set_componentfile_full,agenda,wizards/com/sun/star/wizards/agenda/agenda,vnd.openoffice.pymodule:wizards.agenda,.CallWizard,services))
 
 # vim:set noet sw=4 ts=4:
diff --git a/wizards/Pyuno_fax.mk b/wizards/Pyuno_fax.mk
index 9b3c193aff15..c087673f873e 100644
--- a/wizards/Pyuno_fax.mk
+++ b/wizards/Pyuno_fax.mk
@@ -20,6 +20,6 @@ $(eval $(call gb_Pyuno_add_files,fax,wizards/fax,\
     FaxWizardDialog.py \
     FaxWizardDialogResources.py \
 ))
-$(eval $(call gb_Pyuno_set_componentfile_full,fax,wizards/com/sun/star/wizards/fax/fax,vnd.openoffice.pymodule:wizards.fax,.CallWizard))
+$(eval $(call gb_Pyuno_set_componentfile_full,fax,wizards/com/sun/star/wizards/fax/fax,vnd.openoffice.pymodule:wizards.fax,.CallWizard,services))
 
 # vim:set noet sw=4 ts=4:
diff --git a/wizards/Pyuno_letter.mk b/wizards/Pyuno_letter.mk
index efcbe5f7df9c..93999a9e0262 100644
--- a/wizards/Pyuno_letter.mk
+++ b/wizards/Pyuno_letter.mk
@@ -21,6 +21,6 @@ $(eval $(call gb_Pyuno_add_files,letter,wizards/letter,\
 	LetterWizardDialog.py \
 	LetterWizardDialogResources.py \
 ))
-$(eval $(call gb_Pyuno_set_componentfile_full,letter,wizards/com/sun/star/wizards/letter/letter,vnd.openoffice.pymodule:wizards.letter,.CallWizard))
+$(eval $(call gb_Pyuno_set_componentfile_full,letter,wizards/com/sun/star/wizards/letter/letter,vnd.openoffice.pymodule:wizards.letter,.CallWizard,services))
 
 # vim:set noet sw=4 ts=4:
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 2b974536557b..4648ca942220 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_Library_set_include,writerfilter,\
 
 $(eval $(call gb_Library_use_sdk_api,writerfilter))
 
-$(eval $(call gb_Library_set_componentfile,writerfilter,writerfilter/util/writerfilter))
+$(eval $(call gb_Library_set_componentfile,writerfilter,writerfilter/util/writerfilter,services))
 
 $(eval $(call gb_Library_use_libraries,writerfilter,\
     basegfx \
diff --git a/writerperfect/Library_wpftcalc.mk b/writerperfect/Library_wpftcalc.mk
index d5935efb26d2..1ff7398c54da 100644
--- a/writerperfect/Library_wpftcalc.mk
+++ b/writerperfect/Library_wpftcalc.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_set_include,wpftcalc,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_set_componentfile,wpftcalc,writerperfect/source/calc/wpftcalc))
+$(eval $(call gb_Library_set_componentfile,wpftcalc,writerperfect/source/calc/wpftcalc,services))
 
 $(eval $(call gb_Library_use_sdk_api,wpftcalc))
 
diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk
index 54ad1beb8e27..340cb889b416 100644
--- a/writerperfect/Library_wpftdraw.mk
+++ b/writerperfect/Library_wpftdraw.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_set_include,wpftdraw,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_set_componentfile,wpftdraw,writerperfect/source/draw/wpftdraw))
+$(eval $(call gb_Library_set_componentfile,wpftdraw,writerperfect/source/draw/wpftdraw,services))
 
 $(eval $(call gb_Library_use_sdk_api,wpftdraw))
 
diff --git a/writerperfect/Library_wpftimpress.mk b/writerperfect/Library_wpftimpress.mk
index 62b5482b6acf..9547faecd1be 100644
--- a/writerperfect/Library_wpftimpress.mk
+++ b/writerperfect/Library_wpftimpress.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_set_include,wpftimpress,\
        $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_set_componentfile,wpftimpress,writerperfect/source/impress/wpftimpress))
+$(eval $(call gb_Library_set_componentfile,wpftimpress,writerperfect/source/impress/wpftimpress,services))
 
 $(eval $(call gb_Library_use_sdk_api,wpftimpress))
 
diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
index 8993cca31490..582bfc5faa3a 100644
--- a/writerperfect/Library_wpftwriter.mk
+++ b/writerperfect/Library_wpftwriter.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_set_include,wpftwriter,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_set_componentfile,wpftwriter,writerperfect/source/writer/wpftwriter))
+$(eval $(call gb_Library_set_componentfile,wpftwriter,writerperfect/source/writer/wpftwriter,services))
 
 $(eval $(call gb_Library_use_sdk_api,wpftwriter))
 
diff --git a/xmerge/Jar_XMergeBridge.mk b/xmerge/Jar_XMergeBridge.mk
index 6cefaf433591..2ca6fede5f25 100644
--- a/xmerge/Jar_XMergeBridge.mk
+++ b/xmerge/Jar_XMergeBridge.mk
@@ -10,7 +10,7 @@
 
 $(eval $(call gb_Jar_Jar,XMergeBridge))
 
-$(eval $(call gb_Jar_set_componentfile,XMergeBridge,xmerge/source/bridge/XMergeBridge,OOO))
+$(eval $(call gb_Jar_set_componentfile,XMergeBridge,xmerge/source/bridge/XMergeBridge,OOO,services))
 
 $(eval $(call gb_Jar_set_manifest,XMergeBridge,$(SRCDIR)/xmerge/source/bridge/manifest.mf))
 
diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk
index ac4b5e0f7196..087a1da2deb6 100644
--- a/xmlhelp/Library_ucpchelp1.mk
+++ b/xmlhelp/Library_ucpchelp1.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,ucpchelp1))
 
-$(eval $(call gb_Library_set_componentfile,ucpchelp1,xmlhelp/util/ucpchelp1))
+$(eval $(call gb_Library_set_componentfile,ucpchelp1,xmlhelp/util/ucpchelp1,services))
 
 $(eval $(call gb_Library_set_include,ucpchelp1,\
 	-I$(SRCDIR)/xmlhelp/source/cxxhelp/inc \
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index b33455b3c464..0d3fed2d1541 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,xo))
 
-$(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo))
+$(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo,services))
 
 $(eval $(call gb_Library_set_precompiled_header,xo,xmloff/inc/pch/precompiled_xo))
 
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
index 350f2cf0910a..1c9525a5e9b7 100644
--- a/xmloff/Library_xof.mk
+++ b/xmloff/Library_xof.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Library_Library,xof))
 
-$(eval $(call gb_Library_set_componentfile,xof,xmloff/source/transform/xof))
+$(eval $(call gb_Library_set_componentfile,xof,xmloff/source/transform/xof,services))
 
 $(eval $(call gb_Library_set_include,xof,\
     -I$(SRCDIR)/xmloff/inc \
diff --git a/xmlscript/Library_xmlscript.mk b/xmlscript/Library_xmlscript.mk
index 40852a12bb70..7a26dc333b38 100644
--- a/xmlscript/Library_xmlscript.mk
+++ b/xmlscript/Library_xmlscript.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Library_Library,xmlscript))
 
 $(eval $(call gb_Library_use_external,xmlscript,boost_headers))
 
-$(eval $(call gb_Library_set_componentfile,xmlscript,xmlscript/util/xmlscript))
+$(eval $(call gb_Library_set_componentfile,xmlscript,xmlscript/util/xmlscript,services))
 
 $(eval $(call gb_Library_use_sdk_api,xmlscript))
 
diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk
index 9d6862e8d6ec..a4491134a08b 100644
--- a/xmlsecurity/Library_xmlsecurity.mk
+++ b/xmlsecurity/Library_xmlsecurity.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,xmlsecurity))
 
-$(eval $(call gb_Library_set_componentfile,xmlsecurity,xmlsecurity/util/xmlsecurity))
+$(eval $(call gb_Library_set_componentfile,xmlsecurity,xmlsecurity/util/xmlsecurity,services))
 
 $(eval $(call gb_Library_set_include,xmlsecurity,\
 	$$(INCLUDE) \
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
index 450e19b3267b..25b679c7266e 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Library_Library,xsec_xmlsec))
 
-$(eval $(call gb_Library_set_componentfile,xsec_xmlsec,xmlsecurity/util/xsec_xmlsec))
+$(eval $(call gb_Library_set_componentfile,xsec_xmlsec,xmlsecurity/util/xsec_xmlsec,services))
 
 $(eval $(call gb_Library_set_include,xsec_xmlsec,\
 	$$(INCLUDE) \
author	Stephan Bergmann <sbergman@redhat.com>	2021-12-09 10:15:05 +0100
committer	Stephan Bergmann <sbergman@redhat.com>	2021-12-10 08:14:24 +0100
commit	db3a61cd958f4a70417929cf8e1fa9bfd0bfe5a3 (patch)
tree	20c4ceba87df6b65e218a670ae22e35d7a1da30f
parent	5b0707f66e2c49a11f3a23e3ec9940b26d881165 (diff)