diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-07 11:01:55 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-07 11:13:59 +0100 |
| commit | 12f9287bcacc429e4417d14a57d90f40078223dd (patch) | |
| tree | 4f8faf9be2c39e562fa8910d2e9578d03d20bda7 /solenv/gbuild/Extension.mk | |
| parent | Resolves: #i119513# fix loading of CMYK JPEG in PPT import (diff) | |
| download | core-12f9287bcacc429e4417d14a57d90f40078223dd.tar.gz core-12f9287bcacc429e4417d14a57d90f40078223dd.zip | |
Make gb_Extension_use_default_description/license explicit
...as a prerequisite for gbuild'ifying desktop/test/deployment/passive/, which
builds a test extension that does not match those default description/license
settings.
Change-Id: I200ff0ceb9750ed4b1c187305f10469f789d29cb
Diffstat (limited to 'solenv/gbuild/Extension.mk')
| -rw-r--r-- | solenv/gbuild/Extension.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 8d0e3776dfd3..f9a3b80c55fe 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -29,8 +29,6 @@ define gb_Extension_Extension $(call gb_ExtensionTarget_ExtensionTarget,$(1),$(2)) -$(call gb_ExtensionTarget_use_default_license,$(1)) -$(call gb_ExtensionTarget_use_default_description,$(1),$(2)) $(call gb_Extension_get_target,$(1)) : $(call gb_ExtensionTarget_get_target,$(1)) $(call gb_Extension_get_clean_target,$(1)) : $(call gb_ExtensionTarget_get_clean_target,$(1)) @@ -123,6 +121,16 @@ $(call gb_ExtensionTarget_add_helptreefile,$(1),$(2),$(3),$(4),$(5)) endef +define gb_Extension_use_default_description +$(call gb_ExtensionTarget_use_default_description,$(1)) + +endef + +define gb_Extension_use_default_license +$(call gb_ExtensionTarget_use_default_license,$(1)) + +endef + define gb_Extension_use_unpacked $(call gb_ExtensionTarget_use_unpacked,$(1),$(2)) |