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)
---
 unoxml/JunitTest_unordf_complex.mk | 2 +-
 unoxml/JunitTest_unoxml_complex.mk | 2 +-
 unoxml/Library_unordf.mk           | 4 ++--
 unoxml/Library_unoxml.mk           | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'unoxml')

diff --git a/unoxml/JunitTest_unordf_complex.mk b/unoxml/JunitTest_unordf_complex.mk
index bd0c12fa2e41..7d2f47b22b4d 100644
--- a/unoxml/JunitTest_unordf_complex.mk
+++ b/unoxml/JunitTest_unordf_complex.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_JunitTest_set_defs,unordf_complex,\
     -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/unoxml/qa/complex/unoxml/testdocuments \
 ))
 
-$(eval $(call gb_JunitTest_add_jars,unordf_complex,\
+$(eval $(call gb_JunitTest_use_jars,unordf_complex,\
     $(OUTDIR)/bin/OOoRunner.jar \
     $(OUTDIR)/bin/ridl.jar \
     $(OUTDIR)/bin/test.jar \
diff --git a/unoxml/JunitTest_unoxml_complex.mk b/unoxml/JunitTest_unoxml_complex.mk
index 5a5cd4ffa8e0..3f1f679ecda4 100644
--- a/unoxml/JunitTest_unoxml_complex.mk
+++ b/unoxml/JunitTest_unoxml_complex.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_JunitTest_set_defs,unoxml_complex,\
     -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/unoxml/qa/complex/unoxml/testdocuments \
 ))
 
-$(eval $(call gb_JunitTest_add_jars,unoxml_complex,\
+$(eval $(call gb_JunitTest_use_jars,unoxml_complex,\
     $(OUTDIR)/bin/OOoRunner.jar \
     $(OUTDIR)/bin/ridl.jar \
     $(OUTDIR)/bin/test.jar \
diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk
index cb21c0674fe6..a14ec7846007 100644
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,unordf,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,unordf,\
+$(eval $(call gb_Library_use_api,unordf,\
 	udkapi \
 	offapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,unordf,\
+$(eval $(call gb_Library_use_libraries,unordf,\
     comphelper \
     cppuhelper \
     cppu \
diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk
index 8014bace26cb..b744d00eaab5 100644
--- a/unoxml/Library_unoxml.mk
+++ b/unoxml/Library_unoxml.mk
@@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,unoxml,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,unoxml,\
+$(eval $(call gb_Library_use_api,unoxml,\
 	udkapi \
 	offapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,unoxml,\
+$(eval $(call gb_Library_use_libraries,unoxml,\
     ucbhelper \
     sax \
     comphelper \
-- 
cgit v1.2.3