From c923f7d2c210dc7846767fc0ac6ece2a0d7812a8 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Sat, 7 Apr 2012 23:22:08 +0200
Subject: 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)
---
 unotest/Jar_test-tools.mk                | 2 +-
 unotest/Jar_test.mk                      | 4 ++--
 unotest/Library_unoexceptionprotector.mk | 4 ++--
 unotest/Library_unotest.mk               | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'unotest')

diff --git a/unotest/Jar_test-tools.mk b/unotest/Jar_test-tools.mk
index 1088d5d4905b..f68b5a2931e4 100644
--- a/unotest/Jar_test-tools.mk
+++ b/unotest/Jar_test-tools.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Jar_set_jarclasspath,test-tools,\
 	unoil.jar \
 ))
 
-$(eval $(call gb_Jar_add_jars,test-tools,\
+$(eval $(call gb_Jar_use_jars,test-tools,\
 	$(OUTDIR)/bin/juh.jar \
 	$(OUTDIR)/bin/ridl.jar \
 	$(OUTDIR)/bin/unoil.jar \
diff --git a/unotest/Jar_test.mk b/unotest/Jar_test.mk
index eca653f26629..6c4e4aa78692 100644
--- a/unotest/Jar_test.mk
+++ b/unotest/Jar_test.mk
@@ -33,14 +33,14 @@ $(eval $(call gb_Jar_set_jarclasspath,test,\
 	unoil.jar \
 ))
 
-$(eval $(call gb_Jar_add_jars,test,\
+$(eval $(call gb_Jar_use_jars,test,\
 	$(OUTDIR)/bin/juh.jar \
 	$(OUTDIR)/bin/ridl.jar \
 	$(OUTDIR)/bin/unoil.jar \
 	$(OUTDIR)/bin/OOoRunner.jar \
 ))
 
-$(eval $(call gb_Jar_add_system_jars,test,\
+$(eval $(call gb_Jar_use_system_jars,test,\
 	$(OOO_JUNIT_JAR) \
 ))
 
diff --git a/unotest/Library_unoexceptionprotector.mk b/unotest/Library_unoexceptionprotector.mk
index 3324f3e416ce..c23b1959ac3b 100644
--- a/unotest/Library_unoexceptionprotector.mk
+++ b/unotest/Library_unoexceptionprotector.mk
@@ -29,12 +29,12 @@ $(eval $(call gb_Library_Library,unoexceptionprotector))
 
 $(eval $(call gb_Library_add_package_headers,unoexceptionprotector,unotest_inc))
 
-$(eval $(call gb_Library_add_api,unoexceptionprotector,\
+$(eval $(call gb_Library_use_api,unoexceptionprotector,\
 	udkapi \
 	offapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,unoexceptionprotector,\
+$(eval $(call gb_Library_use_libraries,unoexceptionprotector,\
 	cppu \
 	cppuhelper \
 	sal \
diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk
index aad6abdbceec..96ad171aad80 100644
--- a/unotest/Library_unotest.mk
+++ b/unotest/Library_unotest.mk
@@ -33,12 +33,12 @@ $(eval $(call gb_Library_add_defs,unotest,\
 	-DOOO_DLLIMPLEMENTATION_UNOTEST \
 ))
 
-$(eval $(call gb_Library_add_api,unotest,\
+$(eval $(call gb_Library_use_api,unotest,\
 	udkapi \
 	offapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,unotest,\
+$(eval $(call gb_Library_use_libraries,unotest,\
 	comphelper \
 	cppu \
 	cppuhelper \
-- 
cgit v1.2.3