gbuild: "use" vs. "add":

Naming convention for gbuild methods:
- "add" is used for stuff that is logically a part of the target
  (i.e. not registered at the Module, but defined in the target's makefile)
- "use" is used for stuff that is logically a different target
  (i.e. it is registered at the Module, has it's own makefile, may be
  in a different module than the target)

13 files changed, 19 insertions, 19 deletions

diff --git a/scripting/Jar_HelloWorld.mk b/scripting/Jar_HelloWorld.mk
index 87902d3e284c..35caa13406d3 100644
--- a/scripting/Jar_HelloWorld.mk
+++ b/scripting/Jar_HelloWorld.mk
@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Jar_Jar,HelloWorld))
 
-$(eval $(call gb_Jar_add_jars,HelloWorld,\
+$(eval $(call gb_Jar_use_jars,HelloWorld,\
 	$(OUTDIR)/bin/juh.jar \
 	$(OUTDIR)/bin/jurt.jar \
 	$(OUTDIR)/bin/ridl.jar \
diff --git a/scripting/Jar_Highlight.mk b/scripting/Jar_Highlight.mk
index 0f9a81f706fc..3ee827bf658f 100644
--- a/scripting/Jar_Highlight.mk
+++ b/scripting/Jar_Highlight.mk
@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Jar_Jar,Highlight))
 
-$(eval $(call gb_Jar_add_jars,Highlight,\
+$(eval $(call gb_Jar_use_jars,Highlight,\
 	$(OUTDIR)/bin/juh.jar \
 	$(OUTDIR)/bin/jurt.jar \
 	$(OUTDIR)/bin/ridl.jar \
diff --git a/scripting/Jar_MemoryUsage.mk b/scripting/Jar_MemoryUsage.mk
index 952dec0dcb0b..1c3d71d7fce6 100644
--- a/scripting/Jar_MemoryUsage.mk
+++ b/scripting/Jar_MemoryUsage.mk
@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Jar_Jar,MemoryUsage))
 
-$(eval $(call gb_Jar_add_jars,MemoryUsage,\
+$(eval $(call gb_Jar_use_jars,MemoryUsage,\
 	$(OUTDIR)/bin/juh.jar \
 	$(OUTDIR)/bin/jurt.jar \
 	$(OUTDIR)/bin/ridl.jar \
diff --git a/scripting/Jar_ScriptFramework.mk b/scripting/Jar_ScriptFramework.mk
index 1e6a4be32d49..f29e5a79ce8b 100644
--- a/scripting/Jar_ScriptFramework.mk
+++ b/scripting/Jar_ScriptFramework.mk
@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Jar_Jar,ScriptFramework))
 
-$(eval $(call gb_Jar_add_jars,ScriptFramework,\
+$(eval $(call gb_Jar_use_jars,ScriptFramework,\
 	$(OUTDIR)/bin/juh.jar \
 	$(OUTDIR)/bin/jurt.jar \
 	$(OUTDIR)/bin/ridl.jar \
diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk
index aee4ad5d5a60..abe612596550 100644
--- a/scripting/Jar_ScriptProviderForBeanShell.mk
+++ b/scripting/Jar_ScriptProviderForBeanShell.mk
@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Jar_Jar,ScriptProviderForBeanShell))
 
-$(eval $(call gb_Jar_add_jars,ScriptProviderForBeanShell,\
+$(eval $(call gb_Jar_use_jars,ScriptProviderForBeanShell,\
 	$(OUTDIR)/bin/juh.jar \
 	$(OUTDIR)/bin/jurt.jar \
 	$(OUTDIR)/bin/ridl.jar \
diff --git a/scripting/Jar_ScriptProviderForJava.mk b/scripting/Jar_ScriptProviderForJava.mk
index 19e19952c97e..bcff02d6f6f1 100644
--- a/scripting/Jar_ScriptProviderForJava.mk
+++ b/scripting/Jar_ScriptProviderForJava.mk
@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Jar_Jar,ScriptProviderForJava))
 
-$(eval $(call gb_Jar_add_jars,ScriptProviderForJava,\
+$(eval $(call gb_Jar_use_jars,ScriptProviderForJava,\
 	$(OUTDIR)/bin/juh.jar \
 	$(OUTDIR)/bin/jurt.jar \
 	$(OUTDIR)/bin/ridl.jar \
diff --git a/scripting/Jar_ScriptProviderForJavaScript.mk b/scripting/Jar_ScriptProviderForJavaScript.mk
index bd405cc850e0..99ee7c31c059 100644
--- a/scripting/Jar_ScriptProviderForJavaScript.mk
+++ b/scripting/Jar_ScriptProviderForJavaScript.mk
@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Jar_Jar,ScriptProviderForJavaScript))
 
-$(eval $(call gb_Jar_add_jars,ScriptProviderForJavaScript,\
+$(eval $(call gb_Jar_use_jars,ScriptProviderForJavaScript,\
 	$(OUTDIR)/bin/juh.jar \
 	$(OUTDIR)/bin/jurt.jar \
 	$(OUTDIR)/bin/ridl.jar \
diff --git a/scripting/Library_basprov.mk b/scripting/Library_basprov.mk
index 435f97f1c517..0bc98fd77db3 100644
--- a/scripting/Library_basprov.mk
+++ b/scripting/Library_basprov.mk
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,basprov,\
 	-I$(SRCDIR)/scripting/source/inc \
 ))
 
-$(eval $(call gb_Library_add_api,basprov,\
+$(eval $(call gb_Library_use_api,basprov,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,basprov,\
+$(eval $(call gb_Library_use_libraries,basprov,\
 	comphelper \
 	cppu \
 	cppuhelper \
diff --git a/scripting/Library_dlgprov.mk b/scripting/Library_dlgprov.mk
index d3d8a0c97f1b..93cd94183da0 100644
--- a/scripting/Library_dlgprov.mk
+++ b/scripting/Library_dlgprov.mk
@@ -35,13 +35,13 @@ $(eval $(call gb_Library_set_include,dlgprov,\
 	-I$(SRCDIR)/scripting/source/inc \
 ))
 
-$(eval $(call gb_Library_add_api,dlgprov,\
+$(eval $(call gb_Library_use_api,dlgprov,\
 	offapi \
 	oovbaapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,dlgprov,\
+$(eval $(call gb_Library_use_libraries,dlgprov,\
 	comphelper \
 	cppu \
 	cppuhelper \
diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk
index e7fcda2d0714..dcac02f836e1 100644
--- a/scripting/Library_protocolhandler.mk
+++ b/scripting/Library_protocolhandler.mk
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,protocolhandler,\
 	-I$(SRCDIR)/scripting/source/inc \
 ))
 
-$(eval $(call gb_Library_add_api,protocolhandler,\
+$(eval $(call gb_Library_use_api,protocolhandler,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,protocolhandler,\
+$(eval $(call gb_Library_use_libraries,protocolhandler,\
 	cppu \
 	cppuhelper \
 	fwe \
diff --git a/scripting/Library_scriptframe.mk b/scripting/Library_scriptframe.mk
index c950acafac9c..1c3a1030ecc5 100644
--- a/scripting/Library_scriptframe.mk
+++ b/scripting/Library_scriptframe.mk
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,scriptframe,\
 	-I$(SRCDIR)/scripting/source/inc \
 ))
 
-$(eval $(call gb_Library_add_api,scriptframe,\
+$(eval $(call gb_Library_use_api,scriptframe,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,scriptframe,\
+$(eval $(call gb_Library_use_libraries,scriptframe,\
 	comphelper \
 	cppu \
 	cppuhelper \
diff --git a/scripting/Library_stringresource.mk b/scripting/Library_stringresource.mk
index 166a0aa83cdf..271ec3de0b7f 100644
--- a/scripting/Library_stringresource.mk
+++ b/scripting/Library_stringresource.mk
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,stringresource,\
 	-I$(SRCDIR)/scripting/source/inc \
 ))
 
-$(eval $(call gb_Library_add_api,stringresource,\
+$(eval $(call gb_Library_use_api,stringresource,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,stringresource,\
+$(eval $(call gb_Library_use_libraries,stringresource,\
 	cppu \
 	cppuhelper \
 	sal \
diff --git a/scripting/Library_vbaevents.mk b/scripting/Library_vbaevents.mk
index b172258e71b7..83ec86c505c7 100644
--- a/scripting/Library_vbaevents.mk
+++ b/scripting/Library_vbaevents.mk
@@ -35,13 +35,13 @@ $(eval $(call gb_Library_set_include,vbaevents,\
 	-I$(SRCDIR)/scripting/source/inc \
 ))
 
-$(eval $(call gb_Library_add_api,vbaevents,\
+$(eval $(call gb_Library_use_api,vbaevents,\
 	offapi \
 	oovbaapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,vbaevents,\
+$(eval $(call gb_Library_use_libraries,vbaevents,\
 	comphelper \
 	cppu \
 	cppuhelper \