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)

6 files changed, 16 insertions, 16 deletions

diff --git a/writerperfect/Library_cdrimport.mk b/writerperfect/Library_cdrimport.mk
index 8688f8a86b11..a6b05b03d557 100644
--- a/writerperfect/Library_cdrimport.mk
+++ b/writerperfect/Library_cdrimport.mk
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,cdrimport,\
     -I$(SRCDIR)/writerperfect/source \
 ))
 
-$(eval $(call gb_Library_add_api,cdrimport,\
+$(eval $(call gb_Library_use_api,cdrimport,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,cdrimport,\
+$(eval $(call gb_Library_use_libraries,cdrimport,\
 	cppu \
 	cppuhelper \
 	sal \
@@ -51,7 +51,7 @@ $(eval $(call gb_Library_add_linked_libs,cdrimport,\
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Library_add_linked_static_libs,cdrimport,\
+$(eval $(call gb_Library_use_static_libraries,cdrimport,\
 	writerperfect \
 ))
 
diff --git a/writerperfect/Library_msworks.mk b/writerperfect/Library_msworks.mk
index a958a343006d..7efb9944a24d 100644
--- a/writerperfect/Library_msworks.mk
+++ b/writerperfect/Library_msworks.mk
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,msworks,\
     -I$(SRCDIR)/writerperfect/source \
 ))
 
-$(eval $(call gb_Library_add_api,msworks,\
+$(eval $(call gb_Library_use_api,msworks,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,msworks,\
+$(eval $(call gb_Library_use_libraries,msworks,\
 	cppu \
 	cppuhelper \
 	sal \
@@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_linked_libs,msworks,\
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Library_add_linked_static_libs,msworks,\
+$(eval $(call gb_Library_use_static_libraries,msworks,\
 	writerperfect \
 ))
 
diff --git a/writerperfect/Library_visioimport.mk b/writerperfect/Library_visioimport.mk
index b36d95e2360e..7db2b04bbd9e 100644
--- a/writerperfect/Library_visioimport.mk
+++ b/writerperfect/Library_visioimport.mk
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,visioimport,\
     -I$(SRCDIR)/writerperfect/source \
 ))
 
-$(eval $(call gb_Library_add_api,visioimport,\
+$(eval $(call gb_Library_use_api,visioimport,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,visioimport,\
+$(eval $(call gb_Library_use_libraries,visioimport,\
 	cppu \
 	cppuhelper \
 	sal \
@@ -51,7 +51,7 @@ $(eval $(call gb_Library_add_linked_libs,visioimport,\
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Library_add_linked_static_libs,visioimport,\
+$(eval $(call gb_Library_use_static_libraries,visioimport,\
 	writerperfect \
 ))
 
diff --git a/writerperfect/Library_wpft.mk b/writerperfect/Library_wpft.mk
index 853536fed268..113cb17fad60 100644
--- a/writerperfect/Library_wpft.mk
+++ b/writerperfect/Library_wpft.mk
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,wpft,\
     -I$(SRCDIR)/writerperfect/source \
 ))
 
-$(eval $(call gb_Library_add_api,wpft,\
+$(eval $(call gb_Library_use_api,wpft,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,wpft,\
+$(eval $(call gb_Library_use_libraries,wpft,\
 	cppu \
 	cppuhelper \
 	vcl \
@@ -54,7 +54,7 @@ $(eval $(call gb_Library_add_linked_libs,wpft,\
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Library_add_linked_static_libs,wpft,\
+$(eval $(call gb_Library_use_static_libraries,wpft,\
 	writerperfect \
 ))
 
diff --git a/writerperfect/Library_wpgimport.mk b/writerperfect/Library_wpgimport.mk
index 43a0064d3ef7..b2cbd66e238a 100644
--- a/writerperfect/Library_wpgimport.mk
+++ b/writerperfect/Library_wpgimport.mk
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,wpgimport,\
     -I$(SRCDIR)/writerperfect/source \
 ))
 
-$(eval $(call gb_Library_add_api,wpgimport,\
+$(eval $(call gb_Library_use_api,wpgimport,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,wpgimport,\
+$(eval $(call gb_Library_use_libraries,wpgimport,\
 	cppu \
 	cppuhelper \
 	sal \
@@ -51,7 +51,7 @@ $(eval $(call gb_Library_add_linked_libs,wpgimport,\
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Library_add_linked_static_libs,wpgimport,\
+$(eval $(call gb_Library_use_static_libraries,wpgimport,\
 	writerperfect \
 ))
 
diff --git a/writerperfect/StaticLibrary_writerperfect.mk b/writerperfect/StaticLibrary_writerperfect.mk
index 4ff3e51acad3..8a0ed602b0ce 100644
--- a/writerperfect/StaticLibrary_writerperfect.mk
+++ b/writerperfect/StaticLibrary_writerperfect.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_StaticLibrary_use_externals,writerperfect,\
 	wpg \
 ))
 
-$(eval $(call gb_StaticLibrary_add_api,writerperfect,\
+$(eval $(call gb_StaticLibrary_use_api,writerperfect,\
     offapi \
     udkapi \
 ))