diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-10-23 18:46:31 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-23 19:42:36 +0200 |
| commit | 76146f2f8d537c1942aa3a3288893363cadb1390 (patch) | |
| tree | 5583e93c034d56c1e7f9fd478a25185e9f025d9b /solenv/gbuild/Extension.mk | |
| parent | gbuildification of ct2n (diff) | |
| download | core-76146f2f8d537c1942aa3a3288893363cadb1390.tar.gz core-76146f2f8d537c1942aa3a3288893363cadb1390.zip | |
gbuild: make ct2n module work
- add a preparation target to ExtensionTarget so added files can depend
on unpacked tarball or custom target
- add a "nodefaults" mode to Extension to disable some stuff
Change-Id: I1fce6e948cef0a6d976e2e6555ef5c5f8e90cffb
Diffstat (limited to 'solenv/gbuild/Extension.mk')
| -rw-r--r-- | solenv/gbuild/Extension.mk | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 281bac89420a..d2f29fce45a2 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -28,9 +28,11 @@ # Extension class 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_ExtensionTarget_ExtensionTarget,$(1),$(if $(filter nodefaults,$(3)),$(2),$(SRCDIR)/$(2))) +$(if $(filter nodefaults,$(3)),,\ + $(call gb_ExtensionTarget_use_default_license,$(1))) +$(if $(filter nodefaults,$(3)),,\ + $(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)) @@ -41,6 +43,10 @@ $$(eval $$(call gb_Module_register_target,$(call gb_Extension_get_target,$(1)),$ endef +define gb_Extension_set_license +$(call gb_ExtensionTarget_set_license,$(1),$(2)) +endef + define gb_Extension_add_file $(call gb_ExtensionTarget_add_file,$(1),$(2),$(3)) @@ -122,6 +128,11 @@ $(call gb_ExtensionTarget_add_helptreefile,$(1),$(2),$(3),$(4),$(5)) endef +define gb_Extension_use_unpacked +$(call gb_ExtensionTarget_use_unpacked,$(1),$(2)) + +endef + define gb_Extension_use_package $(call gb_ExtensionTarget_use_package,$(1),$(2)) |