From c923f7d2c210dc7846767fc0ac6ece2a0d7812a8 Mon Sep 17 00:00:00 2001 From: Michael Stahl 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) --- sd/CppunitTest_sd_filters_test.mk | 8 ++++---- sd/CppunitTest_sd_regression_test.mk | 8 ++++---- sd/CppunitTest_sd_uimpress.mk | 8 ++++---- sd/JunitTest_sd_unoapi.mk | 2 +- sd/Library_sd.mk | 4 ++-- sd/Library_sdd.mk | 4 ++-- sd/Library_sdfilt.mk | 4 ++-- sd/Library_sdui.mk | 4 ++-- 8 files changed, 21 insertions(+), 21 deletions(-) (limited to 'sd') diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 9f55c856a52f..50f1e1191bdf 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -33,7 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sd_filters_test, \ sd/qa/unit/filters-test \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sd_filters_test, \ +$(eval $(call gb_CppunitTest_use_libraries,sd_filters_test, \ avmedia \ basegfx \ comphelper \ @@ -73,18 +73,18 @@ $(eval $(call gb_CppunitTest_set_include,sd_filters_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,sd_filters_test,\ +$(eval $(call gb_CppunitTest_use_api,sd_filters_test,\ offapi \ udkapi \ )) $(eval $(call gb_CppunitTest_uses_ure,sd_filters_test)) -$(eval $(call gb_CppunitTest_add_type_rdbs,sd_filters_test,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,sd_filters_test,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,sd_filters_test,\ +$(eval $(call gb_CppunitTest_use_components,sd_filters_test,\ basic/util/sb \ comphelper/util/comphelp \ configmgr/source/configmgr \ diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk index 1c21c0c58ed5..5d3f2e0fd36d 100644 --- a/sd/CppunitTest_sd_regression_test.mk +++ b/sd/CppunitTest_sd_regression_test.mk @@ -33,7 +33,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sd_regression_test, \ sd/qa/unit/regression-test \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sd_regression_test, \ +$(eval $(call gb_CppunitTest_use_libraries,sd_regression_test, \ avmedia \ basegfx \ comphelper \ @@ -74,18 +74,18 @@ $(eval $(call gb_CppunitTest_set_include,sd_regression_test,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,sd_regression_test,\ +$(eval $(call gb_CppunitTest_use_api,sd_regression_test,\ offapi \ udkapi \ )) $(eval $(call gb_CppunitTest_uses_ure,sd_regression_test)) -$(eval $(call gb_CppunitTest_add_type_rdbs,sd_regression_test,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,sd_regression_test,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,sd_regression_test,\ +$(eval $(call gb_CppunitTest_use_components,sd_regression_test,\ basic/util/sb \ comphelper/util/comphelp \ configmgr/source/configmgr \ diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index 2bec206feebe..67691f17edd3 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -36,12 +36,12 @@ $(eval $(call gb_CppunitTest_add_defs,sd_uimpress,\ -DSD_DLLIMPLEMENTATION \ )) -$(eval $(call gb_CppunitTest_add_api,sd_uimpress,\ +$(eval $(call gb_CppunitTest_use_api,sd_uimpress,\ offapi \ udkapi \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,sd_uimpress,\ +$(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\ avmedia \ basegfx \ canvastools \ @@ -78,11 +78,11 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sd_uimpress,\ $(eval $(call gb_CppunitTest_uses_ure,sd_uimpress)) -$(eval $(call gb_CppunitTest_add_type_rdbs,sd_uimpress,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,sd_uimpress,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,sd_uimpress,\ +$(eval $(call gb_CppunitTest_use_components,sd_uimpress,\ configmgr/source/configmgr \ framework/util/fwk \ i18npool/util/i18npool \ diff --git a/sd/JunitTest_sd_unoapi.mk b/sd/JunitTest_sd_unoapi.mk index 5d641259b58e..e2a7f7bff648 100644 --- a/sd/JunitTest_sd_unoapi.mk +++ b/sd/JunitTest_sd_unoapi.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,sd_unoapi,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sd/qa/unoapi/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,sd_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,sd_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index b553ca18cc10..92c85310d99e 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -67,13 +67,13 @@ $(eval $(call gb_Library_set_defs,sd,\ )) endif -$(eval $(call gb_Library_add_api,sd,\ +$(eval $(call gb_Library_use_api,sd,\ animations \ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,sd,\ +$(eval $(call gb_Library_use_libraries,sd,\ avmedia \ basegfx \ canvastools \ diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk index 0c5da7480cc1..5fe3c0da4c30 100644 --- a/sd/Library_sdd.mk +++ b/sd/Library_sdd.mk @@ -32,12 +32,12 @@ $(eval $(call gb_Library_set_include,sdd,\ -I$(SRCDIR)/sd/inc \ )) -$(eval $(call gb_Library_add_api,sdd,\ +$(eval $(call gb_Library_use_api,sdd,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,sdd,\ +$(eval $(call gb_Library_use_libraries,sdd,\ cppu \ cppuhelper \ sal \ diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk index e71c53bd20ae..327ac8b5cc8b 100644 --- a/sd/Library_sdfilt.mk +++ b/sd/Library_sdfilt.mk @@ -42,12 +42,12 @@ $(eval $(call gb_Library_add_defs,sdfilt,\ )) endif -$(eval $(call gb_Library_add_api,sdfilt,\ +$(eval $(call gb_Library_use_api,sdfilt,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,sdfilt,\ +$(eval $(call gb_Library_use_libraries,sdfilt,\ comphelper \ cppu \ cppuhelper \ diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index 8fa62561a99b..a83d9449f018 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -37,12 +37,12 @@ $(eval $(call gb_Library_add_defs,sdui,\ -DSD_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,sdui,\ +$(eval $(call gb_Library_use_api,sdui,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,sdui,\ +$(eval $(call gb_Library_use_libraries,sdui,\ basegfx \ comphelper \ cppcanvas \ -- cgit v1.2.3