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) --- i18npool/CppunitTest_i18npool_test_breakiterator.mk | 8 ++++---- i18npool/Executable_gencoll_rule.mk | 2 +- i18npool/Executable_genconv_dict.mk | 2 +- i18npool/Executable_gendict.mk | 2 +- i18npool/Executable_genindex_data.mk | 2 +- i18npool/Executable_saxparser.mk | 4 ++-- i18npool/Library_collator_data.mk | 2 +- i18npool/Library_dict_ja.mk | 2 +- i18npool/Library_dict_zh.mk | 2 +- i18npool/Library_i18nisolang1.mk | 4 ++-- i18npool/Library_i18npool.mk | 4 ++-- i18npool/Library_i18nsearch.mk | 4 ++-- i18npool/Library_index_data.mk | 2 +- i18npool/Library_localedata_en.mk | 2 +- i18npool/Library_localedata_es.mk | 2 +- i18npool/Library_localedata_euro.mk | 2 +- i18npool/Library_localedata_others.mk | 2 +- i18npool/Library_textconv_dict.mk | 4 ++-- 18 files changed, 26 insertions(+), 26 deletions(-) (limited to 'i18npool') diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk index 339191422f60..3d8b160b4017 100644 --- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk +++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk @@ -32,12 +32,12 @@ $(eval $(call gb_CppunitTest_set_include,i18npool_test_breakiterator,\ $$(INCLUDE) \ )) -$(eval $(call gb_CppunitTest_add_api,i18npool_test_breakiterator,\ +$(eval $(call gb_CppunitTest_use_api,i18npool_test_breakiterator,\ udkapi \ offapi \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,i18npool_test_breakiterator,\ +$(eval $(call gb_CppunitTest_use_libraries,i18npool_test_breakiterator,\ cppu \ cppuhelper \ sal \ @@ -50,11 +50,11 @@ $(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_breakiterator,\ $(eval $(call gb_CppunitTest_uses_ure,i18npool_test_breakiterator)) -$(eval $(call gb_CppunitTest_add_type_rdbs,i18npool_test_breakiterator,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,i18npool_test_breakiterator,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,i18npool_test_breakiterator,\ +$(eval $(call gb_CppunitTest_use_components,i18npool_test_breakiterator,\ i18npool/util/i18npool \ )) diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk index 0a39b4623d95..b1d0bd46b1a4 100644 --- a/i18npool/Executable_gencoll_rule.mk +++ b/i18npool/Executable_gencoll_rule.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Executable_set_include,gencoll_rule,\ -I$(SRCDIR)/i18npool/inc \ )) -$(eval $(call gb_Executable_add_linked_libs,gencoll_rule,\ +$(eval $(call gb_Executable_use_libraries,gencoll_rule,\ sal \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Executable_genconv_dict.mk b/i18npool/Executable_genconv_dict.mk index e9de4dbf8dab..85a49b15e655 100644 --- a/i18npool/Executable_genconv_dict.mk +++ b/i18npool/Executable_genconv_dict.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Executable_set_include,genconv_dict,\ $$(INCLUDE) \ )) -$(eval $(call gb_Executable_add_linked_libs,genconv_dict,\ +$(eval $(call gb_Executable_use_libraries,genconv_dict,\ sal \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Executable_gendict.mk b/i18npool/Executable_gendict.mk index c5e824d55fda..3941b10a09f0 100644 --- a/i18npool/Executable_gendict.mk +++ b/i18npool/Executable_gendict.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Executable_set_include,gendict,\ $$(INCLUDE) \ )) -$(eval $(call gb_Executable_add_linked_libs,gendict,\ +$(eval $(call gb_Executable_use_libraries,gendict,\ sal \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk index 733b6c5c2512..3665f44e9aec 100644 --- a/i18npool/Executable_genindex_data.mk +++ b/i18npool/Executable_genindex_data.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Executable_set_include,genindex_data,\ $$(INCLUDE) \ )) -$(eval $(call gb_Executable_add_linked_libs,genindex_data,\ +$(eval $(call gb_Executable_use_libraries,genindex_data,\ sal \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Executable_saxparser.mk b/i18npool/Executable_saxparser.mk index 03376a25e23e..cbd01f8c07d1 100644 --- a/i18npool/Executable_saxparser.mk +++ b/i18npool/Executable_saxparser.mk @@ -32,12 +32,12 @@ $(eval $(call gb_Executable_set_include,saxparser,\ $$(INCLUDE) \ )) -$(eval $(call gb_Executable_add_api,saxparser,\ +$(eval $(call gb_Executable_use_api,saxparser,\ udkapi \ offapi \ )) -$(eval $(call gb_Executable_add_linked_libs,saxparser,\ +$(eval $(call gb_Executable_use_libraries,saxparser,\ cppu \ cppuhelper \ sal \ diff --git a/i18npool/Library_collator_data.mk b/i18npool/Library_collator_data.mk index 85b1a978e5db..bd6ee6048f1c 100644 --- a/i18npool/Library_collator_data.mk +++ b/i18npool/Library_collator_data.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,collator_data)) -$(eval $(call gb_Library_add_linked_libs,collator_data,\ +$(eval $(call gb_Library_use_libraries,collator_data,\ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_dict_ja.mk b/i18npool/Library_dict_ja.mk index f164548bcfb7..89784694b4f7 100644 --- a/i18npool/Library_dict_ja.mk +++ b/i18npool/Library_dict_ja.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,dict_ja)) -$(eval $(call gb_Library_add_linked_libs,dict_ja,\ +$(eval $(call gb_Library_use_libraries,dict_ja,\ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_dict_zh.mk b/i18npool/Library_dict_zh.mk index cd48f4529a6f..2a910e502136 100644 --- a/i18npool/Library_dict_zh.mk +++ b/i18npool/Library_dict_zh.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,dict_zh)) -$(eval $(call gb_Library_add_linked_libs,dict_zh,\ +$(eval $(call gb_Library_use_libraries,dict_zh,\ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk index 26a388dc3862..613548ecf252 100644 --- a/i18npool/Library_i18nisolang1.mk +++ b/i18npool/Library_i18nisolang1.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Library_set_include,i18nisolang1,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,i18nisolang1,\ +$(eval $(call gb_Library_use_api,i18nisolang1,\ udkapi \ offapi \ )) @@ -43,7 +43,7 @@ $(eval $(call gb_Library_add_defs,i18nisolang1,\ -DI18NISOLANG_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_linked_libs,i18nisolang1,\ +$(eval $(call gb_Library_use_libraries,i18nisolang1,\ sal \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index 0bdbfe790392..5ba850beca5d 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,i18npool,\ -I$(SRCDIR)/i18npool/inc \ )) -$(eval $(call gb_Library_add_api,i18npool,\ +$(eval $(call gb_Library_use_api,i18npool,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,i18npool,\ +$(eval $(call gb_Library_use_libraries,i18npool,\ comphelper \ cppu \ cppuhelper \ diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk index 310ff68c39a7..88ddbe2a8a00 100644 --- a/i18npool/Library_i18nsearch.mk +++ b/i18npool/Library_i18nsearch.mk @@ -36,12 +36,12 @@ $(eval $(call gb_Library_set_include,i18nsearch,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_api,i18nsearch,\ +$(eval $(call gb_Library_use_api,i18nsearch,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,i18nsearch,\ +$(eval $(call gb_Library_use_libraries,i18nsearch,\ cppu \ cppuhelper \ i18nregexp \ diff --git a/i18npool/Library_index_data.mk b/i18npool/Library_index_data.mk index 2d8b9b5f1470..9a7270c82c1f 100644 --- a/i18npool/Library_index_data.mk +++ b/i18npool/Library_index_data.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,index_data)) -$(eval $(call gb_Library_add_linked_libs,index_data,\ +$(eval $(call gb_Library_use_libraries,index_data,\ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_localedata_en.mk b/i18npool/Library_localedata_en.mk index f44fab2da2e6..fe944a792350 100644 --- a/i18npool/Library_localedata_en.mk +++ b/i18npool/Library_localedata_en.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,localedata_en)) -$(eval $(call gb_Library_add_linked_libs,localedata_en,\ +$(eval $(call gb_Library_use_libraries,localedata_en,\ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_localedata_es.mk b/i18npool/Library_localedata_es.mk index 29d1bb7cfa1d..0d8f1ea77283 100644 --- a/i18npool/Library_localedata_es.mk +++ b/i18npool/Library_localedata_es.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,localedata_es)) -$(eval $(call gb_Library_add_linked_libs,localedata_es,\ +$(eval $(call gb_Library_use_libraries,localedata_es,\ localedata_en \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk index df98d667ca87..676d6effcdd2 100644 --- a/i18npool/Library_localedata_euro.mk +++ b/i18npool/Library_localedata_euro.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,localedata_euro)) -$(eval $(call gb_Library_add_linked_libs,localedata_euro,\ +$(eval $(call gb_Library_use_libraries,localedata_euro,\ localedata_en \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk index 432fbeeecb5d..f50c28118d57 100644 --- a/i18npool/Library_localedata_others.mk +++ b/i18npool/Library_localedata_others.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,localedata_others)) -$(eval $(call gb_Library_add_linked_libs,localedata_others,\ +$(eval $(call gb_Library_use_libraries,localedata_others,\ localedata_en \ $(gb_STDLIBS) \ )) diff --git a/i18npool/Library_textconv_dict.mk b/i18npool/Library_textconv_dict.mk index c9dacd9ff43d..675f61530a68 100644 --- a/i18npool/Library_textconv_dict.mk +++ b/i18npool/Library_textconv_dict.mk @@ -33,12 +33,12 @@ $(eval $(call gb_Library_set_include,textconv_dict,\ -I$(SRCDIR)/i18npool/inc \ )) -$(eval $(call gb_Library_add_api,textconv_dict,\ +$(eval $(call gb_Library_use_api,textconv_dict,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,textconv_dict,\ +$(eval $(call gb_Library_use_libraries,textconv_dict,\ $(gb_STDLIBS) \ )) -- cgit