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 /sot | |
| 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 'sot')
| -rw-r--r-- | sot/CppunitTest_sot_test_sot.mk | 6 | ||||
| -rw-r--r-- | sot/JunitTest_sot_complex.mk | 2 | ||||
| -rw-r--r-- | sot/Library_sot.mk | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk index 41f538f75a57..1af4eef0ca01 100644 --- a/sot/CppunitTest_sot_test_sot.mk +++ b/sot/CppunitTest_sot_test_sot.mk @@ -36,7 +36,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sot_test_sot, \ sot/qa/cppunit/test_sot \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sot_test_sot, \ +$(eval $(call gb_CppunitTest_use_libraries,sot_test_sot, \ comphelper \ cppu \ cppuhelper \ @@ -51,14 +51,14 @@ $(eval $(call gb_CppunitTest_set_include,sot_test_sot,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,sot_test_sot,\ +$(eval $(call gb_CppunitTest_use_api,sot_test_sot,\ offapi \ udkapi \ )) $(eval $(call gb_CppunitTest_uses_ure,sot_test_sot)) -$(eval $(call gb_CppunitTest_add_type_rdbs,sot_test_sot,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,sot_test_sot,\ types \ )) diff --git a/sot/JunitTest_sot_complex.mk b/sot/JunitTest_sot_complex.mk index a1a6d359d655..afa8c739802e 100644 --- a/sot/JunitTest_sot_complex.mk +++ b/sot/JunitTest_sot_complex.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sot_complex,\ sot/qa/complex/olesimplestorage/TestHelper \ )) -$(eval $(call gb_JunitTest_add_jars,sot_complex,\ +$(eval $(call gb_JunitTest_use_jars,sot_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index cc5271d1d33f..124c59277cec 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -36,7 +36,7 @@ $(eval $(call gb_Library_set_include,sot,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,sot,\ +$(eval $(call gb_Library_use_api,sot,\ udkapi \ offapi \ )) @@ -45,7 +45,7 @@ $(eval $(call gb_Library_add_defs,sot,\ -DSOT_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,sot,\ +$(eval $(call gb_Library_use_libraries,sot,\ comphelper \ cppu \ cppuhelper \ |