diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-03-16 15:37:49 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-03-24 22:39:52 +0100 |
| commit | 1140c380ad15648def3fc7a71d735a46ed4289d9 (patch) | |
| tree | e600f49aa018b9eef8eedb867854fedceef85930 /solenv | |
| parent | bcf0c0ead1a2459606cd8df90cddd40e944f91de (diff) | |
packimages: do not use custom Makefile
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CustomTarget.mk | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk index bcb4874ee197..c2456c0f5278 100644 --- a/solenv/gbuild/CustomTarget.mk +++ b/solenv/gbuild/CustomTarget.mk @@ -37,9 +37,14 @@ define gb_CustomTarget__command endef +# the .dir is for make 3.81, which ignores trailing / +$(call gb_CustomTarget_get_workdir,%)/.dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + $(call gb_CustomTarget_get_target,%) : $(call gb_Output_announce,$*,$(true),MAK,3) - $(call gb_CustomTarget__command,$@,$*) + $(if $(NEW_STYLE),touch $@,\ + $(call gb_CustomTarget__command,$@,$*)) .PHONY: $(call gb_CustomTarget_get_clean_target,%) $(call gb_CustomTarget_get_clean_target,%) : @@ -53,8 +58,13 @@ $(SRCDIR)/$(1)/Makefile endef define gb_CustomTarget_CustomTarget +$(call gb_CustomTarget_get_target,$(1)) : NEW_STYLE := $(2) +ifeq ($(2),) $(call gb_CustomTarget_get_target,$(1)) : \ $(call gb_CustomTarget__get_makefile,$(1)) +else +$$(eval $$(call gb_Module_register_target,$(call gb_CustomTarget_get_target,$(1)),$(call gb_CustomTarget_get_clean_target,$(1)))) +endif endef |