summaryrefslogtreecommitdiff
path: root/odk
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2013-02-28 11:06:14 +0100
committerMatúš Kukan <matus.kukan@gmail.com>2013-02-28 11:30:38 +0100
commitfb23f10f191b9229fc570c4b38cfc29ca53d5ce7 (patch)
tree7fcbbf90449184f43d786455f6a8b9338d825533 /odk
parentcc9849118fb4e67d1b37f8a69c97fefbcd5db194 (diff)
odk: do not copy to the same place in parallel
Change-Id: I23e26d167b239f4f68ed2c857d2c0a5eaaf1a89c
Diffstat (limited to 'odk')
-rw-r--r--odk/CustomTarget_idl.mk19
1 files changed, 8 insertions, 11 deletions
diff --git a/odk/CustomTarget_idl.mk b/odk/CustomTarget_idl.mk
index a2c38fc1fc00..b3ef74ed207b 100644
--- a/odk/CustomTarget_idl.mk
+++ b/odk/CustomTarget_idl.mk
@@ -9,17 +9,14 @@
$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/idl))
-define odk_idl
-odkcommon_ZIPLIST += $(subst $(SRCDIR)/$(1)/,idl/,$(shell find $(SRCDIR)/$(1)/com -type f))
-$(call gb_CustomTarget_get_target,odk/odkcommon/idl) : $(odk_WORKDIR)/idl.$(1).done
-$(odk_WORKDIR)/idl.$(1).done :
- $$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1)
- mkdir -p $(odk_WORKDIR)/idl
- cp -rf $(SRCDIR)/$(1)/com $(odk_WORKDIR)/idl
- touch $$@
-
-endef
+odkcommon_ZIPLIST += $(subst $(SRCDIR)/udkapi/,idl/,$(shell find $(SRCDIR)/udkapi/com -type f))
+odkcommon_ZIPLIST += $(subst $(SRCDIR)/offapi/,idl/,$(shell find $(SRCDIR)/offapi/com -type f))
-$(foreach api,udkapi offapi,$(eval $(call odk_idl,$(api))))
+$(call gb_CustomTarget_get_target,odk/odkcommon/idl) :
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1)
+ mkdir -p $(odk_WORKDIR)/idl
+ cp -rf $(SRCDIR)/udkapi/com $(odk_WORKDIR)/idl
+ cp -rf $(SRCDIR)/offapi/com $(odk_WORKDIR)/idl
+ touch $@
# vim: set noet sw=4 ts=4: