diff options
| author | David Tardon <dtardon@redhat.com> | 2013-07-11 12:23:39 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-07-12 11:40:29 +0000 |
| commit | 6baa3e1d835e3dd84071038e1e190300300d3408 (patch) | |
| tree | 1a68185bde2b46c8c52827aa280dc479716d5f97 /solenv | |
| parent | a109cf6ab5d208ff6bfc6de180ed0aaa776815c7 (diff) | |
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
Reviewed-on: https://gerrit.libreoffice.org/4831
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/AutoInstallLibs.mk | 13 |
1 files changed, 9 insertions, 4 deletions
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)))" >> $@;) |