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)
---
 desktop/Executable_crashrep.com.mk | 2 +-
 desktop/Executable_officeloader.mk | 2 +-
 desktop/Executable_oosplash.mk     | 4 ++--
 desktop/Executable_quickstart.mk   | 4 ++--
 desktop/Executable_sbase.mk        | 2 +-
 desktop/Executable_scalc.mk        | 2 +-
 desktop/Executable_sdraw.mk        | 2 +-
 desktop/Executable_simpress.mk     | 2 +-
 desktop/Executable_smath.mk        | 2 +-
 desktop/Executable_soffice.bin.mk  | 4 ++--
 desktop/Executable_soffice.mk      | 4 ++--
 desktop/Executable_sweb.mk         | 2 +-
 desktop/Executable_swriter.mk      | 2 +-
 desktop/Executable_unoinfo.mk      | 2 +-
 desktop/Executable_unopkg.bin.mk   | 2 +-
 desktop/Executable_unopkg.mk       | 2 +-
 desktop/Library_deployment.mk      | 6 +++---
 desktop/Library_deploymentgui.mk   | 6 +++---
 desktop/Library_deploymentmisc.mk  | 4 ++--
 desktop/Library_migrationoo2.mk    | 4 ++--
 desktop/Library_migrationoo3.mk    | 4 ++--
 desktop/Library_offacc.mk          | 4 ++--
 desktop/Library_sofficeapp.mk      | 4 ++--
 desktop/Library_spl.mk             | 4 ++--
 desktop/Library_spl_unx.mk         | 4 ++--
 desktop/Library_unopkgapp.mk       | 4 ++--
 26 files changed, 42 insertions(+), 42 deletions(-)

(limited to 'desktop')

diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk
index d7f4d73f8926..96ed6f76cc60 100644
--- a/desktop/Executable_crashrep.com.mk
+++ b/desktop/Executable_crashrep.com.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_Executable_add_defs,crashrep_com,\
     $(LFS_CFLAGS) \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,crashrep_com,\
+$(eval $(call gb_Executable_use_libraries,crashrep_com,\
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk
index f1801e6af4b3..e3a766f2dd27 100644
--- a/desktop/Executable_officeloader.mk
+++ b/desktop/Executable_officeloader.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Executable_set_include,officeloader,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,officeloader,\
+$(eval $(call gb_Executable_use_libraries,officeloader,\
     sal \
     $(gb_STDLIBS) \
 ))
diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk
index 9273b84bc66c..b8919d5f4a8b 100644
--- a/desktop/Executable_oosplash.mk
+++ b/desktop/Executable_oosplash.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_set_include,oosplash,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,oosplash,\
+$(eval $(call gb_Executable_use_libraries,oosplash,\
     sal \
     $(gb_STDLIBS) \
 ))
@@ -80,7 +80,7 @@ endif
 
 ifeq ($(OS),SOLARIS)
 
-$(eval $(call gb_Executable_add_linked_libs,oosplash,\
+$(eval $(call gb_Executable_use_libraries,oosplash,\
     -lsocket \
 ))
 
diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk
index 7da506601cd9..b3fbde1eaaf1 100644
--- a/desktop/Executable_quickstart.mk
+++ b/desktop/Executable_quickstart.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_set_include,quickstart,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,quickstart,\
+$(eval $(call gb_Executable_use_libraries,quickstart,\
     comdlg32 \
     gdi32 \
     ole32 \
@@ -44,7 +44,7 @@ $(eval $(call gb_Executable_add_linked_libs,quickstart,\
 
 ifeq ($(COM),GCC)
 
-$(eval $(call gb_Executable_add_linked_libs,quickstart,\
+$(eval $(call gb_Executable_use_libraries,quickstart,\
     uuid \
 ))
 
diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk
index 098f8c2c287d..375cba33385f 100644
--- a/desktop/Executable_sbase.mk
+++ b/desktop/Executable_sbase.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,sbase,\
     -DUNICODE \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,sbase,\
+$(eval $(call gb_Executable_use_libraries,sbase,\
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk
index 290e8804d662..ce90099a532b 100644
--- a/desktop/Executable_scalc.mk
+++ b/desktop/Executable_scalc.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,scalc,\
     -DUNICODE \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,scalc,\
+$(eval $(call gb_Executable_use_libraries,scalc,\
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk
index 2e57495c2360..4642445173b4 100644
--- a/desktop/Executable_sdraw.mk
+++ b/desktop/Executable_sdraw.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,sdraw,\
     -DUNICODE \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,sdraw,\
+$(eval $(call gb_Executable_use_libraries,sdraw,\
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk
index 926ad57febd8..c3026435e3f4 100644
--- a/desktop/Executable_simpress.mk
+++ b/desktop/Executable_simpress.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,simpress,\
     -DUNICODE \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,simpress,\
+$(eval $(call gb_Executable_use_libraries,simpress,\
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk
index ed1b460c3991..4c7c4afb8232 100644
--- a/desktop/Executable_smath.mk
+++ b/desktop/Executable_smath.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,smath,\
     -DUNICODE \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,smath,\
+$(eval $(call gb_Executable_use_libraries,smath,\
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index e0c58912bc89..59b9f085548e 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_Executable_set_include,$(sofficebin),\
     -I$(SRCDIR)/desktop/source/inc \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,$(sofficebin),\
+$(eval $(call gb_Executable_use_libraries,$(sofficebin),\
     sal \
     sofficeapp \
     $(gb_STDLIBS) \
@@ -52,7 +52,7 @@ $(eval $(call gb_Executable_add_cobjects,$(sofficebin),\
 
 ifeq ($(OS),WNT)
 
-$(eval $(call gb_Executable_add_linked_static_libs,$(sofficebin),\
+$(eval $(call gb_Executable_use_static_libraries,$(sofficebin),\
     ooopathutils \
     winextendloaderenv \
 ))
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index 9ca4d3a0345c..18efbbdf8770 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -29,14 +29,14 @@ $(eval $(call gb_Executable_Executable,soffice))
 
 $(eval $(call gb_Executable_set_targettype_gui,soffice,YES))
 
-$(eval $(call gb_Executable_add_linked_libs,soffice,\
+$(eval $(call gb_Executable_use_libraries,soffice,\
     advapi32 \
     shell32 \
     shlwapi \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Executable_add_linked_static_libs,soffice,\
+$(eval $(call gb_Executable_use_static_libraries,soffice,\
     ooopathutils \
     winextendloaderenv \
 ))
diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk
index 858bc7a6a8e5..870cf7d6c86a 100644
--- a/desktop/Executable_sweb.mk
+++ b/desktop/Executable_sweb.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,sweb,\
     -DUNICODE \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,sweb,\
+$(eval $(call gb_Executable_use_libraries,sweb,\
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk
index f1e0d65d6a6a..acd299b641ca 100644
--- a/desktop/Executable_swriter.mk
+++ b/desktop/Executable_swriter.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,swriter,\
     -DUNICODE \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,swriter,\
+$(eval $(call gb_Executable_use_libraries,swriter,\
     $(gb_STDLIBS) \
 ))
 
diff --git a/desktop/Executable_unoinfo.mk b/desktop/Executable_unoinfo.mk
index bdb634239530..40db3a0bbb6e 100644
--- a/desktop/Executable_unoinfo.mk
+++ b/desktop/Executable_unoinfo.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Executable_set_include,unoinfo,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Executable_add_linked_static_libs,unoinfo,\
+$(eval $(call gb_Executable_use_static_libraries,unoinfo,\
     ooopathutils \
 ))
 
diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk
index c635c2b22995..cf22afdbdd67 100644
--- a/desktop/Executable_unopkg.bin.mk
+++ b/desktop/Executable_unopkg.bin.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_Executable_set_include,$(unopkgbin),\
     -I$(SRCDIR)/desktop/source/inc \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,$(unopkgbin),\
+$(eval $(call gb_Executable_use_libraries,$(unopkgbin),\
     comphelper \
     sal \
     tl \
diff --git a/desktop/Executable_unopkg.mk b/desktop/Executable_unopkg.mk
index 74d957e97e14..27611eac7ca0 100644
--- a/desktop/Executable_unopkg.mk
+++ b/desktop/Executable_unopkg.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Executable_Executable,unopkg))
 
 $(eval $(call gb_Executable_set_targettype_gui,unopkg,YES))
 
-$(eval $(call gb_Executable_add_linked_static_libs,unopkg,\
+$(eval $(call gb_Executable_use_static_libraries,unopkg,\
     ooopathutils \
     winextendloaderenv \
 ))
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index 7e455ef66edb..3314c2e14ab9 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,deployment,\
     -I$(SRCDIR)/desktop/source/deployment/registry/inc \
 ))
 
-$(eval $(call gb_Library_add_api,deployment,\
+$(eval $(call gb_Library_use_api,deployment,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,deployment,\
+$(eval $(call gb_Library_use_libraries,deployment,\
     comphelper \
     cppu \
     cppuhelper \
@@ -94,7 +94,7 @@ $(eval $(call gb_Library_add_exception_objects,deployment,\
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 
-$(eval $(call gb_Library_add_linked_libs,deployment,\
+$(eval $(call gb_Library_use_libraries,deployment,\
     helplinker \
 ))
 
diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk
index 959484804330..c27c07752ae2 100644
--- a/desktop/Library_deploymentgui.mk
+++ b/desktop/Library_deploymentgui.mk
@@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,deploymentgui,\
     -I$(SRCDIR)/desktop/source/inc \
 ))
 
-$(eval $(call gb_Library_add_api,deploymentgui,\
+$(eval $(call gb_Library_use_api,deploymentgui,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,deploymentgui,\
+$(eval $(call gb_Library_use_libraries,deploymentgui,\
     comphelper \
     cppu \
     cppuhelper \
@@ -61,7 +61,7 @@ $(eval $(call gb_Library_add_linked_libs,deploymentgui,\
 
 ifeq ($(OS),WNT)
 
-$(eval $(call gb_Library_add_linked_libs,deploymentgui,\
+$(eval $(call gb_Library_use_libraries,deploymentgui,\
     ole32 \
 ))
 
diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk
index 33965b3bb478..c03017759228 100644
--- a/desktop/Library_deploymentmisc.mk
+++ b/desktop/Library_deploymentmisc.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_include,deploymentmisc,\
     -I$(SRCDIR)/desktop/source/deployment/inc \
 ))
 
-$(eval $(call gb_Library_add_api,deploymentmisc,\
+$(eval $(call gb_Library_use_api,deploymentmisc,\
     offapi \
     udkapi \
 ))
@@ -42,7 +42,7 @@ $(eval $(call gb_Library_add_defs,deploymentmisc,\
     -DDESKTOP_DEPLOYMENTMISC_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,deploymentmisc,\
+$(eval $(call gb_Library_use_libraries,deploymentmisc,\
     comphelper \
     cppu \
     cppuhelper \
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk
index 76b270743dd7..4c1d51d7fd68 100644
--- a/desktop/Library_migrationoo2.mk
+++ b/desktop/Library_migrationoo2.mk
@@ -31,12 +31,12 @@ $(eval $(call gb_Library_set_include,migrationoo2,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,migrationoo2,\
+$(eval $(call gb_Library_use_api,migrationoo2,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,migrationoo2,\
+$(eval $(call gb_Library_use_libraries,migrationoo2,\
     cppu \
     cppuhelper \
     i18nisolang1 \
diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk
index e315a8470dd4..9689749e50b4 100644
--- a/desktop/Library_migrationoo3.mk
+++ b/desktop/Library_migrationoo3.mk
@@ -31,12 +31,12 @@ $(eval $(call gb_Library_set_include,migrationoo3,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,migrationoo3,\
+$(eval $(call gb_Library_use_api,migrationoo3,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,migrationoo3,\
+$(eval $(call gb_Library_use_libraries,migrationoo3,\
     cppu \
     cppuhelper \
     sal \
diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk
index e556cb724d44..cb088c026b73 100644
--- a/desktop/Library_offacc.mk
+++ b/desktop/Library_offacc.mk
@@ -31,12 +31,12 @@ $(eval $(call gb_Library_set_include,offacc,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_add_api,offacc,\
+$(eval $(call gb_Library_use_api,offacc,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,offacc,\
+$(eval $(call gb_Library_use_libraries,offacc,\
     cppu \
     cppuhelper \
     sal \
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 668f290f127c..34dcfc3d1e50 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Library_set_include,sofficeapp,\
     -I$(SRCDIR)/desktop/source/deployment/inc \
 ))
 
-$(eval $(call gb_Library_add_api,sofficeapp,\
+$(eval $(call gb_Library_use_api,sofficeapp,\
     offapi \
     udkapi \
 ))
@@ -47,7 +47,7 @@ $(eval $(call gb_Library_add_defs,sofficeapp,\
     $(if $(filter TRUE,$(ENABLE_SYSTRAY_GTK)),-DENABLE_QUICKSTART_APPLET) \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,sofficeapp,\
+$(eval $(call gb_Library_use_libraries,sofficeapp,\
     comphelper \
     cppu \
     cppuhelper \
diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk
index 69f96b22a5de..35529052813c 100644
--- a/desktop/Library_spl.mk
+++ b/desktop/Library_spl.mk
@@ -32,12 +32,12 @@ $(eval $(call gb_Library_set_include,spl,\
     -I$(SRCDIR)/desktop/inc \
 ))
 
-$(eval $(call gb_Library_add_api,spl,\
+$(eval $(call gb_Library_use_api,spl,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,spl,\
+$(eval $(call gb_Library_use_libraries,spl,\
     comphelper \
     cppu \
     cppuhelper \
diff --git a/desktop/Library_spl_unx.mk b/desktop/Library_spl_unx.mk
index 82b1ecc03ae7..9fd065cb2b44 100644
--- a/desktop/Library_spl_unx.mk
+++ b/desktop/Library_spl_unx.mk
@@ -27,12 +27,12 @@
 
 $(eval $(call gb_Library_Library,spl_unx))
 
-$(eval $(call gb_Library_add_api,spl_unx,\
+$(eval $(call gb_Library_use_api,spl_unx,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,spl_unx,\
+$(eval $(call gb_Library_use_libraries,spl_unx,\
     cppu \
     cppuhelper \
     sal \
diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk
index 04a08bd6074b..93ca09b87ff2 100644
--- a/desktop/Library_unopkgapp.mk
+++ b/desktop/Library_unopkgapp.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Library_set_include,unopkgapp,\
     -I$(SRCDIR)/desktop/source/inc \
 ))
 
-$(eval $(call gb_Library_add_api,unopkgapp,\
+$(eval $(call gb_Library_use_api,unopkgapp,\
     offapi \
     udkapi \
 ))
@@ -43,7 +43,7 @@ $(eval $(call gb_Library_add_defs,unopkgapp,\
     -DDESKTOP_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_add_linked_libs,unopkgapp,\
+$(eval $(call gb_Library_use_libraries,unopkgapp,\
     comphelper \
     cppu \
     cppuhelper \
-- 
cgit