odk/CustomTarget_idl.mk | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
New commits: commit e2e68b5c65911fa75ed5b3935e0cf1ca0fabc2d8 Author: Matúš Kukan <[email protected]> Date: Wed Feb 27 11:22:54 2013 +0100 odk: pull idl files directly from udkapi/offapi Change-Id: I6832fadd0f469f1920580ec1beed9abe085f9bb9 Reviewed-on: https://gerrit.libreoffice.org/2437 Reviewed-by: Peter Foley <[email protected]> Tested-by: Peter Foley <[email protected]> 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:
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
