diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-04-07 23:22:08 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-04-08 01:05:52 +0200 |
commit | c923f7d2c210dc7846767fc0ac6ece2a0d7812a8 (patch) | |
tree | 4895fcbbf423daf410da5a8ef8e09ef8064c5c67 /cppuhelper | |
parent | a16060116346533923c607bd406d3fea511b41ec (diff) |
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)
Diffstat (limited to 'cppuhelper')
-rw-r--r-- | cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk | 4 | ||||
-rw-r--r-- | cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk | 2 | ||||
-rw-r--r-- | cppuhelper/CppunitTest_cppuhelper_qa_weak.mk | 4 | ||||
-rw-r--r-- | cppuhelper/Library_cppuhelper.mk | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk index 2006d98d63ec..3432a83797d8 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk @@ -31,11 +31,11 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_cppu_ifcontainer,\ cppuhelper/qa/ifcontainer/cppu_ifcontainer \ )) -$(eval $(call gb_CppunitTest_add_api,cppuhelper_cppu_ifcontainer,\ +$(eval $(call gb_CppunitTest_use_api,cppuhelper_cppu_ifcontainer,\ udkapi \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,cppuhelper_cppu_ifcontainer,\ +$(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_ifcontainer,\ cppu \ cppuhelper \ sal \ diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk index ceaec25f5cce..658afbcc0b56 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk @@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_cppu_unourl,\ cppuhelper/qa/unourl/cppu_unourl \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,cppuhelper_cppu_unourl,\ +$(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_unourl,\ cppu \ cppuhelper \ sal \ diff --git a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk index eaea97b201a4..455ea6d9ee20 100644 --- a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk +++ b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk @@ -31,11 +31,11 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_qa_weak,\ cppuhelper/qa/weak/test_weak \ )) -$(eval $(call gb_CppunitTest_add_api,cppuhelper_qa_weak,\ +$(eval $(call gb_CppunitTest_use_api,cppuhelper_qa_weak,\ udkapi \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,cppuhelper_qa_weak,\ +$(eval $(call gb_CppunitTest_use_libraries,cppuhelper_qa_weak,\ cppu \ cppuhelper \ sal \ diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk index 2fa6d1aa9a5b..3724459fc97a 100644 --- a/cppuhelper/Library_cppuhelper.mk +++ b/cppuhelper/Library_cppuhelper.mk @@ -41,7 +41,7 @@ $(eval $(call gb_Library_add_defs,cppuhelper,\ -DCPPUHELPER_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,cppuhelper,\ +$(eval $(call gb_Library_use_libraries,cppuhelper,\ cppu \ sal \ salhelper \ |