11 files changed, 9 insertions, 18 deletions
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: