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
Reviewed-on: https://gerrit.libreoffice.org/3505Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

solenv/gbuild/LinkTarget.mk

@@ -765,9 +765,8 @@ $(call gb_LinkTarget_get_target,$(1)) : LIBS := $$(filter-out $$(gb_STDLIBS),$$(
 endef
 
 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_get_external_headers_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_target,$(2))
+$(call gb_LinkTarget__add_include,$(1),$(call gb_UnoApiHeadersTarget_get_dir,$(2)))
 
 endef
 

solenv/gbuild/UnoApi.mk

@@ -17,19 +17,16 @@ $(call gb_UnoApiTarget_UnoApiTarget,$(1))
 $(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))
 
@@ -53,7 +50,6 @@ $(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,$(gb_Package_SDKDIRNAME)/i
 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

svx/Executable_gengal.bin.mk

@@ -30,13 +30,12 @@ $(eval $(call gb_Executable_set_include,$(svx_GENGALBIN),\
     $$(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 \