fdo#66072 do not end auto_*_ALL by a comma

Reviewed-on: https://gerrit.libreoffice.org/4829
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
(cherry picked from commit bd3aa6983796f9dedf85c446a0ce5e5505583809)
Signed-off-by: David Tardon <dtardon@redhat.com>

Conflicts:
	scp2/source/base/module_base.scp
	scp2/source/calc/module_calc.scp
	scp2/source/gnome/module_gnome.scp
	scp2/source/graphicfilter/module_graphicfilter.scp
	scp2/source/impress/module_impress.scp
	scp2/source/kde/module_kde.scp
	scp2/source/math/module_math.scp
	scp2/source/onlineupdate/module_onlineupdate.scp
	scp2/source/ooo/module_hidden_ooo.scp
	scp2/source/ooo/ure.scp
	scp2/source/tde/module_tde.scp
	scp2/source/writer/module_writer.scp
	solenv/gbuild/AutoInstall.mk

Change-Id: I7d0fbe865cd10d0a3ef690e521d4752d6d7f3939
(cherry picked from commit 2f40865f544edd18ca6832ad94f22aa3be373245)
Signed-off-by: David Tardon <dtardon@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/4832
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Reviewed-by: Andras Timar <atimar@suse.com>

8 files changed, 16 insertions, 13 deletions

diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index f66178ddea76..e8a22bfcf348 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -29,7 +29,7 @@ Module gid_Module_Optional_Gnome
 #ifdef ENABLE_GNOMEVFS
     XpdCheckSolaris = "SUNWgnome-vfs";
 #endif
-    Files = (auto_Gnome_Lib_ALL
+    Files = (auto_Gnome_Lib_ALL,
 #if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
       gid_File_Share_Registry_Gnome_Xcd,
 #endif
diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp
index 556161e0ceed..dd2de5fa8404 100644
--- a/scp2/source/graphicfilter/module_graphicfilter.scp
+++ b/scp2/source/graphicfilter/module_graphicfilter.scp
@@ -26,6 +26,6 @@ Module gid_Module_Optional_Grfflt
     Sortkey = "600";
     ParentID = gid_Module_Optional;
     Default = YES;
-    Files = (auto_Graphicfilter_Lib_ALL
+    Files = (auto_Graphicfilter_Lib_ALL,
         gid_File_Share_Registry_Graphicfilter_Xcd);
 End
diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
index 8e8012f9e56a..e61fb41e6231 100644
--- a/scp2/source/kde/module_kde.scp
+++ b/scp2/source/kde/module_kde.scp
@@ -26,6 +26,5 @@ Module gid_Module_Optional_Kde
     PackageInfo = "packinfo_office.txt";
     MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
     Styles = ();
-    Files = (auto_Kde_Lib_ALL
-    );
+    Files = (auto_Kde_Lib_ALL);
 End
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 71a6d0fb390b..f75f13155f47 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -143,7 +143,7 @@ Module gid_Module_Root_Files_4
 	Default = YES;
 	Styles = (HIDDEN_ROOT);
 	Files = (gid_File_Dat_Root4,
-	auto_File_Lib_ALL
+	auto_File_Lib_ALL,
 	gid_File_Lib_Bib,
 	gid_File_Lib_J,
 	gid_File_Lib_Oox,
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 6c775b9630d9..55b3091c58f2 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -685,7 +685,7 @@ Module gid_Module_Root_Ure_Hidden
             gid_Unixlink_File_Dl_Store,
             gid_Unixlink_File_Dl_Jvmaccess,
             gid_Unixlink_File_Dl_Jvmfwk,
-            auto_Ure_Private_Lib_ALL
+            auto_Ure_Private_Lib_ALL,
             gid_File_Dl_JrepropertiesClass,
             gid_File_Dl_Profile_Jvmfwk3rc,
             gid_File_Dl_Jpipe,
diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp
index 89f2462a61dd..85e349e0e9d0 100644
--- a/scp2/source/tde/module_tde.scp
+++ b/scp2/source/tde/module_tde.scp
@@ -19,7 +19,6 @@ Module gid_Module_Optional_Tde
     PackageInfo = "packinfo_office.txt";
     MOD_NAME_DESC(MODULE_OPTIONAL_TDE);
     Styles = ();
-    Files = (auto_Tde_Lib_ALL
-    );
+    Files = (auto_Tde_Lib_ALL);
 End
 
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index 6628e860f97b..82cc763a8e80 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -37,7 +37,7 @@ Module gid_Module_Prg_Wrt_Bin
     Styles = (HIDDEN_ROOT);
     Files = (gid_File_Bin_Cde_Sagenda,gid_File_Bin_Cde_Sfax,gid_File_Bin_Cde_Slabel,
     gid_File_Bin_Cde_Sletter,gid_File_Bin_Cde_Smemo,gid_File_Bin_Cde_Svcard,
-    auto_Writer_Lib_ALL
+    auto_Writer_Lib_ALL,
     gid_File_Lib_Vbaswobj,
     gid_File_Jar_Email, 
     gid_File_Jar_Mail, 
diff --git a/solenv/gbuild/AutoInstallLibs.mk b/solenv/gbuild/AutoInstallLibs.mk
index 3555c2331145..076d582eef43 100644
--- a/solenv/gbuild/AutoInstallLibs.mk
+++ b/solenv/gbuild/AutoInstallLibs.mk
@@ -9,6 +9,13 @@
 
 # AutoInstallLibs class
 
+define gb_AutoInstallLibs__make_define
+echo "#define $(SCP2ID)_ALL \ " >> $@
+$(foreach binary,$(filter-out $(lastword $(1)),$(1)),echo "    $(binary), \ " >> $@;)
+echo "    $(lastword $(1))" >> $@;
+echo "" >> $@
+endef
+
 $(dir $(call gb_AutoInstallLibs_get_target,%)).dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
@@ -16,10 +23,8 @@ $(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), \ " >> $@;)
-	echo "" >> $@
+	$(call gb_AutoInstallLibs__make_define,\
+		$(foreach lib,$(gb_Library_MODULE_$(INSTALLMODULE)),$(SCP2ID)_$(lib)))
 	$(foreach lib,$(gb_Library_MODULE_$(INSTALLMODULE)),\
 		echo "$(SCP2TEMPLATE)($(SCP2ID)_$(lib),$(call gb_Library_get_runtime_filename,$(lib)))" >> $@;)