14 files changed, 37 insertions, 147 deletions
diff --git a/scp2/AutoInstallLibs.mk b/scp2/AutoInstallLibs.mk
new file mode 100644
index 000000000000..7fc48789e201
--- /dev/null
+++ b/scp2/AutoInstallLibs.mk
@@ -0,0 +1,24 @@
+# -*- 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_AutoInstallLibs_AutoInstallLibs))
+
+$(eval $(call gb_AutoInstallLibs_add_category,base,BASE,LIBO_LIB_FILE,auto_Base_Lib))
+$(eval $(call gb_AutoInstallLibs_add_category,gnome,GNOME,LIBO_LIB_FILE,auto_Gnome_Lib))
+$(eval $(call gb_AutoInstallLibs_add_category,graphicfilter,GRAPHICFILTER,LIBO_LIB_FILE,auto_Graphicfilter_Lib))
+$(eval $(call gb_AutoInstallLibs_add_category,impress,IMPRESS,LIBO_LIB_FILE,auto_Impress_Lib))
+$(eval $(call gb_AutoInstallLibs_add_category,kde,KDE,LIBO_LIB_FILE,auto_Kde_Lib))
+$(eval $(call gb_AutoInstallLibs_add_category,math,MATH,LIBO_LIB_FILE,auto_Math_Lib))
+$(eval $(call gb_AutoInstallLibs_add_category,onlineupdate,ONLINEUPDATE,LIBO_LIB_FILE,auto_Onlineupdate_Lib))
+$(eval $(call gb_AutoInstallLibs_add_category,ooo,OOO,LIBO_LIB_FILE,auto_File_Lib))
+$(eval $(call gb_AutoInstallLibs_add_category,tde,TDE,LIBO_LIB_FILE,auto_Tde_Lib))
+$(eval $(call gb_AutoInstallLibs_add_category,ure,URE,URE_PRIVATE_LIB,auto_Ure_Private_Lib))
+$(eval $(call gb_AutoInstallLibs_add_category,writer,WRITER,LIBO_LIB_FILE,auto_Writer_Lib))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/AutoInstallLibs_base.mk b/scp2/AutoInstallLibs_base.mk
deleted file mode 100644
index 5cb70c28f4d6..000000000000
--- a/scp2/AutoInstallLibs_base.mk
+++ /dev/null
@@ -1,12 +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_AutoInstallLibs_AutoInstallLibs,base,BASE,LIBO_LIB_FILE,auto_Base_Lib))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/AutoInstallLibs_gnome.mk b/scp2/AutoInstallLibs_gnome.mk
deleted file mode 100644
index c388a2948a5e..000000000000
--- a/scp2/AutoInstallLibs_gnome.mk
+++ /dev/null
@@ -1,12 +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_AutoInstallLibs_AutoInstallLibs,gnome,GNOME,LIBO_LIB_FILE,auto_Gnome_Lib))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/AutoInstallLibs_graphicfilter.mk b/scp2/AutoInstallLibs_graphicfilter.mk
deleted file mode 100644
index 08efa78569cc..000000000000
--- a/scp2/AutoInstallLibs_graphicfilter.mk
+++ /dev/null
@@ -1,12 +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_AutoInstallLibs_AutoInstallLibs,graphicfilter,GRAPHICFILTER,LIBO_LIB_FILE,auto_Graphicfilter_Lib))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/AutoInstallLibs_impress.mk b/scp2/AutoInstallLibs_impress.mk
deleted file mode 100644
index 597e12b7d9e2..000000000000
--- a/scp2/AutoInstallLibs_impress.mk
+++ /dev/null
@@ -1,12 +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_AutoInstallLibs_AutoInstallLibs,impress,IMPRESS,LIBO_LIB_FILE,auto_Impress_Lib))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/AutoInstallLibs_kde.mk b/scp2/AutoInstallLibs_kde.mk
deleted file mode 100644
index 11f65ee929bc..000000000000
--- a/scp2/AutoInstallLibs_kde.mk
+++ /dev/null
@@ -1,12 +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_AutoInstallLibs_AutoInstallLibs,kde,KDE,LIBO_LIB_FILE,auto_Kde_Lib))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/AutoInstallLibs_math.mk b/scp2/AutoInstallLibs_math.mk
deleted file mode 100644
index a7ceda857ef6..000000000000
--- a/scp2/AutoInstallLibs_math.mk
+++ /dev/null
@@ -1,12 +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_AutoInstallLibs_AutoInstallLibs,math,MATH,LIBO_LIB_FILE,auto_Math_Lib))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/AutoInstallLibs_onlineupdate.mk b/scp2/AutoInstallLibs_onlineupdate.mk
deleted file mode 100644
index cd082bbce31d..000000000000
--- a/scp2/AutoInstallLibs_onlineupdate.mk
+++ /dev/null
@@ -1,12 +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_AutoInstallLibs_AutoInstallLibs,onlineupdate,ONLINEUPDATE,LIBO_LIB_FILE,auto_Onlineupdate_Lib))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/AutoInstallLibs_ooo.mk b/scp2/AutoInstallLibs_ooo.mk
deleted file mode 100644
index dd628d584c3e..000000000000
--- a/scp2/AutoInstallLibs_ooo.mk
+++ /dev/null
@@ -1,12 +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_AutoInstallLibs_AutoInstallLibs,ooo,OOO,LIBO_LIB_FILE,auto_File_Lib))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/AutoInstallLibs_tde.mk b/scp2/AutoInstallLibs_tde.mk
deleted file mode 100644
index daea3c3d1801..000000000000
--- a/scp2/AutoInstallLibs_tde.mk
+++ /dev/null
@@ -1,12 +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_AutoInstallLibs_AutoInstallLibs,tde,TDE,LIBO_LIB_FILE,auto_Tde_Lib))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/AutoInstallLibs_ure.mk b/scp2/AutoInstallLibs_ure.mk
deleted file mode 100644
index 9c280bcc41e3..000000000000
--- a/scp2/AutoInstallLibs_ure.mk
+++ /dev/null
@@ -1,12 +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_AutoInstallLibs_AutoInstallLibs,ure,URE,URE_PRIVATE_LIB,auto_Ure_Private_Lib))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/AutoInstallLibs_writer.mk b/scp2/AutoInstallLibs_writer.mk
deleted file mode 100644
index 68bd7a4f3db5..000000000000
--- a/scp2/AutoInstallLibs_writer.mk
+++ /dev/null
@@ -1,12 +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_AutoInstallLibs_AutoInstallLibs,writer,WRITER,LIBO_LIB_FILE,auto_Writer_Lib))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 7d935feb588e..c58af2e23195 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -10,17 +10,7 @@
 $(eval $(call gb_Module_Module,scp2))
 
 $(eval $(call gb_Module_add_targets,scp2,\
-	AutoInstallLibs_base \
-	AutoInstallLibs_onlineupdate \
-	AutoInstallLibs_graphicfilter \
-	AutoInstallLibs_tde \
-	AutoInstallLibs_impress \
-	AutoInstallLibs_gnome \
-	AutoInstallLibs_kde \
-	AutoInstallLibs_math \
-	AutoInstallLibs_ooo \
-	AutoInstallLibs_ure \
-	AutoInstallLibs_writer \
+	AutoInstallLibs \
 	CustomTarget_langmacros \
 	InstallModule_accessories \
 	InstallModule_base \
diff --git a/solenv/gbuild/AutoInstallLibs.mk b/solenv/gbuild/AutoInstallLibs.mk
index 3555c2331145..ab520d6c0183 100644
--- a/solenv/gbuild/AutoInstallLibs.mk
+++ b/solenv/gbuild/AutoInstallLibs.mk
@@ -15,7 +15,6 @@ $(dir $(call gb_AutoInstallLibs_get_target,%)).dir :
 $(call gb_AutoInstallLibs_get_target,%) : $(SRCDIR)/Repository.mk
 	$(call gb_Output_announce,$*,$(true),AIL,3)
 	echo "/* autogenerated library installs for group $(INSTALLMODULE) */" > $@
-	$(call gb_Output_info,install module: $(INSTALLMODULE) contents: $(gb_Library_MODULE_$(INSTALLMODULE)))
 	echo "#define $(SCP2ID)_ALL \ " >> $@
 	$(foreach lib,$(gb_Library_MODULE_$(INSTALLMODULE)),\
 		echo "    $(SCP2ID)_$(lib), \ " >> $@;)
@@ -29,15 +28,24 @@ $(call gb_AutoInstallLibs_get_clean_target,%) :
 	rm -f $(call gb_AutoInstallLibs_get_target,$*)
 
 define gb_AutoInstallLibs_AutoInstallLibs
+$(call gb_AutoInstallLibs_get_target,all) :| $(dir $(call gb_AutoInstallLibs_get_target,all)).dir
+
+$$(eval $$(call gb_Module_register_target,$(call gb_AutoInstallLibs_get_target,all),$(call gb_AutoInstallLibs_get_clean_target,all)))
+$(call gb_Helper_make_userfriendly_targets,all,AutoInstallLibs)
+
+endef
+
+define gb_AutoInstallLibs_add_category
+$(call gb_AutoInstallLibs_get_target,all) : $(call gb_AutoInstallLibs_get_target,$(1))
+$(call gb_AutoInstallLibs_get_clean_target,all) : $(call gb_AutoInstallLibs_get_clean_target,$(1))
+$(call gb_Helper_make_userfriendly_targets,$(1),AutoInstallLibs)
+
 $(call gb_AutoInstallLibs_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
 $(call gb_AutoInstallLibs_get_target,$(1)) :| $(dir $(call gb_AutoInstallLibs_get_target,$(1))).dir
 $(call gb_AutoInstallLibs_get_target,$(1)) : INSTALLMODULE = $(2)
 $(call gb_AutoInstallLibs_get_target,$(1)) : SCP2TEMPLATE = $(3)
 $(call gb_AutoInstallLibs_get_target,$(1)) : SCP2ID = $(4)
 
-$$(eval $$(call gb_Module_register_target,$(call gb_AutoInstallLibs_get_target,$(1)),$(call gb_AutoInstallLibs_get_clean_target,$(1))))
-$(call gb_Helper_make_userfriendly_targets,$(1),AutoInstallLibs)
-
 endef
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab: