diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-11 12:25:59 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-11 16:44:26 +0200 |
| commit | 636da2b1e55c098b9c650f31c217c8f220abbebc (patch) | |
| tree | f84a742066e65492eb4f23ec7edb31ce4262336b /solenv | |
| parent | 23e5debcc528132eedd7f1530216fe2b2158386a (diff) | |
autoinstall: allow to use only one variable listing all ids
Change-Id: I270ea16aedb22c1af765565657ee4069c03ac6f2
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/AutoInstallLibs.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/solenv/gbuild/AutoInstallLibs.mk b/solenv/gbuild/AutoInstallLibs.mk index f7fa75cfc689..c26e708d5033 100644 --- a/solenv/gbuild/AutoInstallLibs.mk +++ b/solenv/gbuild/AutoInstallLibs.mk @@ -17,8 +17,12 @@ $(call gb_AutoInstallLibs_get_target,%) : $(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 "$(call SCP2TEMPLATE,$(lib))" >> $@;) + echo " $(SCP2ID)_$(lib) \ " >> $@;) + echo "" >> $@ + $(foreach lib,$(gb_Library_MODULE_$(INSTALLMODULE)),\ + echo "$(SCP2TEMPLATE)($(SCP2ID)_$(lib),$(call gb_Library_get_runtime_filename,$(lib)))" >> $@;) $(call gb_AutoInstallLibs_get_clean_target,%) : @@ -29,6 +33,7 @@ define gb_AutoInstallLibs_AutoInstallLibs $(call gb_AutoInstallLibs_get_target,$(1)) : $(gb_Helper_PHONY) | $(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) |