diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-06-16 01:20:51 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-06-18 10:06:46 +0200 |
| commit | 88085a5b79eb7e11c0609b832c316b63146f4976 (patch) | |
| tree | ceb28ff0436666fbc9ef94ac05b6cd4f543df834 /solenv/gbuild/SdiTarget.mk | |
| parent | added unit test for n#820504 (diff) | |
| download | core-88085a5b79eb7e11c0609b832c316b63146f4976.tar.gz core-88085a5b79eb7e11c0609b832c316b63146f4976.zip | |
Reduce the amount of calls of mkdir -p.
Change-Id: Ib4762f5a260035f00b5e68cf45b687fdf02e9c02
Diffstat (limited to 'solenv/gbuild/SdiTarget.mk')
| -rw-r--r-- | solenv/gbuild/SdiTarget.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk index 2fbe2e76276f..881614d1abeb 100644 --- a/solenv/gbuild/SdiTarget.mk +++ b/solenv/gbuild/SdiTarget.mk @@ -28,7 +28,7 @@ gb_SdiTarget_SVIDLCOMMAND := $(call gb_Executable_get_command,svidl) $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi $(gb_SdiTarget_SVIDLDEPS) $(call gb_Output_announce,$*,$(true),SDI,1) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $@) $(dir $(call gb_SdiTarget_get_dep_target,$*))) + mkdir -p $(dir $@)) $(call gb_Helper_abbreviate_dirs,\ cd $(dir $<) && \ $(gb_SdiTarget_SVIDLCOMMAND) -quiet \ @@ -39,7 +39,7 @@ $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi $(gb_SdiTarget_SVIDLDEPS) -fz$@.sid \ -fx$(EXPORTS) \ -fm$@ \ - -fM$(call gb_SdiTarget_get_dep_target,$*) \ + $(if $(gb_FULLDEPS),-fM$(call gb_SdiTarget_get_dep_target,$*)) \ $<) # rule necessary to rebuild cxx files that include the header @@ -47,6 +47,12 @@ $(call gb_SdiTarget_get_target,%.hxx) : $(call gb_SdiTarget_get_target,%) @true ifeq ($(gb_FULLDEPS),$(true)) +$(dir $(call gb_SdiObject_get_dep_target,%)).dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + +$(dir $(call gb_SdiObject_get_dep_target,%))%/.dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + $(call gb_SdiTarget_get_dep_target,%) : $(if $(wildcard $@),touch $@,\ $(call gb_Object__command_dep,$@,$(call gb_SdiTarget_get_target,$*))) @@ -66,6 +72,7 @@ $(call gb_SdiTarget_get_target,$(1)) : INCLUDE := $$(subst -I. ,-I$$(dir $(SRCDI $(call gb_SdiTarget_get_target,$(1)) : EXPORTS := $(SRCDIR)/$(2).sdi ifeq ($(gb_FULLDEPS),$(true)) -include $(call gb_SdiTarget_get_dep_target,$(1)) +$(call gb_SdiTarget_get_dep_target,$(1)) :| $(dir $(call gb_SdiTarget_get_dep_target,$(1))).dir endif endef |