diff options
| author | Andras Timar <atimar@suse.com> | 2012-10-01 16:50:35 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-10-01 17:16:47 +0200 |
| commit | e4080dce647edfcec832164fcfb56cb36e220e27 (patch) | |
| tree | bcfa37978d4fad1cf5fd82c8e0e1a0ab1db6fb93 /solenv | |
| parent | 968ed85d7304fe0044d3f82af20ae7190ad3c33d (diff) | |
fdo#50163 move definition of PLATFORMID into configure.in
Change-Id: Iea8385aa9213ccde7e6650cb934361597d508250
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Extension.mk | 8 | ||||
| -rw-r--r-- | solenv/gbuild/ExtensionTarget.mk | 10 |
2 files changed, 1 insertions, 17 deletions
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index c728e0d83d15..281bac89420a 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -41,14 +41,6 @@ $$(eval $$(call gb_Module_register_target,$(call gb_Extension_get_target,$(1)),$ endef -# Set platform. -# -# Only use this if the extension is platform-dependent. -define gb_Extension_set_platform -$(call gb_ExtensionTarget_set_platform,$(1),$(2)) - -endef - define gb_Extension_add_file $(call gb_ExtensionTarget_add_file,$(1),$(2),$(3)) diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 75b9e0c16bd8..91f1be3ed57a 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -127,7 +127,7 @@ $(call gb_ExtensionTarget_get_target,$(1)) : DESCRIPTION := $(call gb_ExtensionTarget_get_target,$(1)) : FILES := META-INF description.xml $(call gb_ExtensionTarget_get_target,$(1)) : LICENSE := $(call gb_ExtensionTarget_get_target,$(1)) : LOCATION := $(SRCDIR)/$(2) -$(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := +$(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := $(PLATFORMID) $(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2))) $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $(SRCDIR)/$(2)/description.xml ifneq ($(strip $(gb_WITH_LANG)),) @@ -139,14 +139,6 @@ $(foreach lang,$(gb_ExtensionTarget_ALL_LANGS), \ $(call gb_ExtensionTarget__compile_help_onelang,$(1),$(lang))) endef -# Set platform. -# -# Only use this if the extension is platform-dependent. -define gb_ExtensionTarget_set_platform -$(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := $(2) - -endef - # Use the default license file define gb_ExtensionTarget_use_default_license $(call gb_ExtensionTarget_get_target,$(1)) : FILES += registration |