diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-10-25 00:31:55 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-25 00:40:54 +0200 |
| commit | 3113389d438a0e897e48a445f0443183331a3482 (patch) | |
| tree | 11875fcdcd62c53ed5fe1b41e7caf9a28bd64502 /solenv | |
| parent | ca284bb7467dd2ae711e35a1735234c6e828ef04 (diff) | |
gbuild: Extension: remove ugly "nodefaults" mode again
Change-Id: I723f70224a00972993d5b8592dd5e3834be7fd84
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Dictionary.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Extension.mk | 8 | ||||
| -rw-r--r-- | solenv/gbuild/ExtensionTarget.mk | 12 |
3 files changed, 10 insertions, 12 deletions
diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk index 989074821024..c40e376ee8fa 100644 --- a/solenv/gbuild/Dictionary.mk +++ b/solenv/gbuild/Dictionary.mk @@ -62,7 +62,7 @@ gb_Dictionary_extensionname = Dictionary/$(1) # # gb_Dictionary_Dictionary dictionary srcdir define gb_Dictionary_Dictionary -$(call gb_ExtensionTarget_ExtensionTarget,$(call gb_Dictionary_extensionname,$(1)),$(SRCDIR)/$(2),$(2)) +$(call gb_ExtensionTarget_ExtensionTarget,$(call gb_Dictionary_extensionname,$(1)),$(2)) $(call gb_Dictionary_add_root_file,$(1),$(2)/$(gb_Dictionary_CONFIGURATION_FILE)) $(call gb_Dictionary_get_target,$(1)) : $(call gb_ExtensionTarget_get_target,$(call gb_Dictionary_extensionname,$(1))) diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index ddf328b29bf9..eee1232eccf5 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -28,11 +28,9 @@ # Extension class define gb_Extension_Extension -$(call gb_ExtensionTarget_ExtensionTarget,$(1),$(if $(filter nodefaults,$(3)),$(2),$(SRCDIR)/$(2)),$(if $(filter nodefaults,$(3)),,$(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_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)) diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index fd55c51c9037..3e7643205a70 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -131,22 +131,22 @@ $(call gb_ExtensionTarget_get_target,%) : \ # add deliverable # add dependency for outdir target to workdir target (pattern rule for delivery is in Package.mk) # -# gb_ExtensionTarget_ExtensionTarget extension srcdir l10n-srcdir? +# gb_ExtensionTarget_ExtensionTarget extension srcdir define gb_ExtensionTarget_ExtensionTarget $(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 := $(2) +$(call gb_ExtensionTarget_get_target,$(1)) : LOCATION := $(SRCDIR)/$(2) $(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := $(PLATFORMID) -$(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(3))) +$(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2))) $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : \ - $(2)/description.xml + $(SRCDIR)/$(2)/description.xml $(call gb_ExtensionTarget_get_workdir,$(1))/description.xml :| \ $(call gb_ExtensionTarget__get_preparation_target,$(1)) ifneq ($(strip $(gb_WITH_LANG)),) -$(if $(3),$(call gb_ExtensionTarget_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(3)/localize.sdf) -$(if $(3),$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $(gb_SDFLOCATION)/$(3)/localize.sdf) +$(call gb_ExtensionTarget_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(2)/localize.sdf +$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $(gb_SDFLOCATION)/$(2)/localize.sdf endif $(foreach lang,$(gb_ExtensionTarget_ALL_LANGS), \ |