[PATCH] gbuild: do not deliver UNO API headers

[David Tardon (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3505

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/05/3505/1

gbuild: do not deliver UNO API headers

There is no reason to copy 1000s of files to $(OUTDIR)/inc when we can
easily include them from $(WORKDIR).

Change-Id: I133ab6506ba76af132143b982f056e652c09d8f5
---
M solenv/gbuild/LinkTarget.mk
M solenv/gbuild/UnoApi.mk
M svx/Executable_gengal.bin.mk
3 files changed, 4 insertions(+), 10 deletions(-)



diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e8ce7f0..3a11f30 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -758,8 +758,7 @@
 
 define gb_LinkTarget__use_api
 $(call gb_LinkTarget_get_target,$(1)) :| $(call gb_UnoApi_get_target,$(2))
-$(call gb_LinkTarget_use_package,$(1),$(2)_inc)
-$(call gb_LinkTarget__add_include,$(1),$(OUTDIR)/inc/$(2))
+$(call gb_LinkTarget__add_include,$(1),$(call gb_UnoApiHeadersTarget_get_dir,$(2)))
 
 endef
 
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index a7a6a15..7e8b9d9 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -35,19 +35,16 @@
 $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1))
 $(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR))
 $(call gb_Package_set_outdir,$(1)_idl,$(INSTDIR))
-$(call gb_Package_Package_internal,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_dir,$(1)))
 
 $(call gb_UnoApiTarget_set_root,$(1),UCR)
 
 $(call gb_UnoApi_get_target,$(1)) :| $(dir $(call gb_UnoApi_get_target,$(1))).dir
 $(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
-$(call gb_UnoApi_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_inc)
+$(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))
-$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_inc)
 
 $(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call gb_Package_get_target,$(1)_idl)
-$(call gb_Package_get_preparation_target,$(1)_inc) : $(call gb_UnoApiHeadersTarget_get_target,$(1))
 
 $(call gb_Deliver_add_deliverable,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1))
 
@@ -71,7 +68,6 @@
 endef
 
 define gb_UnoApi__add_headerfile_impl
-$(call gb_Package_add_file,$(1)_inc,inc/$(2),$(3))
 $(call gb_UnoApiHeadersTarget_add_headerfile,$(1),$(2),$(3))
 
 endef
diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk
index 74c8278..7be4ace 100644
--- a/svx/Executable_gengal.bin.mk
+++ b/svx/Executable_gengal.bin.mk
@@ -30,13 +30,12 @@
     $$(INCLUDE) \
     -I$(SRCDIR)/svx/inc/ \
     -I$(SRCDIR)/svx/inc/pch \
-    -I$(OUTDIR)/inc/offuh \
-    -I$(OUTDIR)/inc/udkapi \
-    -I$(OUTDIR)/inc/offapi \
 ))
 
 $(eval $(call gb_Executable_use_external,$(svx_GENGALBIN),boost_headers))
 
+$(eval $(call gb_Executable_use_sdk_api,$(svx_GENGALBIN)))
+
 $(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\
     basegfx \
     sal \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I133ab6506ba76af132143b982f056e652c09d8f5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon <dtardon at redhat.com>