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.

1c9a40299d "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 1c9a40299d):

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>

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)"
 

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 \

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))
 

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 \

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) \

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) \

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))
 

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 \

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 \

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))
 

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))
 

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))
 

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))
 

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))
 

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))
 

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))
 

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))
 

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 \

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,\

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))
 

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@

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))

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 \

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 \

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))
 

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))
 

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) \

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) \

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))
 

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 \

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))
 

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 \

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))
 

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))
 

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 \

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))
 

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:

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))
 

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 \

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 \

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))
 

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))
 

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:

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))
 

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) \

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 \

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 \

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 \

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 \

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))
 

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 \

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 \

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 \

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 \

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 \

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))
 

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 \

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:

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:

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:

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))
 

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 \

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 \

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 \

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) \

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 \

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))
 

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) \

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) \

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) \

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))
 

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))
 

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 \

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))
 

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))
 

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))
 

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 \

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) \

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))
 

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))
 

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))
 

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))
 

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))
 

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))
 

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 \

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))
 

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))
 

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))
 

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))
 

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))
 

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))
 

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 \

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 \

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) \

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) \

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) \

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 \

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 \

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,\

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))