From cfd5faaf8f9adfb8bffd845784cddf5c1f0616b8 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 28 Apr 2013 14:06:44 +0200 Subject: only deliver IDL files if needed Change-Id: If59a19363d9b82f17fcdfe4632edf6f757c65f64 --- solenv/gbuild/UnoApi.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 4807c3236e2c..a4f13a1dbc7f 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -11,6 +11,7 @@ gb_UnoApi_DOCDIR := $(gb_Package_SDKDIRNAME)/docs/common/ref # NOTE: this is the output dir used in odk/CustomTarget_autodoc.mk gb_UnoApi_SRCDOCDIR := $(call gb_CustomTarget_get_workdir,odk/docs/common/ref) gb_UnoApi_ENABLE_DOC := $(filter ODK,$(BUILD_TYPE)) +gb_UnoApi_ENABLE_IDL := $(filter ODK,$(BUILD_TYPE)) # NOTE: This is needed temporarily to force rebuild with API files from # $(WORKDIR), thus fixing generated deps. Otherwise, a change of an .idl @@ -29,8 +30,10 @@ $(call gb_UnoApi_get_clean_target,%) : define gb_UnoApi_UnoApi $(call gb_UnoApiTarget_UnoApiTarget,$(1)) $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1)) +ifneq ($(gb_UnoApi_ENABLE_IDL),) $(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR)) $(call gb_Package_set_outdir,$(1)_idl,$(INSTDIR)) +endif $(call gb_Package_Package_internal,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_dir,$(1))) ifneq ($(gb_UnoApi_ENABLE_DOC),) $(call gb_Package_Package_internal,$(1)_doc,$(gb_UnoApi_SRCDOCDIR)) @@ -45,7 +48,9 @@ $(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_target,$(1 $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)) $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1)) +ifneq ($(gb_UnoApi_ENABLE_IDL),) $(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call gb_Package_get_target,$(1)_idl) +endif $(call gb_UnoApi__make_outdir_headers_rule,$(1)) @@ -56,6 +61,8 @@ $(call gb_Helper_make_userfriendly_targets,$(1),UnoApi) endef +ifneq ($(gb_UnoApi_ENABLE_IDL),) + # Create a package of IDL files for putting into SDK. # # gb_UnoApi_package_idlfiles api @@ -70,6 +77,13 @@ $(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,$(gb_Package_SDKDIRNAME)/i endef +else # !gb_UnoApi_ENABLE_IDL + +gb_UnoApi_package_idlfiles := +gb_UnoApi__add_idlfile := + +endif + define gb_UnoApi__add_headerfile_impl $(call gb_UnoApiHeadersTarget_add_headerfile,$(1),$(2),$(3)) -- cgit