diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-06-02 15:26:05 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-06-02 16:34:53 +0200 |
| commit | 203c12c7ce5f54971755fb6fb2f04ec36e7797c4 (patch) | |
| tree | d60a81509f96c89c710a4272b950f6802984f2ea /solenv/gbuild/AutoInstall.mk | |
| parent | bda955398d38f8f7d2de5e03cc5ad4908b85c0d9 (diff) | |
gbuild: AutoInstall: allow per-module Package template
Change-Id: I83404709ae7bd3f4683ea9dab8d3f0e0875bc10f
Diffstat (limited to 'solenv/gbuild/AutoInstall.mk')
| -rw-r--r-- | solenv/gbuild/AutoInstall.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk index 5bf4d985b5cd..9799fc6ecc44 100644 --- a/solenv/gbuild/AutoInstall.mk +++ b/solenv/gbuild/AutoInstall.mk @@ -36,6 +36,7 @@ $(call gb_AutoInstall_get_target,%) : $(GBUILDDIR)/AutoInstall.mk \ $(GBUILDDIR)/gen-autoinstall.py \ '$*' '$(SCP2COMPONENTCONDITION)' \ '$(SCP2LIBTEMPLATE)' '$(SCP2EXETEMPLATE)' '$(SCP2JARTEMPLATE)' \ + '$(SCP2PKGTEMPLATE)' \ $${SDKLIBFILE} $${LIBFILE} $${EXEFILE} $${JARFILE} $${PKGFILE} \ > $@ \ && rm -f $${SDKLIBFILE} $${LIBFILE} $${EXEFILE} $${JARFILE} $${PKGFILE} @@ -53,7 +54,7 @@ $(call gb_Helper_make_userfriendly_targets,all,AutoInstall) endef -# gb_AutoInstall_add_module module lib_template exe_template jar_template componentcondition +# gb_AutoInstall_add_module module lib_template exe_template jar_template package_template componentcondition define gb_AutoInstall_add_module $(call gb_AutoInstall_get_target,all) : $(call gb_AutoInstall_get_target,$(1)) $(call gb_AutoInstall_get_clean_target,all) : $(call gb_AutoInstall_get_clean_target,$(1)) @@ -64,7 +65,8 @@ $(call gb_AutoInstall_get_target,$(1)) :| $(dir $(call gb_AutoInstall_get_target $(call gb_AutoInstall_get_target,$(1)) : SCP2LIBTEMPLATE := $(2) $(call gb_AutoInstall_get_target,$(1)) : SCP2EXETEMPLATE := $(3) $(call gb_AutoInstall_get_target,$(1)) : SCP2JARTEMPLATE := $(4) -$(call gb_AutoInstall_get_target,$(1)) : SCP2COMPONENTCONDITION := $(5) +$(call gb_AutoInstall_get_target,$(1)) : SCP2PKGTEMPLATE := $(5) +$(call gb_AutoInstall_get_target,$(1)) : SCP2COMPONENTCONDITION := $(6) endef |