[PATCH] odk: pull idl files directly from udkapi/offapi

[Matúš Kukan (via_Code_Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2437

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/2437/1

odk: pull idl files directly from udkapi/offapi

Change-Id: I6832fadd0f469f1920580ec1beed9abe085f9bb9
---
M odk/CustomTarget_idl.mk
1 file changed, 8 insertions(+), 9 deletions(-)



diff --git a/odk/CustomTarget_idl.mk b/odk/CustomTarget_idl.mk
index ab56cf0..a2c38fc 100644
--- a/odk/CustomTarget_idl.mk
+++ b/odk/CustomTarget_idl.mk
@@ -9,18 +9,17 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/idl))
 
-# FIXME: should be pulled in from offapi/udkapi
-odk_IDLLIST := $(subst $(OUTDIR)/idl/,,$(shell find $(OUTDIR)/idl/com -type f))
-
 define odk_idl
-odkcommon_ZIPLIST += idl/$(1)
-$(call gb_CustomTarget_get_target,odk/odkcommon/idl): $(odk_WORKDIR)/idl/$(1)
-$(odk_WORKDIR)/idl/$(1): $(OUTDIR)/idl/$(1)
-	mkdir -p $$(dir $$@)
+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)
-	cp $$< $$@
+	mkdir -p $(odk_WORKDIR)/idl
+	cp -rf $(SRCDIR)/$(1)/com $(odk_WORKDIR)/idl
+	touch $$@
+
 endef
 
-$(foreach idl,$(odk_IDLLIST),$(eval $(call odk_idl,$(idl))))
+$(foreach api,udkapi offapi,$(eval $(call odk_idl,$(api))))
 
 # vim: set noet sw=4 ts=4:

-- 
To view, visit https://gerrit.libreoffice.org/2437
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6832fadd0f469f1920580ec1beed9abe085f9bb9
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan <matus.kukan at gmail.com>