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)
---
 vcl/Executable_kdefilepicker.mk |  2 +-
 vcl/Library_desktop_detector.mk |  6 +++---
 vcl/Library_vcl.mk              | 22 +++++++++++-----------
 vcl/Library_vclplug_gen.mk      |  6 +++---
 vcl/Library_vclplug_gtk.mk      |  6 +++---
 vcl/Library_vclplug_gtk3.mk     |  8 ++++----
 vcl/Library_vclplug_kde.mk      |  6 +++---
 vcl/Library_vclplug_kde4.mk     |  8 ++++----
 vcl/Library_vclplug_svp.mk      |  8 ++++----
 vcl/StaticLibrary_headless.mk   |  2 +-
 vcl/StaticLibrary_vclmain.mk    |  2 +-
 11 files changed, 38 insertions(+), 38 deletions(-)

(limited to 'vcl')

diff --git a/vcl/Executable_kdefilepicker.mk b/vcl/Executable_kdefilepicker.mk
index 2bfa978d6b3e..9e185e155544 100644
--- a/vcl/Executable_kdefilepicker.mk
+++ b/vcl/Executable_kdefilepicker.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Executable_add_defs,kdefilepicker,\
 	$(KDE_CFLAGS) \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,kdefilepicker,\
+$(eval $(call gb_Executable_use_libraries,kdefilepicker,\
 	sal \
 	$(gb_STDLIBS) \
 ))
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index 8b1054dc4b5b..c6ab1adeadcf 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -40,12 +40,12 @@ $(eval $(call gb_Library_add_defs,desktop_detector,\
     -DDESKTOP_DETECTOR_IMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_add_api,desktop_detector,\
+$(eval $(call gb_Library_use_api,desktop_detector,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,desktop_detector,\
+$(eval $(call gb_Library_use_libraries,desktop_detector,\
     vcl \
     tl \
     utl \
@@ -76,7 +76,7 @@ $(eval $(call gb_Library_add_exception_objects,desktop_detector,\
 ))
 
 ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,desktop_detector,\
+$(eval $(call gb_Library_use_libraries,desktop_detector,\
     dl \
     m \
     pthread \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 730fdd5b3568..d37a5bb7e80a 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -44,7 +44,7 @@ endif
 
 $(eval $(call gb_Library_add_package_headers,vcl,vcl_inc))
 
-$(eval $(call gb_Library_add_custom_headers,vcl,vcl/generic/fontmanager))
+$(eval $(call gb_Library_use_custom_headers,vcl,vcl/generic/fontmanager))
 
 $(eval $(call gb_Library_set_include,vcl,\
     $$(INCLUDE) \
@@ -58,12 +58,12 @@ $(eval $(call gb_Library_add_defs,vcl,\
     -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \
 ))
 
-$(eval $(call gb_Library_add_api,vcl,\
+$(eval $(call gb_Library_use_api,vcl,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,vcl,\
+$(eval $(call gb_Library_use_libraries,vcl,\
     tl \
     utl \
     sot \
@@ -79,7 +79,7 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
 ))
 
 ifneq ($(OS),IOS)
-$(eval $(call gb_Library_add_linked_libs,vcl,\
+$(eval $(call gb_Library_use_libraries,vcl,\
     jvmaccess \
 ))
 endif
@@ -288,7 +288,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/generic/glyphs/graphite_serverfont \
 ))
 else
-$(eval $(call gb_Library_add_linked_libs,vcl,\
+$(eval $(call gb_Library_use_libraries,vcl,\
     version \
 ))
 endif
@@ -383,7 +383,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/aqua/source/window/salmenu \
     vcl/aqua/source/window/salobj \
 ))
-$(eval $(call gb_Library_add_linked_libs,vcl,\
+$(eval $(call gb_Library_use_libraries,vcl,\
     AppleRemote \
 ))
 $(eval $(call gb_Library_use_externals,vcl,\
@@ -464,7 +464,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 	$(vcl_headless_code) \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,vcl,\
+$(eval $(call gb_Library_use_libraries,vcl,\
 	basebmp \
 ))
 
@@ -495,7 +495,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 	$(vcl_headless_code) \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,vcl,\
+$(eval $(call gb_Library_use_libraries,vcl,\
 	basebmp \
 ))
 
@@ -563,7 +563,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/win/source/window/salobj \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,vcl,\
+$(eval $(call gb_Library_use_libraries,vcl,\
     advapi32 \
     gdi32 \
     gdiplus \
@@ -588,7 +588,7 @@ endif
 endif
 
 ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,vcl,\
+$(eval $(call gb_Library_use_libraries,vcl,\
     dl \
     m \
     pthread \
@@ -608,7 +608,7 @@ endif
 endif
 
 ifneq ($(OS),IOS)
-$(eval $(call gb_Library_add_linked_static_libs,vcl,\
+$(eval $(call gb_Library_use_static_libraries,vcl,\
     vclmain \
 ))
 endif
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 8407c265a51c..2f42059e8d43 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,vclplug_gen,\
     -I$(SRCDIR)/solenv/inc \
 ))
 
-$(eval $(call gb_Library_add_api,vclplug_gen,\
+$(eval $(call gb_Library_use_api,vclplug_gen,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
+$(eval $(call gb_Library_use_libraries,vclplug_gen,\
     vcl \
     tl \
     utl \
@@ -173,7 +173,7 @@ $(eval $(call gb_Library_add_libs,vclplug_gen,\
 ))
 
 ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
+$(eval $(call gb_Library_use_libraries,vclplug_gen,\
     dl \
     m \
     pthread \
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index 201daa346c86..658c72dd35d9 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -41,12 +41,12 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk,\
     -DLIBO_VERSION=\"$(UPD)$(LAST_MINOR)\" \
 ))
 
-$(eval $(call gb_Library_add_api,vclplug_gtk,\
+$(eval $(call gb_Library_use_api,vclplug_gtk,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\
+$(eval $(call gb_Library_use_libraries,vclplug_gtk,\
     vclplug_gen \
     vcl \
     tl \
@@ -114,7 +114,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
 endif
 
 ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\
+$(eval $(call gb_Library_use_libraries,vclplug_gtk,\
     dl \
     m \
     pthread \
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 0cc3c2335378..29bcf0bd9708 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk3,\
     -DLIBO_VERSION=\"$(UPD)$(LAST_MINOR)\" \
 ))
 
-$(eval $(call gb_Library_add_api,vclplug_gtk3,\
+$(eval $(call gb_Library_use_api,vclplug_gtk3,\
     offapi \
     udkapi \
 ))
@@ -58,7 +58,7 @@ $(eval $(call gb_Library_add_libs,vclplug_gtk3,\
     $$(GTHREAD_LIBS) \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,vclplug_gtk3,\
+$(eval $(call gb_Library_use_libraries,vclplug_gtk3,\
     vcl \
     tl \
     utl \
@@ -113,12 +113,12 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
     vcl/unx/gtk3/window/gtk3gtkobject \
 ))
 
-$(eval $(call gb_Library_add_linked_static_libs,vclplug_gtk3,\
+$(eval $(call gb_Library_use_static_libraries,vclplug_gtk3,\
     headless \
 ))
 
 ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,vclplug_gtk3,\
+$(eval $(call gb_Library_use_libraries,vclplug_gtk3,\
     dl \
     m \
     pthread \
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index 5cc8df63c125..fb0a0bd8192f 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Library_add_defs,vclplug_kde,\
     -DVCLPLUG_KDE_IMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_add_api,vclplug_kde,\
+$(eval $(call gb_Library_use_api,vclplug_kde,\
     offapi \
     udkapi \
 ))
@@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_libs,vclplug_kde,\
     $$(KDE_LIBS) \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
+$(eval $(call gb_Library_use_libraries,vclplug_kde,\
     vclplug_gen \
     vcl \
     tl \
@@ -95,7 +95,7 @@ $(eval $(call gb_Library_add_cxxflags,vclplug_kde,\
 $(eval $(call gb_Library_set_warnings_not_errors,vclplug_kde))
 
 ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
+$(eval $(call gb_Library_use_libraries,vclplug_kde,\
     dl \
     m \
     pthread \
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 6c5fb1b46da4..a529bf32de31 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -28,7 +28,7 @@
 
 $(eval $(call gb_Library_Library,vclplug_kde4))
 
-$(eval $(call gb_Library_add_custom_headers,vclplug_kde4,vcl/unx/kde4))
+$(eval $(call gb_Library_use_custom_headers,vclplug_kde4,vcl/unx/kde4))
 
 $(eval $(call gb_Library_set_include,vclplug_kde4,\
     $$(INCLUDE) \
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_defs,vclplug_kde4,\
     -DVCLPLUG_KDE4_IMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_add_api,vclplug_kde4,\
+$(eval $(call gb_Library_use_api,vclplug_kde4,\
     offapi \
     udkapi \
 ))
@@ -54,7 +54,7 @@ $(eval $(call gb_Library_add_libs,vclplug_kde4,\
     -lkio -lkfile \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
+$(eval $(call gb_Library_use_libraries,vclplug_kde4,\
     vclplug_gen \
     vcl \
     tl \
@@ -99,7 +99,7 @@ $(eval $(call gb_Library_add_cxxflags,vclplug_kde4,\
 ))
 
 ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
+$(eval $(call gb_Library_use_libraries,vclplug_kde4,\
     dl \
     m \
     pthread \
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index e0c5a00a0123..9d93a6ed5afb 100644
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -42,12 +42,12 @@ $(eval $(call gb_Library_add_defs,vclplug_svp,\
     -DVCLPLUG_SVP_IMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_add_api,vclplug_svp,\
+$(eval $(call gb_Library_use_api,vclplug_svp,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,vclplug_svp,\
+$(eval $(call gb_Library_use_libraries,vclplug_svp,\
     vcl \
     tl \
     utl \
@@ -76,12 +76,12 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_svp,\
     vcl/headless/svpdata \
 ))
 
-$(eval $(call gb_Library_add_linked_static_libs,vclplug_svp,\
+$(eval $(call gb_Library_use_static_libraries,vclplug_svp,\
     headless \
 ))
 
 ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,vclplug_svp,\
+$(eval $(call gb_Library_use_libraries,vclplug_svp,\
     dl \
     m \
     pthread \
diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk
index bea6fede0b68..ffa71c19db31 100644
--- a/vcl/StaticLibrary_headless.mk
+++ b/vcl/StaticLibrary_headless.mk
@@ -28,7 +28,7 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,headless))
 
-$(eval $(call gb_StaticLibrary_add_api,headless,\
+$(eval $(call gb_StaticLibrary_use_api,headless,\
     offapi \
     udkapi \
 ))
diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk
index eabd8ea78e45..b816de636f62 100644
--- a/vcl/StaticLibrary_vclmain.mk
+++ b/vcl/StaticLibrary_vclmain.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_StaticLibrary_set_include,vclmain,\
     -I$(SRCDIR)/solenv/inc \
 ))
 
-$(eval $(call gb_StaticLibrary_add_api,vclmain,\
+$(eval $(call gb_StaticLibrary_use_api,vclmain,\
     offapi \
     udkapi \
 ))
-- 
cgit