diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-28 14:44:19 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-28 15:20:07 +0200 |
| commit | 92b618f5829bc46104c4c0ba2129bd857b42b4c6 (patch) | |
| tree | b78d7db15a2868f63dcdcfd416cfb12362c74cd3 /solenv | |
| parent | 423bec3b760092cd1aadebd710586b007dd80ee0 (diff) | |
do not copy anything to instdir in build stage
Change-Id: I923704d47d4fbc764e847a1bd6eed9fca2dce089
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/UnoApi.mk | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 9d2a80bd6196..6897af929d0a 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -10,8 +10,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)) +gb_UnoApi_ENABLE_INSTALL := $(and $(filter host,$(gb_Side)),$(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 @@ -30,11 +29,9 @@ $(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),) +ifneq ($(gb_UnoApi_ENABLE_INSTALL),) $(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR)) $(call gb_Package_set_outdir,$(1)_idl,$(INSTDIR)) -endif -ifneq ($(gb_UnoApi_ENABLE_DOC),) $(call gb_Package_Package_internal,$(1)_doc,$(gb_UnoApi_SRCDOCDIR)) $(call gb_Package_set_outdir,$(1)_doc,$(INSTDIR)) endif @@ -56,7 +53,7 @@ $(call gb_Helper_make_userfriendly_targets,$(1),UnoApi) endef -ifneq ($(gb_UnoApi_ENABLE_IDL),) +ifneq ($(gb_UnoApi_ENABLE_INSTALL),) # Create a package of IDL files for putting into SDK. # @@ -72,7 +69,7 @@ $(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,$(gb_Package_SDKDIRNAME)/i endef -else # !gb_UnoApi_ENABLE_IDL +else # !gb_UnoApi_ENABLE_INSTALL gb_UnoApi_package_idlfiles := gb_UnoApi__add_idlfile := @@ -91,7 +88,7 @@ $(call gb_UnoApi__add_headerfile_impl,$(1),$(2),$(subst $() $(),/,$(wordlist 2,$ endef -ifneq ($(gb_UnoApi_ENABLE_DOC),) +ifneq ($(gb_UnoApi_ENABLE_INSTALL),) # gb_UnoApi__add_docfile_impl api htmlfile define gb_UnoApi__add_docfile_impl @@ -129,7 +126,7 @@ $(foreach idlfile,$(3),$(call gb_UnoApi__add_docfile_for_idl,$(1),$(2)/$(idlfile endef -else +else # !gb_UnoApi_ENABLE_INSTALL gb_UnoApi__add_docfile := gb_UnoApi__add_docfiles := |