diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-02-27 11:22:54 +0100 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-02-27 21:59:48 +0000 |
| commit | e2e68b5c65911fa75ed5b3935e0cf1ca0fabc2d8 (patch) | |
| tree | d6e29a3076bac89363660d7b32eed285c0ec907e /odk | |
| parent | fc8022431a1684f3cfb1e2f7e4ec923a8e71df94 (diff) | |
odk: pull idl files directly from udkapi/offapi
Change-Id: I6832fadd0f469f1920580ec1beed9abe085f9bb9
Reviewed-on: https://gerrit.libreoffice.org/2437
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CustomTarget_idl.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/odk/CustomTarget_idl.mk b/odk/CustomTarget_idl.mk index ab56cf07c8f2..a2c38fc1fc00 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: |