diff options
| author | David Tardon <dtardon@redhat.com> | 2013-07-11 12:23:39 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-11 13:47:15 +0000 |
| commit | bd3aa6983796f9dedf85c446a0ce5e5505583809 (patch) | |
| tree | 4d57692c2cd6f4e31083e8655c1512836c6c51e0 /solenv | |
| parent | 37d9921797a3ad3be8257fbfee11326549fcd987 (diff) | |
fdo#66072 do not end auto_*_ALL by a comma
Change-Id: I7d0fbe865cd10d0a3ef690e521d4752d6d7f3939
Reviewed-on: https://gerrit.libreoffice.org/4829
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/AutoInstall.mk | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk index 61871990a7a2..6494c642e096 100644 --- a/solenv/gbuild/AutoInstall.mk +++ b/solenv/gbuild/AutoInstall.mk @@ -9,18 +9,22 @@ # AutoInstall class +define gb_AutoInstall__make_define +echo "#define auto_$*_ALL \ " >> $@ +$(foreach binary,$(filter-out $(lastword $(1)),$(1)),echo " $(binary), \ " >> $@;) +echo " $(lastword $(1))" >> $@; +echo "" >> $@ +endef + $(dir $(call gb_AutoInstall_get_target,%)).dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_AutoInstall_get_target,%) : $(SRCDIR)/Repository.mk $(GBUILDDIR)/AutoInstall.mk $(call gb_Output_announce,$*,$(true),AIN,3) echo "/* autogenerated installs for group $* */" > $@ - echo "#define auto_$*_ALL \ " >> $@ - $(foreach lib,$(gb_Library_MODULE_$*),\ - echo " auto_$*_lib_$(lib), \ " >> $@;) - $(foreach exe,$(gb_Executable_MODULE_$*),\ - echo " auto_$*_exe_$(exe), \ " >> $@;) - echo "" >> $@ + $(call gb_AutoInstall__make_define,\ + $(foreach lib,$(gb_Library_MODULE_$*),auto_$*_lib_$(lib)) \ + $(foreach exe,$(gb_Executable_MODULE_$*),auto_$*_exe_$(exe))) $(foreach lib,$(gb_Library_MODULE_$*),\ echo "$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib)))" >> $@;) $(foreach exe,$(gb_Executable_MODULE_$*),\ |