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 /comphelper | |
| 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 'comphelper')
| -rw-r--r-- | comphelper/CppunitTest_comphelper_test.mk | 4 | ||||
| -rw-r--r-- | comphelper/JunitTest_comphelper_complex.mk | 2 | ||||
| -rw-r--r-- | comphelper/Library_comphelp.mk | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/comphelper/CppunitTest_comphelper_test.mk b/comphelper/CppunitTest_comphelper_test.mk index b36ba1d07006..942539ba6b5d 100644 --- a/comphelper/CppunitTest_comphelper_test.mk +++ b/comphelper/CppunitTest_comphelper_test.mk @@ -31,12 +31,12 @@ $(eval $(call gb_CppunitTest_add_exception_objects,comphelper_test, \ comphelper/qa/string/test_string \ )) -$(eval $(call gb_CppunitTest_add_api,comphelper_test, \ +$(eval $(call gb_CppunitTest_use_api,comphelper_test, \ udkapi \ offapi \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,comphelper_test, \ +$(eval $(call gb_CppunitTest_use_libraries,comphelper_test, \ comphelper \ cppuhelper \ cppu \ diff --git a/comphelper/JunitTest_comphelper_complex.mk b/comphelper/JunitTest_comphelper_complex.mk index 090ed605a3e2..78c26a4e9648 100644 --- a/comphelper/JunitTest_comphelper_complex.mk +++ b/comphelper/JunitTest_comphelper_complex.mk @@ -33,7 +33,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,comphelper_complex,\ comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest \ )) -$(eval $(call gb_JunitTest_add_jars,comphelper_complex,\ +$(eval $(call gb_JunitTest_use_jars,comphelper_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk index 05ae0abdacfc..7627a9c5016e 100644 --- a/comphelper/Library_comphelp.mk +++ b/comphelper/Library_comphelp.mk @@ -41,7 +41,7 @@ $(eval $(call gb_Library_add_defs,comphelper,\ -DCOMPHELPER_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,comphelper,\ +$(eval $(call gb_Library_use_libraries,comphelper,\ cppu \ cppuhelper \ sal \ @@ -50,7 +50,7 @@ $(eval $(call gb_Library_add_linked_libs,comphelper,\ $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_add_api,comphelper,\ +$(eval $(call gb_Library_use_api,comphelper,\ udkapi \ offapi \ )) |