simplify pagein creation

5 files changed, 8 insertions, 21 deletions

diff --git a/desktop/Pagein_calc.mk b/desktop/Pagein_calc.mk
index afbbb157b02e..0423b25d0677 100644
--- a/desktop/Pagein_calc.mk
+++ b/desktop/Pagein_calc.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Pagein_Pagein,calc))
 
-$(eval $(call gb_Pagein_add_libs,calc,\
+$(eval $(call gb_Pagein_add_objects,calc,\
     sc \
     scui \
     svx \
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 \
diff --git a/desktop/Pagein_draw.mk b/desktop/Pagein_draw.mk
index 5795b0567979..be3b8e0814b1 100644
--- a/desktop/Pagein_draw.mk
+++ b/desktop/Pagein_draw.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Pagein_Pagein,draw))
 
-$(eval $(call gb_Pagein_add_libs,draw,\
+$(eval $(call gb_Pagein_add_objects,draw,\
     sd \
     sdui \
     svx \
diff --git a/desktop/Pagein_impress.mk b/desktop/Pagein_impress.mk
index ae331f84712c..51047228a2f3 100644
--- a/desktop/Pagein_impress.mk
+++ b/desktop/Pagein_impress.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Pagein_Pagein,impress))
 
-$(eval $(call gb_Pagein_add_libs,impress,\
+$(eval $(call gb_Pagein_add_objects,impress,\
     sd \
     sdui \
     svx \
diff --git a/desktop/Pagein_writer.mk b/desktop/Pagein_writer.mk
index 206e18a3d986..c9694a5e750e 100644
--- a/desktop/Pagein_writer.mk
+++ b/desktop/Pagein_writer.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Pagein_Pagein,writer))
 
-$(eval $(call gb_Pagein_add_libs,writer,\
+$(eval $(call gb_Pagein_add_objects,writer,\
     sw \
     swui \
     svx \