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 /svl | |
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 'svl')
-rw-r--r-- | svl/CppunitTest_svl_lngmisc.mk | 4 | ||||
-rw-r--r-- | svl/CppunitTest_svl_urihelper.mk | 8 | ||||
-rw-r--r-- | svl/JunitTest_svl_complex.mk | 2 | ||||
-rw-r--r-- | svl/Library_fsstorage.mk | 4 | ||||
-rw-r--r-- | svl/Library_passwordcontainer.mk | 4 | ||||
-rw-r--r-- | svl/Library_svl.mk | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk index e34cb9c27639..fd090143c092 100644 --- a/svl/CppunitTest_svl_lngmisc.mk +++ b/svl/CppunitTest_svl_lngmisc.mk @@ -33,7 +33,7 @@ svl/qa/unit/test_lngmisc \ )) # add a list of all needed libraries here -$(eval $(call gb_CppunitTest_add_linked_libs,svl_lngmisc, \ +$(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \ cppu \ cppuhelper \ sal \ @@ -43,7 +43,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,svl_lngmisc, \ )) ifeq ($(GUI),WNT) -$(eval $(call gb_CppunitTest_add_linked_libs,svl_lngmisc, \ +$(eval $(call gb_CppunitTest_use_libraries,svl_lngmisc, \ oleaut32 \ )) endif diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk index 8f5f3adb4d2b..e8c4132149b3 100644 --- a/svl/CppunitTest_svl_urihelper.mk +++ b/svl/CppunitTest_svl_urihelper.mk @@ -28,12 +28,12 @@ $(eval $(call gb_CppunitTest_CppunitTest,svl_urihelper)) -$(eval $(call gb_CppunitTest_add_api,svl_urihelper, \ +$(eval $(call gb_CppunitTest_use_api,svl_urihelper, \ offapi \ udkapi \ )) -$(eval $(call gb_CppunitTest_add_components,svl_urihelper, \ +$(eval $(call gb_CppunitTest_use_components,svl_urihelper, \ ucb/source/core/ucb1 \ )) @@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,svl_urihelper, \ svl/qa/unit/test_URIHelper \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,svl_urihelper, \ +$(eval $(call gb_CppunitTest_use_libraries,svl_urihelper, \ cppu \ cppuhelper \ sal \ @@ -51,7 +51,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,svl_urihelper, \ $(gb_STDLIBS) \ )) -$(eval $(call gb_CppunitTest_add_type_rdbs,svl_urihelper, \ +$(eval $(call gb_CppunitTest_use_type_rdbs,svl_urihelper, \ types \ )) diff --git a/svl/JunitTest_svl_complex.mk b/svl/JunitTest_svl_complex.mk index 257e4e4d0ebb..7ee0f4c2880e 100644 --- a/svl/JunitTest_svl_complex.mk +++ b/svl/JunitTest_svl_complex.mk @@ -33,7 +33,7 @@ $(eval $(call gb_JunitTest_set_defs,svl_complex,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/svl/qa/complex/broken_document/test_documents \ )) -$(eval $(call gb_JunitTest_add_jars,svl_complex,\ +$(eval $(call gb_JunitTest_use_jars,svl_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk index 77d826c98b16..c4683a2c75b4 100644 --- a/svl/Library_fsstorage.mk +++ b/svl/Library_fsstorage.mk @@ -37,12 +37,12 @@ $(eval $(call gb_Library_set_include,fsstorage,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,fsstorage,\ +$(eval $(call gb_Library_use_api,fsstorage,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,fsstorage,\ +$(eval $(call gb_Library_use_libraries,fsstorage,\ comphelper \ cppu \ cppuhelper \ diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index 6ece5a37cda5..aa3a940bfaf9 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -37,12 +37,12 @@ $(eval $(call gb_Library_set_include,passwordcontainer,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,passwordcontainer,\ +$(eval $(call gb_Library_use_api,passwordcontainer,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ +$(eval $(call gb_Library_use_libraries,passwordcontainer,\ cppu \ cppuhelper \ sal \ diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 5addf898fe82..a4f06c18df1b 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Library_set_include,svl,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,svl,\ +$(eval $(call gb_Library_use_api,svl,\ udkapi \ offapi \ )) @@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_defs,svl,\ -DSVL_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,svl,\ +$(eval $(call gb_Library_use_libraries,svl,\ basegfx \ comphelper \ cppu \ |