diff options
| -rw-r--r-- | Library_merged.mk | 1 | ||||
| -rw-r--r-- | Repository.mk | 1 | ||||
| -rw-r--r-- | i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk | 3 | ||||
| -rw-r--r-- | i18nlangtag/Library_i18nlangtag.mk | 6 | ||||
| -rw-r--r-- | i18nlangtag/Library_i18nlangtagicu.mk | 32 | ||||
| -rw-r--r-- | i18nlangtag/Module_i18nlangtag.mk | 1 | ||||
| -rw-r--r-- | i18npool/Library_i18npool.mk | 1 | ||||
| -rw-r--r-- | include/i18nlangtag/languagetagicu.hxx | 7 | ||||
| -rw-r--r-- | lotuswordpro/Library_lwpft.mk | 1 |
9 files changed, 10 insertions, 43 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 4603bda34aad..2d5ef603de57 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_use_libraries,merged,\ cppu \ cppuhelper \ i18nlangtag \ - i18nlangtagicu \ $(if $(filter TRUE,$(SOLAR_JAVA)), \ jvmaccess \ jvmfwk) \ diff --git a/Repository.mk b/Repository.mk index c4858b73eab0..054d9a325871 100644 --- a/Repository.mk +++ b/Repository.mk @@ -469,7 +469,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,OOO, \ deployment \ fileacc \ i18nlangtag \ - i18nlangtagicu \ i18nutil \ mcnttype \ package2 \ diff --git a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk index a1f294336a23..f00171747ef3 100644 --- a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk +++ b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk @@ -14,9 +14,8 @@ $(eval $(call gb_CppunitTest_use_api,i18nlangtag_test_languagetag,\ offapi \ )) -$(eval $(call gb_CppunitTest_use_library_objects,i18nlangtag_test_languagetag,i18nlangtag)) - $(eval $(call gb_CppunitTest_use_libraries,i18nlangtag_test_languagetag,\ + i18nlangtag \ cppu \ cppuhelper \ sal \ diff --git a/i18nlangtag/Library_i18nlangtag.mk b/i18nlangtag/Library_i18nlangtag.mk index 3faacc48b006..c88b852f2501 100644 --- a/i18nlangtag/Library_i18nlangtag.mk +++ b/i18nlangtag/Library_i18nlangtag.mk @@ -39,11 +39,17 @@ $(eval $(call gb_Library_use_libraries,i18nlangtag,\ $(gb_UWINAPI) \ )) +$(eval $(call gb_Library_use_externals,i18nlangtag,\ + icu_headers \ + icuuc \ +)) + $(eval $(call gb_Library_add_exception_objects,i18nlangtag,\ i18nlangtag/source/isolang/insys \ i18nlangtag/source/isolang/isolang \ i18nlangtag/source/isolang/mslangid \ i18nlangtag/source/languagetag/languagetag \ + i18nlangtag/source/languagetag/languagetagicu \ )) diff --git a/i18nlangtag/Library_i18nlangtagicu.mk b/i18nlangtag/Library_i18nlangtagicu.mk deleted file mode 100644 index d1def1b37339..000000000000 --- a/i18nlangtag/Library_i18nlangtagicu.mk +++ /dev/null @@ -1,32 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -$(eval $(call gb_Library_Library,i18nlangtagicu)) - -$(eval $(call gb_Library_use_sdk_api,i18nlangtagicu)) - -$(eval $(call gb_Library_add_defs,i18nlangtagicu,\ - -DI18NLANGTAG_DLLIMPLEMENTATION \ -)) - -$(eval $(call gb_Library_use_libraries,i18nlangtagicu,\ - sal \ - i18nlangtag \ - $(gb_UWINAPI) \ -)) - -$(eval $(call gb_Library_use_externals,i18nlangtagicu,\ - icu_headers \ - icuuc \ -)) - -$(eval $(call gb_Library_add_exception_objects,i18nlangtagicu,\ - i18nlangtag/source/languagetag/languagetagicu \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/i18nlangtag/Module_i18nlangtag.mk b/i18nlangtag/Module_i18nlangtag.mk index 22b8a7f42de9..edd2e1d2e2a9 100644 --- a/i18nlangtag/Module_i18nlangtag.mk +++ b/i18nlangtag/Module_i18nlangtag.mk @@ -10,7 +10,6 @@ $(eval $(call gb_Module_Module,i18nlangtag)) $(eval $(call gb_Module_add_targets,i18nlangtag,\ Library_i18nlangtag \ - Library_i18nlangtagicu \ )) $(eval $(call gb_Module_add_check_targets,i18nlangtag,\ diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index 5fe9e2cf3a36..955579f5abdd 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,i18npool,\ cppu \ cppuhelper \ i18nlangtag \ - i18nlangtagicu \ i18nutil \ sal \ $(gb_UWINAPI) \ diff --git a/include/i18nlangtag/languagetagicu.hxx b/include/i18nlangtag/languagetagicu.hxx index 2fc9db323fe3..094f07759a6c 100644 --- a/include/i18nlangtag/languagetagicu.hxx +++ b/include/i18nlangtag/languagetagicu.hxx @@ -20,10 +20,9 @@ class LanguageTag; /** Interface LanguageTag to ICU's icu::Locale - Separated from LanguageTag into its own library to not pollute the entire - code base with ICU header file inclusion and linkage, only the few code - actually using this needs to link against ICU libraries, which it did - anyway. + Separated from LanguageTag to not pollute the entire code base (and thus + makefiles) with ICU header file inclusion, only the few code actually using + this needs to know about ICU, which it did anyway. */ class I18NLANGTAG_DLLPUBLIC LanguageTagIcu { diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk index 7673eb340f75..f01261d12878 100644 --- a/lotuswordpro/Library_lwpft.mk +++ b/lotuswordpro/Library_lwpft.mk @@ -17,7 +17,6 @@ $(eval $(call gb_Library_use_libraries,lwpft,\ cppuhelper \ sal \ i18nlangtag \ - i18nlangtagicu \ sfx \ sot \ svt \ |