13 files changed, 11 insertions, 19 deletions
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: