diff options
| author | David Tardon <dtardon@redhat.com> | 2012-03-18 15:24:42 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-23 06:02:41 +0100 |
| commit | 424a03e72f10d123bf67a2b36c306b8c09e34669 (patch) | |
| tree | c683831b8790599f13783cc87a473f1edfd11a23 /desktop/Pagein_common.mk | |
| parent | 0b7f8b54386b380ee9b1abd0a2207b50c6fbeaca (diff) | |
simplify pagein creation
Diffstat (limited to 'desktop/Pagein_common.mk')
| -rw-r--r-- | desktop/Pagein_common.mk | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk index 06cb024b339d..4d66d3f25c7b 100644 --- a/desktop/Pagein_common.mk +++ b/desktop/Pagein_common.mk @@ -28,7 +28,10 @@ $(eval $(call gb_Pagein_Pagein,common)) # sorted in approx. reverse load order (ld.so.1) -$(eval $(call gb_Pagein_add_libs,common,\ +# TODO: Hmm, so it looks like there are duplicates in the list... Moreover, +# some that are conditional above are not conditional here (e.g., icule). +# I have doubts about gconfbe, desktopbe and localebe too. +$(eval $(call gb_Pagein_add_objects,common,\ i18npool \ $(if $(findstring YES,$(SYSTEM_ICU)),,\ icui18n \ @@ -52,9 +55,6 @@ $(eval $(call gb_Pagein_add_libs,common,\ sot \ xcr \ sb \ -)) - -$(eval $(call gb_Pagein_add_libs_with_dir,common,\ stocservices \ bootstrap \ reg \ @@ -63,10 +63,6 @@ $(eval $(call gb_Pagein_add_libs_with_dir,common,\ cppuhelper \ cppu \ sal \ - ,../ure-link/lib \ -)) - -$(eval $(call gb_Pagein_add_libs,common,\ ucbhelper \ comphelper \ tl \ @@ -74,18 +70,9 @@ $(eval $(call gb_Pagein_add_libs,common,\ svl \ vcl \ tk \ -)) - -$(eval $(call gb_Pagein_add_objects,common,\ ../ure-link/share/misc/types.rdb \ services.rdb \ oovbaapi.rdb \ -)) - -# TODO: Hmm, so it looks like there are duplicates in the list... Moreover, -# some that are conditional above are not conditional here (e.g., icule). -# I have doubts about gconfbe, desktopbe and localebe too. -$(eval $(call gb_Pagein_add_libs,common,\ deployment \ deploymentmisc \ ucb1 \ |