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)
---
 dtrans/Library_dnd.mk         | 6 +++---
 dtrans/Library_dtrans.mk      | 4 ++--
 dtrans/Library_ftransl.mk     | 6 +++---
 dtrans/Library_mcnttype.mk    | 6 +++---
 dtrans/Library_sysdtrans.mk   | 6 +++---
 dtrans/StaticLibrary_dtobj.mk | 2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'dtrans')

diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk
index 141d15b3a934..f567a7435793 100644
--- a/dtrans/Library_dnd.mk
+++ b/dtrans/Library_dnd.mk
@@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,dnd,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,dnd,\
+$(eval $(call gb_Library_use_api,dnd,\
 	udkapi \
 	offapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,dnd,\
+$(eval $(call gb_Library_use_libraries,dnd,\
 	advapi32 \
 	cppu \
 	cppuhelper \
@@ -53,7 +53,7 @@ $(eval $(call gb_Library_add_linked_libs,dnd,\
 	$(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Library_add_linked_static_libs,dnd,\
+$(eval $(call gb_Library_use_static_libraries,dnd,\
 	dtobj \
 ))
 
diff --git a/dtrans/Library_dtrans.mk b/dtrans/Library_dtrans.mk
index ca7090718b39..a043b5849325 100644
--- a/dtrans/Library_dtrans.mk
+++ b/dtrans/Library_dtrans.mk
@@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,dtrans,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,dtrans,\
+$(eval $(call gb_Library_use_api,dtrans,\
 	udkapi \
 	offapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,dtrans,\
+$(eval $(call gb_Library_use_libraries,dtrans,\
 	cppu \
 	cppuhelper \
 	sal \
diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk
index 706cbd02aa9e..97825315ba44 100644
--- a/dtrans/Library_ftransl.mk
+++ b/dtrans/Library_ftransl.mk
@@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,ftransl,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,ftransl,\
+$(eval $(call gb_Library_use_api,ftransl,\
 	udkapi \
 	offapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,ftransl,\
+$(eval $(call gb_Library_use_libraries,ftransl,\
 	advapi32 \
 	cppu \
 	cppuhelper \
@@ -50,7 +50,7 @@ $(eval $(call gb_Library_add_linked_libs,ftransl,\
 	$(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Library_add_linked_static_libs,ftransl,\
+$(eval $(call gb_Library_use_static_libraries,ftransl,\
 	dtobj \
 ))
 
diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk
index 717baa7d2100..4baffdcff580 100644
--- a/dtrans/Library_mcnttype.mk
+++ b/dtrans/Library_mcnttype.mk
@@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,mcnttype,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,mcnttype,\
+$(eval $(call gb_Library_use_api,mcnttype,\
 	udkapi \
 	offapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,mcnttype,\
+$(eval $(call gb_Library_use_libraries,mcnttype,\
 	cppu \
 	cppuhelper \
 	sal \
@@ -53,7 +53,7 @@ $(eval $(call gb_Library_add_exception_objects,mcnttype,\
 ))
 
 ifeq ($(GUI),WNT)
-$(eval $(call gb_Library_add_linked_libs,mcnttype,\
+$(eval $(call gb_Library_use_libraries,mcnttype,\
 	uwinapi \
 ))
 endif
diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk
index 85076757126b..270bbc0dbf2c 100644
--- a/dtrans/Library_sysdtrans.mk
+++ b/dtrans/Library_sysdtrans.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Library_set_include,sysdtrans,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,sysdtrans,\
+$(eval $(call gb_Library_use_api,sysdtrans,\
 	udkapi \
 	offapi \
 ))
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_defs,sysdtrans,\
 	-DUNICODE \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,sysdtrans,\
+$(eval $(call gb_Library_use_libraries,sysdtrans,\
 	advapi32 \
 	cppu \
 	cppuhelper \
@@ -58,7 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,sysdtrans,\
 	$(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Library_add_linked_static_libs,sysdtrans,\
+$(eval $(call gb_Library_use_static_libraries,sysdtrans,\
 	dtobj \
 ))
 
diff --git a/dtrans/StaticLibrary_dtobj.mk b/dtrans/StaticLibrary_dtobj.mk
index 8a6981491229..200edcb0e67f 100644
--- a/dtrans/StaticLibrary_dtobj.mk
+++ b/dtrans/StaticLibrary_dtobj.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_set_include,dtobj,\
 	-I$(SRCDIR)/solenv/inc \
 ))
 
-$(eval $(call gb_StaticLibrary_add_api,dtobj,\
+$(eval $(call gb_StaticLibrary_use_api,dtobj,\
 	udkapi \
 	offapi \
 ))
-- 
cgit