diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-04 16:49:08 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-04 16:50:18 +0100 |
| commit | 79ab9d7b6ede19bc494770bba6cc59bd4618d5ae (patch) | |
| tree | 43e91538cf0c75f083ad7fa282acb66ba79b70c5 /solenv/gbuild | |
| parent | f985e3add3870c1dee7fe88d37388281a333403a (diff) | |
fdo#74495: gbuild: AutoInstall: add support for ComponentCondition
... via new scp2 macro LIBO_LIB_FILE_COMPONENTCONDITION.
(regression from 2feb756dd5ff486a3972cf676f6f1d07017bf0f6)
Change-Id: I6ab30cc1c14c34bd7dc1325e3f98d972544e7eea
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/AutoInstall.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk index de94507065c6..a7544857c48e 100644 --- a/solenv/gbuild/AutoInstall.mk +++ b/solenv/gbuild/AutoInstall.mk @@ -26,7 +26,7 @@ $(call gb_AutoInstall_get_target,%) : $(SRCDIR)/Repository.mk $(GBUILDDIR)/AutoI $(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)))" >> $@;) + echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@;) $(foreach exe,$(gb_Executable_MODULE_$*),\ echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(subst -,_,$(exe)),$(call gb_Executable_get_filename,$(exe)))" >> $@;) @@ -53,6 +53,7 @@ $(call gb_AutoInstall_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE) $(call gb_AutoInstall_get_target,$(1)) :| $(dir $(call gb_AutoInstall_get_target,$(1))).dir $(call gb_AutoInstall_get_target,$(1)) : SCP2LIBTEMPLATE := $(2) $(call gb_AutoInstall_get_target,$(1)) : SCP2EXETEMPLATE := $(3) +$(call gb_AutoInstall_get_target,$(1)) : SCP2COMPONENTCONDITION := $(4) endef |