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)

18 files changed, 36 insertions, 36 deletions

diff --git a/ucb/JunitTest_ucb_complex.mk b/ucb/JunitTest_ucb_complex.mk
index 625f10a5af5a..7750f6cc6a10 100644
--- a/ucb/JunitTest_ucb_complex.mk
+++ b/ucb/JunitTest_ucb_complex.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_JunitTest_set_defs,ucb_complex,\
     -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/ucb/qa/complex/testdocuments \
 ))
 
-$(eval $(call gb_JunitTest_add_jars,ucb_complex,\
+$(eval $(call gb_JunitTest_use_jars,ucb_complex,\
     $(OUTDIR)/bin/OOoRunner.jar \
     $(OUTDIR)/bin/ridl.jar \
     $(OUTDIR)/bin/test.jar \
diff --git a/ucb/JunitTest_ucb_unoapi.mk b/ucb/JunitTest_ucb_unoapi.mk
index de862158a874..72e728a37144 100644
--- a/ucb/JunitTest_ucb_unoapi.mk
+++ b/ucb/JunitTest_ucb_unoapi.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,ucb_unoapi,\
     -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/ucb/qa/unoapi/testdocuments \
 ))
 
-$(eval $(call gb_JunitTest_add_jars,ucb_unoapi,\
+$(eval $(call gb_JunitTest_use_jars,ucb_unoapi,\
     $(OUTDIR)/bin/OOoRunner.jar \
     $(OUTDIR)/bin/ridl.jar \
     $(OUTDIR)/bin/test.jar \
diff --git a/ucb/Library_cached1.mk b/ucb/Library_cached1.mk
index 70f8af18f794..2ef218a4f4b9 100644
--- a/ucb/Library_cached1.mk
+++ b/ucb/Library_cached1.mk
@@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,cached1))
 
 $(eval $(call gb_Library_set_componentfile,cached1,ucb/source/cacher/cached1))
 
-$(eval $(call gb_Library_add_api,cached1,\
+$(eval $(call gb_Library_use_api,cached1,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,cached1,\
+$(eval $(call gb_Library_use_libraries,cached1,\
 	cppu \
 	cppuhelper \
 	sal \
diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk
index 8d6b2f775349..09f3302088c5 100644
--- a/ucb/Library_srtrs1.mk
+++ b/ucb/Library_srtrs1.mk
@@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,srtrs1))
 
 $(eval $(call gb_Library_set_componentfile,srtrs1,ucb/source/sorter/srtrs1))
 
-$(eval $(call gb_Library_add_api,srtrs1,\
+$(eval $(call gb_Library_use_api,srtrs1,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,srtrs1,\
+$(eval $(call gb_Library_use_libraries,srtrs1,\
 	cppu \
 	cppuhelper \
 	sal \
diff --git a/ucb/Library_ucb1.mk b/ucb/Library_ucb1.mk
index 00b87b7c1b42..32ca8baee823 100644
--- a/ucb/Library_ucb1.mk
+++ b/ucb/Library_ucb1.mk
@@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,ucb1,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,ucb1,\
+$(eval $(call gb_Library_use_api,ucb1,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,ucb1,\
+$(eval $(call gb_Library_use_libraries,ucb1,\
 	comphelper \
 	cppu \
 	cppuhelper \
diff --git a/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk
index 20ad4aaa3e4e..2a66b406cf8f 100644
--- a/ucb/Library_ucpcmis1.mk
+++ b/ucb/Library_ucpcmis1.mk
@@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucpcmis1))
 
 $(eval $(call gb_Library_set_componentfile,ucpcmis1,ucb/source/ucp/cmis/ucpcmis1))
 
-$(eval $(call gb_Library_add_api,ucpcmis1,\
+$(eval $(call gb_Library_use_api,ucpcmis1,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,ucpcmis1,\
+$(eval $(call gb_Library_use_libraries,ucpcmis1,\
 	cppu \
 	cppuhelper \
 	sal \
diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk
index 61348717ab19..3d7d8d306bd9 100644
--- a/ucb/Library_ucpdav1.mk
+++ b/ucb/Library_ucpdav1.mk
@@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucpdav1))
 
 $(eval $(call gb_Library_set_componentfile,ucpdav1,ucb/source/ucp/webdav/ucpdav1))
 
-$(eval $(call gb_Library_add_api,ucpdav1,\
+$(eval $(call gb_Library_use_api,ucpdav1,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,ucpdav1,\
+$(eval $(call gb_Library_use_libraries,ucpdav1,\
 	comphelper \
 	cppu \
 	cppuhelper \
@@ -75,13 +75,13 @@ $(eval $(call gb_Library_add_exception_objects,ucpdav1,\
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,ucpdav1,\
+$(eval $(call gb_Library_use_libraries,ucpdav1,\
 	ws2_32 \
 ))
 endif
 
 ifeq ($(OS),SOLARIS)
-$(eval $(call gb_Library_add_linked_libs,ucpdav1,\
+$(eval $(call gb_Library_use_libraries,ucpdav1,\
 	dl \
 	nsl \
 	socket \
diff --git a/ucb/Library_ucpexpand1.mk b/ucb/Library_ucpexpand1.mk
index 0209bfcd5222..962cf2d90324 100644
--- a/ucb/Library_ucpexpand1.mk
+++ b/ucb/Library_ucpexpand1.mk
@@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucpexpand1))
 
 $(eval $(call gb_Library_set_componentfile,ucpexpand1,ucb/source/ucp/expand/ucpexpand1))
 
-$(eval $(call gb_Library_add_api,ucpexpand1,\
+$(eval $(call gb_Library_use_api,ucpexpand1,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,ucpexpand1,\
+$(eval $(call gb_Library_use_libraries,ucpexpand1,\
 	cppu \
 	cppuhelper \
 	sal \
diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk
index 5a6017153c0c..9d648fbd8cc8 100644
--- a/ucb/Library_ucpext.mk
+++ b/ucb/Library_ucpext.mk
@@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucpext))
 
 $(eval $(call gb_Library_set_componentfile,ucpext,ucb/source/ucp/ext/ucpext))
 
-$(eval $(call gb_Library_add_api,ucpext,\
+$(eval $(call gb_Library_use_api,ucpext,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,ucpext,\
+$(eval $(call gb_Library_use_libraries,ucpext,\
 	comphelper \
 	cppu \
 	cppuhelper \
diff --git a/ucb/Library_ucpfile1.mk b/ucb/Library_ucpfile1.mk
index 6d513ceb945e..db3e2739f72a 100644
--- a/ucb/Library_ucpfile1.mk
+++ b/ucb/Library_ucpfile1.mk
@@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucpfile1))
 
 $(eval $(call gb_Library_set_componentfile,ucpfile1,ucb/source/ucp/file/ucpfile1))
 
-$(eval $(call gb_Library_add_api,ucpfile1,\
+$(eval $(call gb_Library_use_api,ucpfile1,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,ucpfile1,\
+$(eval $(call gb_Library_use_libraries,ucpfile1,\
 	cppu \
 	cppuhelper \
 	sal \
diff --git a/ucb/Library_ucpftp1.mk b/ucb/Library_ucpftp1.mk
index e4d5d561fd58..f0c6fc2b5d25 100644
--- a/ucb/Library_ucpftp1.mk
+++ b/ucb/Library_ucpftp1.mk
@@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucpftp1))
 
 $(eval $(call gb_Library_set_componentfile,ucpftp1,ucb/source/ucp/ftp/ucpftp1))
 
-$(eval $(call gb_Library_add_api,ucpftp1,\
+$(eval $(call gb_Library_use_api,ucpftp1,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,ucpftp1,\
+$(eval $(call gb_Library_use_libraries,ucpftp1,\
 	cppu \
 	cppuhelper \
 	sal \
diff --git a/ucb/Library_ucpgio1.mk b/ucb/Library_ucpgio1.mk
index ec3dc9bcd6e3..c01b1255b93a 100644
--- a/ucb/Library_ucpgio1.mk
+++ b/ucb/Library_ucpgio1.mk
@@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucpgio1))
 
 $(eval $(call gb_Library_set_componentfile,ucpgio1,ucb/source/ucp/gio/ucpgio))
 
-$(eval $(call gb_Library_add_api,ucpgio1,\
+$(eval $(call gb_Library_use_api,ucpgio1,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,ucpgio1,\
+$(eval $(call gb_Library_use_libraries,ucpgio1,\
 	cppu \
 	cppuhelper \
 	sal \
diff --git a/ucb/Library_ucpgvfs1.mk b/ucb/Library_ucpgvfs1.mk
index 787d9a6d014a..321359c20d04 100644
--- a/ucb/Library_ucpgvfs1.mk
+++ b/ucb/Library_ucpgvfs1.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Library_set_include,ucpgvfs1,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,ucpgvfs1,\
+$(eval $(call gb_Library_use_api,ucpgvfs1,\
 	offapi \
 	udkapi \
 ))
@@ -43,7 +43,7 @@ $(eval $(call gb_Library_add_libs,ucpgvfs1,\
 	$(GNOMEVFS_LIBS) \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,ucpgvfs1,\
+$(eval $(call gb_Library_use_libraries,ucpgvfs1,\
 	cppu \
 	cppuhelper \
 	sal \
diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk
index 059e408bf320..d3c7030be320 100644
--- a/ucb/Library_ucphier1.mk
+++ b/ucb/Library_ucphier1.mk
@@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucphier1))
 
 $(eval $(call gb_Library_set_componentfile,ucphier1,ucb/source/ucp/hierarchy/ucphier1))
 
-$(eval $(call gb_Library_add_api,ucphier1,\
+$(eval $(call gb_Library_use_api,ucphier1,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,ucphier1,\
+$(eval $(call gb_Library_use_libraries,ucphier1,\
 	cppu \
 	cppuhelper \
 	sal \
diff --git a/ucb/Library_ucpodma1.mk b/ucb/Library_ucpodma1.mk
index ef60121af04d..8536de71324b 100644
--- a/ucb/Library_ucpodma1.mk
+++ b/ucb/Library_ucpodma1.mk
@@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucpodma1))
 
 $(eval $(call gb_Library_set_componentfile,ucpodma1,ucb/source/ucp/odma/ucpodma1))
 
-$(eval $(call gb_Library_add_api,ucpodma1,\
+$(eval $(call gb_Library_use_api,ucpodma1,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,ucpodma1,\
+$(eval $(call gb_Library_use_libraries,ucpodma1,\
 	cppu \
 	cppuhelper \
 	sal \
@@ -43,7 +43,7 @@ $(eval $(call gb_Library_add_linked_libs,ucpodma1,\
 	$(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Library_add_linked_static_libs,ucpodma1,\
+$(eval $(call gb_Library_use_static_libraries,ucpodma1,\
 	odma_lib \
 ))
 
diff --git a/ucb/Library_ucppkg1.mk b/ucb/Library_ucppkg1.mk
index b3a5764bd2cb..5f0aa247173a 100644
--- a/ucb/Library_ucppkg1.mk
+++ b/ucb/Library_ucppkg1.mk
@@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucppkg1))
 
 $(eval $(call gb_Library_set_componentfile,ucppkg1,ucb/source/ucp/package/ucppkg1))
 
-$(eval $(call gb_Library_add_api,ucppkg1,\
+$(eval $(call gb_Library_use_api,ucppkg1,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,ucppkg1,\
+$(eval $(call gb_Library_use_libraries,ucppkg1,\
 	comphelper \
 	cppu \
 	cppuhelper \
diff --git a/ucb/Library_ucptdoc1.mk b/ucb/Library_ucptdoc1.mk
index a84212c4cc55..d79f42e9b056 100644
--- a/ucb/Library_ucptdoc1.mk
+++ b/ucb/Library_ucptdoc1.mk
@@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,ucptdoc1))
 
 $(eval $(call gb_Library_set_componentfile,ucptdoc1,ucb/source/ucp/tdoc/ucptdoc1))
 
-$(eval $(call gb_Library_add_api,ucptdoc1,\
+$(eval $(call gb_Library_use_api,ucptdoc1,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,ucptdoc1,\
+$(eval $(call gb_Library_use_libraries,ucptdoc1,\
 	comphelper \
 	cppu \
 	cppuhelper \
diff --git a/ucb/StaticLibrary_odma_lib.mk b/ucb/StaticLibrary_odma_lib.mk
index 5c46d9bda455..d9e1fe4a0d73 100644
--- a/ucb/StaticLibrary_odma_lib.mk
+++ b/ucb/StaticLibrary_odma_lib.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,odma_lib))
 
 $(eval $(call gb_StaticLibrary_add_package_headers,odma_lib,ucb_odma_inc))
 
-$(eval $(call gb_StaticLibrary_add_api,odma_lib,\
+$(eval $(call gb_StaticLibrary_use_api,odma_lib,\
     offapi \
     udkapi \
 ))