diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-05 17:27:22 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-06 13:33:32 +0200 |
| commit | 5c021048638ce29a2e4c848f725e4a7447f8522f (patch) | |
| tree | e9415537d5ca62876e1d9e77b6099926335cb7c7 /solenv/gbuild/UnpackedTarball.mk | |
| parent | a62e73a74b2d3f3b373f902e969e74739f32cd93 (diff) | |
provide an easy way to depend on makefile from gbuild classes
$(lastword $(MAKEFILE_LIST)) is not what is expected if the makefile
includes other makefile as the first step (as some do). See
UnpackedTarball.mk, where I already tried to workaround the problem.
Change-Id: Ib713a698f52ba16f46fbbc4c50b43edd69c9a472
Diffstat (limited to 'solenv/gbuild/UnpackedTarball.mk')
| -rw-r--r-- | solenv/gbuild/UnpackedTarball.mk | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index 87c25a5cd90e..dd47a35a6d7d 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -185,11 +185,6 @@ $(call gb_UnpackedTarball_get_clean_target,%) : $(call gb_UnpackedTarball_get_pristine_dir,$*) \ ) -define gb_UnpackedTarball__get_makefile -$(lastword $(foreach makefile,$(MAKEFILE_LIST),$(if $(filter UnpackedTarball_%,$(notdir $(makefile))),$(makefile)))) - -endef - # Initialize unpacked tarball define gb_UnpackedTarball_UnpackedTarball_internal $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_DESTFILES := @@ -199,7 +194,7 @@ $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHES := $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHLEVEL := $(gb_UnpackedTarball_PATCHLEVEL_DEFAULT) $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_POST_ACTION := -$(call gb_UnpackedTarball_get_preparation_target,$(1)) : $(call gb_UnpackedTarball__get_makefile) +$(call gb_UnpackedTarball_get_preparation_target,$(1)) : $(gb_Module_CURRENTMAKEFILE) $(call gb_UnpackedTarball_get_preparation_target,$(1)) :| $(dir $(call gb_UnpackedTarball_get_target,$(1))).dir $(call gb_UnpackedTarball_get_target,$(1)) : $(call gb_UnpackedTarball_get_preparation_target,$(1)) $(call gb_UnpackedTarball_get_target,$(1)) :| $(dir $(call gb_UnpackedTarball_get_target,$(1))).dir |