update gbuild function names

Change-Id: I0bca38ff0983fab3fa388cd0b4030caa520d10a5

connectivity/Jar_ConnectivityTools.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Jar_Jar,ConnectivityTools))
 
-$(eval $(call gb_Jar_add_jars,ConnectivityTools,\
+$(eval $(call gb_Jar_use_jars,ConnectivityTools,\
 	$(OUTDIR)/bin/ridl.jar \
 	$(OUTDIR)/bin/unoil.jar \
 	$(OUTDIR)/bin/jurt.jar \

connectivity/Jar_sdbc_hsqldb.mk

@@ -28,11 +28,11 @@
 $(eval $(call gb_Jar_Jar,sdbc_hsqldb))
 
 ifeq ($(SYSTEM_HSQLDB),YES)
-$(eval $(call gb_Jar_add_jars,sdbc_hsqldb,\
+$(eval $(call gb_Jar_use_jars,sdbc_hsqldb,\
 	$(HSQLDB_JAR) \
 ))
 else
-$(eval $(call gb_Jar_add_jars,sdbc_hsqldb,\
+$(eval $(call gb_Jar_use_jars,sdbc_hsqldb,\
 	$(OUTDIR)/bin/hsqldb.jar \
 ))
 endif

connectivity/JunitTest_complex.mk

@@ -33,7 +33,7 @@ $(eval $(call gb_JunitTest_set_defs,connectivity_complex,\
 ))
 
 # TODO: add use_externals to JunitTest
-$(eval $(call gb_JunitTest_add_jars,connectivity_complex,\
+$(eval $(call gb_JunitTest_use_jars,connectivity_complex,\
 	$(OUTDIR)/bin/jurt.jar \
 	$(OUTDIR)/bin/OOoRunner.jar \
 	$(OUTDIR)/bin/ridl.jar \

connectivity/Library_ado.mk

@@ -34,7 +34,7 @@ $(eval $(call gb_Library_set_include,ado,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,ado,\
+$(eval $(call gb_Library_use_api,ado,\
 	offapi \
 	udkapi \
 ))
@@ -45,7 +45,7 @@ $(eval $(call gb_Library_add_cxxflags,ado,\
 ))
 endif
 
-$(eval $(call gb_Library_add_linked_libs,ado,\
+$(eval $(call gb_Library_use_libraries,ado,\
 	cppu \
 	cppuhelper \
 	sal \

connectivity/Library_calc.mk

@@ -27,13 +27,13 @@
 
 $(eval $(call gb_Library_Library,calc))
 
-$(eval $(call gb_Library_add_package_headers,calc,\
+$(eval $(call gb_Library_use_packages,calc,\
 	connectivity_generated \
 ))
 
 $(eval $(call gb_Library_set_componentfile,calc,connectivity/source/drivers/calc/calc))
 
-$(eval $(call gb_Library_add_api,calc,\
+$(eval $(call gb_Library_use_api,calc,\
 	offapi \
 	udkapi \
 ))
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_set_include,calc,\
 	-I$(SRCDIR)/connectivity/source/inc \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,calc,\
+$(eval $(call gb_Library_use_libraries,calc,\
 	cppu \
 	cppuhelper \
 	svl \

connectivity/Library_dbase.mk

@@ -27,13 +27,13 @@
 
 $(eval $(call gb_Library_Library,dbase))
 
-$(eval $(call gb_Library_add_package_headers,calc,\
+$(eval $(call gb_Library_use_packages,calc,\
 	connectivity_generated \
 ))
 
 $(eval $(call gb_Library_set_componentfile,dbase,connectivity/source/drivers/dbase/dbase))
 
-$(eval $(call gb_Library_add_api,dbase,\
+$(eval $(call gb_Library_use_api,dbase,\
 	offapi \
 	udkapi \
 ))
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_set_include,dbase,\
 	-I$(SRCDIR)/connectivity/source/inc \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,dbase,\
+$(eval $(call gb_Library_use_libraries,dbase,\
 	cppu \
 	cppuhelper \
 	svl \

connectivity/Library_dbpool2.mk

@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,dbpool2,\
 	-I$(SRCDIR)/connectivity/source/inc \
 ))
 
-$(eval $(call gb_Library_add_api,dbpool2,\
+$(eval $(call gb_Library_use_api,dbpool2,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,dbpool2,\
+$(eval $(call gb_Library_use_libraries,dbpool2,\
 	comphelper \
 	cppu \
 	cppuhelper \

connectivity/Library_dbtools.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,dbtools))
 
-$(eval $(call gb_Library_add_package_headers,dbtools,\
+$(eval $(call gb_Library_use_packages,dbtools,\
 	connectivity_inc \
 ))
 
@@ -45,12 +45,12 @@ $(eval $(call gb_Library_set_include,dbtools,\
 	-I$(dir $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)) \
 ))
 
-$(eval $(call gb_Library_add_api,dbtools,\
+$(eval $(call gb_Library_use_api,dbtools,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,dbtools,\
+$(eval $(call gb_Library_use_libraries,dbtools,\
 	cppu \
 	cppuhelper \
 	sal \
@@ -64,7 +64,7 @@ $(eval $(call gb_Library_add_linked_libs,dbtools,\
 ))
 
 ifeq ($(filter-out NETBSD MACOSX,$(OS)),)
-$(eval $(call gb_Library_add_linked_libs,dbtools,\
+$(eval $(call gb_Library_use_libraries,dbtools,\
 	ucbhelper \
 ))
 endif

connectivity/Library_evoab2.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,evoab2))
 
-$(eval $(call gb_Library_add_package_headers,calc,\
+$(eval $(call gb_Library_use_packages,calc,\
 	connectivity_generated \
 ))
 
@@ -43,12 +43,12 @@ $(eval $(call gb_Library_use_externals,evoab2,\
 
 $(eval $(call gb_Library_set_componentfile,evoab2,connectivity/source/drivers/evoab2/evoab))
 
-$(eval $(call gb_Library_add_api,evoab2,\
+$(eval $(call gb_Library_use_api,evoab2,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,evoab2,\
+$(eval $(call gb_Library_use_libraries,evoab2,\
 	comphelper \
 	cppu \
 	cppuhelper \

connectivity/Library_file.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,file))
 
-$(eval $(call gb_Library_add_package_headers,calc,\
+$(eval $(call gb_Library_use_packages,calc,\
 	connectivity_generated \
 ))
 
@@ -41,12 +41,12 @@ $(eval $(call gb_Library_set_include,file,\
 	-I$(SRCDIR)/connectivity/source/inc \
 ))
 
-$(eval $(call gb_Library_add_api,file,\
+$(eval $(call gb_Library_use_api,file,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,file,\
+$(eval $(call gb_Library_use_libraries,file,\
 	cppu \
 	cppuhelper \
 	svl \

connectivity/Library_flat.mk

@@ -27,13 +27,13 @@
 
 $(eval $(call gb_Library_Library,flat))
 
-$(eval $(call gb_Library_add_package_headers,calc,\
+$(eval $(call gb_Library_use_packages,calc,\
 	connectivity_generated \
 ))
 
 $(eval $(call gb_Library_set_componentfile,flat,connectivity/source/drivers/flat/flat))
 
-$(eval $(call gb_Library_add_api,flat,\
+$(eval $(call gb_Library_use_api,flat,\
 	offapi \
 	udkapi \
 ))
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_set_include,flat,\
 	-I$(SRCDIR)/connectivity/source/inc \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,flat,\
+$(eval $(call gb_Library_use_libraries,flat,\
 	cppu \
 	cppuhelper \
 	tl \

connectivity/Library_hsqldb.mk

@@ -36,12 +36,12 @@ $(eval $(call gb_Library_use_externals,hsqldb,\
 	hsqldb \
 ))
 
-$(eval $(call gb_Library_add_api,hsqldb,\
+$(eval $(call gb_Library_use_api,hsqldb,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,hsqldb,\
+$(eval $(call gb_Library_use_libraries,hsqldb,\
 	comphelper \
 	cppu \
 	cppuhelper \

connectivity/Library_jdbc.mk

@@ -27,13 +27,13 @@
 
 $(eval $(call gb_Library_Library,jdbc))
 
-$(eval $(call gb_Library_add_package_headers,calc,\
+$(eval $(call gb_Library_use_packages,calc,\
 	connectivity_generated \
 ))
 
 $(eval $(call gb_Library_set_componentfile,jdbc,connectivity/source/drivers/jdbc/jdbc))
 
-$(eval $(call gb_Library_add_api,jdbc,\
+$(eval $(call gb_Library_use_api,jdbc,\
 	offapi \
 	udkapi \
 ))
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_set_include,jdbc,\
 	-I$(SRCDIR)/connectivity/source/inc \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,jdbc,\
+$(eval $(call gb_Library_use_libraries,jdbc,\
 	cppu \
 	cppuhelper \
 	sal \

connectivity/Library_kab1.mk

@@ -31,12 +31,12 @@ $(eval $(call gb_Library_use_externals,kab1,kde))
 
 $(eval $(call gb_Library_set_componentfile,kab1,connectivity/source/drivers/kab/kab1))
 
-$(eval $(call gb_Library_add_api,kab1,\
+$(eval $(call gb_Library_use_api,kab1,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,kab1,\
+$(eval $(call gb_Library_use_libraries,kab1,\
 	comphelper \
 	cppu \
 	cppuhelper \

connectivity/Library_kabdrv1.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,kabdrv1))
 
-$(eval $(call gb_Library_add_api,kabdrv1,\
+$(eval $(call gb_Library_use_api,kabdrv1,\
 	offapi \
 	udkapi \
 ))
@@ -36,7 +36,7 @@ $(eval $(call gb_Library_add_libs,kabdrv1,\
 	-lkabc \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,kabdrv1,\
+$(eval $(call gb_Library_use_libraries,kabdrv1,\
 	cppu \
 	cppuhelper \
 	sal \

connectivity/Library_macab1.mk

@@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,macab1))
 
 $(eval $(call gb_Library_set_componentfile,macab1,connectivity/source/drivers/macab/macab1))
 
-$(eval $(call gb_Library_add_api,macab1,\
+$(eval $(call gb_Library_use_api,macab1,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,macab1,\
+$(eval $(call gb_Library_use_libraries,macab1,\
 	cppu \
 	cppuhelper \
 	dbtools \

connectivity/Library_macabdrv1.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,macabdrv1))
 
-$(eval $(call gb_Library_add_api,macabdrv1,\
+$(eval $(call gb_Library_use_api,macabdrv1,\
 	offapi \
 	udkapi \
 ))
@@ -37,7 +37,7 @@ $(eval $(call gb_Library_add_libs,macabdrv1,\
 	-framework AddressBook \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,macabdrv1,\
+$(eval $(call gb_Library_use_libraries,macabdrv1,\
 	comphelper \
 	cppu \
 	cppuhelper \

connectivity/Library_mozab.mk

@@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,mozab2,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,mozab2,\
+$(eval $(call gb_Library_use_api,mozab2,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,mozab2,\
+$(eval $(call gb_Library_use_libraries,mozab2,\
 	cppu \
 	cppuhelper \
 	dbtools \

connectivity/Library_mozabdrv.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,mozabdrv))
 
-$(eval $(call gb_Library_add_package_headers,calc,\
+$(eval $(call gb_Library_use_packages,calc,\
 	connectivity_generated \
 ))
 
@@ -39,12 +39,12 @@ $(eval $(call gb_Library_set_include,mozabdrv,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,mozabdrv,\
+$(eval $(call gb_Library_use_api,mozabdrv,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,mozabdrv,\
+$(eval $(call gb_Library_use_libraries,mozabdrv,\
 	comphelper \
 	cppu \
 	cppuhelper \

connectivity/Library_mozbootstrap.mk

@@ -38,12 +38,12 @@ $(eval $(call gb_Library_set_include,mozbootstrap,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,mozbootstrap,\
+$(eval $(call gb_Library_use_api,mozbootstrap,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,mozbootstrap,\
+$(eval $(call gb_Library_use_libraries,mozbootstrap,\
 	comphelper \
 	cppu \
 	cppuhelper \

connectivity/Library_mysql.mk

@@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,mysql))
 
 $(eval $(call gb_Library_set_componentfile,mysql,connectivity/source/drivers/mysql/mysql))
 
-$(eval $(call gb_Library_add_api,mysql,\
+$(eval $(call gb_Library_use_api,mysql,\
 	offapi \
 	udkapi \
 ))
@@ -39,7 +39,7 @@ $(eval $(call gb_Library_set_include,mysql,\
 	-I$(SRCDIR)/connectivity/source/inc \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,mysql,\
+$(eval $(call gb_Library_use_libraries,mysql,\
 	cppu \
 	cppuhelper \
 	sal \

connectivity/Library_odbc.mk

@@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,odbc))
 
 $(eval $(call gb_Library_set_componentfile,odbc,connectivity/source/drivers/odbc/odbc))
 
-$(eval $(call gb_Library_add_api,odbc,\
+$(eval $(call gb_Library_use_api,odbc,\
 	offapi \
 	udkapi \
 ))
@@ -42,7 +42,7 @@ $(eval $(call gb_Library_set_include,odbc,\
 
 $(eval $(call gb_Library_use_external,odbc,odbc_headers))
 
-$(eval $(call gb_Library_add_linked_libs,odbc,\
+$(eval $(call gb_Library_use_libraries,odbc,\
 	odbcbase \
 	cppu \
 	cppuhelper \

connectivity/Library_odbcbase.mk

@@ -27,11 +27,11 @@
 
 $(eval $(call gb_Library_Library,odbcbase))
 
-$(eval $(call gb_Library_add_package_headers,calc,\
+$(eval $(call gb_Library_use_packages,calc,\
 	connectivity_generated \
 ))
 
-$(eval $(call gb_Library_add_api,odbcbase,\
+$(eval $(call gb_Library_use_api,odbcbase,\
 	offapi \
 	udkapi \
 ))
@@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_defs,odbcbase,\
 
 $(eval $(call gb_Library_use_external,odbcbase,odbc_headers))
 
-$(eval $(call gb_Library_add_linked_libs,odbcbase,\
+$(eval $(call gb_Library_use_libraries,odbcbase,\
 	cppu \
 	cppuhelper \
 	sal \

connectivity/Library_postgresql-sdbc-impl.mk

@@ -33,12 +33,12 @@ $(eval $(call gb_Library_add_defs,postgresql-sdbc-impl,\
 	-DPQ_SDBC_MICRO=2 \
 ))
 
-$(eval $(call gb_Library_add_api,postgresql-sdbc-impl,\
+$(eval $(call gb_Library_use_api,postgresql-sdbc-impl,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,postgresql-sdbc-impl,\
+$(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\
 	cppu \
 	cppuhelper \
 	sal \

connectivity/Library_postgresql-sdbc.mk

@@ -33,12 +33,12 @@ $(eval $(call gb_Library_add_defs,postgresql-sdbc,\
 	-DPQ_SDBC_MICRO=2 \
 ))
 
-$(eval $(call gb_Library_add_api,postgresql-sdbc,\
+$(eval $(call gb_Library_use_api,postgresql-sdbc,\
 	offapi \
 	udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,postgresql-sdbc,\
+$(eval $(call gb_Library_use_libraries,postgresql-sdbc,\
 	cppu \
 	cppuhelper \
 	sal \

connectivity/Library_sdbc2.mk

@@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,sdbc2))
 $(eval $(call gb_Library_set_componentfile,sdbc2,connectivity/source/manager/sdbc2))
 
 
-$(eval $(call gb_Library_add_api,sdbc2,\
+$(eval $(call gb_Library_use_api,sdbc2,\
 	offapi \
 	udkapi \
 ))
@@ -40,7 +40,7 @@ $(eval $(call gb_Library_set_include,sdbc2,\
 	-I$(SRCDIR)/connectivity/inc \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,sdbc2,\
+$(eval $(call gb_Library_use_libraries,sdbc2,\
 	cppu \
 	cppuhelper \
 	comphelper \