odk/CustomTarget_idl.mk | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
New commits:
commit fb23f10f191b9229fc570c4b38cfc29ca53d5ce7
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Thu Feb 28 11:06:14 2013 +0100
odk: do not copy to the same place in parallel
Change-Id: I23e26d167b239f4f68ed2c857d2c0a5eaaf1a89c
diff --git a/odk/CustomTarget_idl.mk b/odk/CustomTarget_idl.mk
index a2c38fc..b3ef74e 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:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
