diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_desktop_detector.mk | 7 | ||||
| -rwxr-xr-x | vcl/Library_vcl.mk | 7 | ||||
| -rwxr-xr-x | vcl/Library_vclplug_gen.mk | 7 | ||||
| -rwxr-xr-x | vcl/Library_vclplug_gtk.mk | 7 | ||||
| -rwxr-xr-x | vcl/Library_vclplug_kde.mk | 7 | ||||
| -rwxr-xr-x | vcl/Library_vclplug_kde4.mk | 7 | ||||
| -rwxr-xr-x | vcl/Library_vclplug_svp.mk | 7 |
7 files changed, 35 insertions, 14 deletions
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index c4eb08fc36b6..8f18f7af961c 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_add_linked_libs,desktop_detector,\ basegfx \ comphelper \ cppuhelper \ - icuuc \ - icule \ i18nisolang1 \ i18npaper \ i18nutil \ @@ -72,6 +70,11 @@ $(eval $(call gb_Library_add_linked_libs,desktop_detector,\ $(gb_STDLIBS) \ )) +$(call gb_Library_use_externals,desktop_detector,\ + icule \ + icuuc \ +) + $(eval $(call gb_Library_add_exception_objects,desktop_detector,\ vcl/unx/generic/desktopdetect/desktopdetector \ )) diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 360ccfed7c9c..2b1c0dfcc00a 100755 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -68,8 +68,6 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\ basegfx \ comphelper \ cppuhelper \ - icuuc \ - icule \ i18nisolang1 \ i18npaper \ i18nutil \ @@ -81,6 +79,11 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\ $(gb_STDLIBS) \ )) +$(call gb_Library_use_externals,vcl,\ + icule \ + icuuc \ +) + ifeq ($(GUIBASE),unx) $(eval $(call gb_Library_add_linked_libs,vcl,\ freetype \ diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 263d7b1ebc75..1c79bda510ee 100755 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -46,8 +46,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\ basegfx \ comphelper \ cppuhelper \ - icuuc \ - icule \ i18nisolang1 \ i18npaper \ i18nutil \ @@ -63,6 +61,11 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\ $(gb_STDLIBS) \ )) +$(call gb_Library_use_externals,vclplug_gen,\ + icule \ + icuuc \ +) + $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\ vcl/unx/generic/app/i18n_cb \ vcl/unx/generic/app/i18n_ic \ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index f81c784dc1a0..59aa6e845cc1 100755 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -73,8 +73,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\ basegfx \ comphelper \ cppuhelper \ - icuuc \ - icule \ i18nisolang1 \ i18npaper \ i18nutil \ @@ -90,6 +88,11 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\ $(gb_STDLIBS) \ )) +$(call gb_Library_use_externals,vclplug_gtk,\ + icule \ + icuuc \ +) + $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\ vcl/unx/gtk/a11y/atkaction \ vcl/unx/gtk/a11y/atkbridge \ diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 326667092611..5658b1eb672c 100755 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -61,8 +61,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde,\ basegfx \ comphelper \ cppuhelper \ - icuuc \ - icule \ i18nisolang1 \ i18npaper \ i18nutil \ @@ -77,6 +75,11 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde,\ ICE \ )) +$(call gb_Library_use_externals,vclplug_kde,\ + icule \ + icuuc \ +) + $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\ vcl/unx/kde/kdedata \ vcl/unx/kde/salnativewidgets-kde \ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 7bca89b241ea..317f10c0ea57 100755 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -61,8 +61,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\ basegfx \ comphelper \ cppuhelper \ - icuuc \ - icule \ i18nisolang1 \ i18npaper \ i18nutil \ @@ -77,6 +75,11 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\ ICE \ )) +$(call gb_Library_use_externals,vclplug_kde4,\ + icule \ + icuuc \ +) + $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\ vcl/unx/kde4/KDEData \ vcl/unx/kde4/KDESalDisplay \ diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index 3051c0ce863e..64b5f5656af8 100755 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -52,8 +52,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_svp,\ basebmp \ comphelper \ cppuhelper \ - icuuc \ - icule \ i18nisolang1 \ i18npaper \ i18nutil \ @@ -69,6 +67,11 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_svp,\ $(gb_STDLIBS) \ )) +$(call gb_Library_use_externals,vclplug_svp,\ + icule \ + icuuc \ +) + $(eval $(call gb_Library_add_exception_objects,vclplug_svp,\ vcl/unx/generic/printergfx/bitmap_gfx \ vcl/unx/generic/printergfx/common_gfx \ |