officecfg: remove Package_cppheader

Instead include generated headers directly from workdir.

Change-Id: I9d2bcc07175d2bbc16d3cc548c2245e7a4fb0c65

basctl/Library_basctl.mk

@@ -40,6 +40,10 @@ $(eval $(call gb_Library_set_include,basctl,\
 
 $(eval $(call gb_Library_use_external,basctl,boost_headers))
 
+$(eval $(call gb_Library_use_custom_headers,basctl,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,basctl))
 
 $(eval $(call gb_Library_use_libraries,basctl,\

chart2/Library_chartcore.mk

@@ -24,6 +24,10 @@ $(eval $(call gb_Library_add_defs,chartcore,\
 
 $(eval $(call gb_Library_use_external,chartcore,boost_headers))
 
+$(eval $(call gb_Library_use_custom_headers,chartcore,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,chartcore))
 
 $(eval $(call gb_Library_use_libraries,chartcore,\

comphelper/Library_comphelper.mk

@@ -19,8 +19,8 @@
 
 $(eval $(call gb_Library_Library,comphelper))
 
-$(eval $(call gb_Library_use_packages,comphelper,\
-	officecfg_cppheader \
+$(eval $(call gb_Library_use_custom_headers,comphelper,\
+	officecfg/registry \
 ))
 
 $(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp))

connectivity/Library_mork.mk

@@ -24,6 +24,10 @@ $(eval $(call gb_Library_set_include,mork,\
 	$$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_use_custom_headers,mork,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_external,mork,boost_headers))
 
 $(eval $(call gb_Library_use_libraries,mork, \

cui/Library_cui.mk

@@ -24,6 +24,10 @@ $(eval $(call gb_Library_add_defs,cui,\
     $(if $(EXTRA_BUILDID),-DEXTRA_BUILDID=\""$(EXTRA_BUILDID)"\") \
 ))
 
+$(eval $(call gb_Library_use_custom_headers,cui,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,cui))
 
 $(eval $(call gb_Library_use_libraries,cui,\

dbaccess/Library_dbu.mk

@@ -19,6 +19,10 @@ $(eval $(call gb_Library_set_include,dbu,\
 
 $(eval $(call gb_Library_set_precompiled_header,dbu,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbu))
 
+$(eval $(call gb_Library_use_custom_headers,dbu,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,dbu))
 
 $(eval $(call gb_Library_add_defs,dbu,\

desktop/Library_sofficeapp.mk

@@ -18,6 +18,10 @@ $(eval $(call gb_Library_set_include,sofficeapp,\
 
 $(eval $(call gb_Library_use_external,sofficeapp,boost_headers))
 
+$(eval $(call gb_Library_use_custom_headers,sofficeapp,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,sofficeapp))
 
 $(eval $(call gb_Library_add_defs,sofficeapp,\

fpicker/Library_fps_office.mk

@@ -14,6 +14,10 @@ $(eval $(call gb_Library_set_componentfile,fps_office,fpicker/source/office/fps_
 
 $(eval $(call gb_Library_use_external,fps_office,boost_headers))
 
+$(eval $(call gb_Library_use_custom_headers,fps_office,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,fps_office))
 
 $(eval $(call gb_Library_use_libraries,fps_office,\

framework/Library_fwk.mk

@@ -29,6 +29,10 @@ $(eval $(call gb_Library_set_include,fwk,\
 
 $(eval $(call gb_Library_use_external,fwk,boost_headers))
 
+$(eval $(call gb_Library_use_custom_headers,fwk,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,fwk))
 
 $(eval $(call gb_Library_use_libraries,fwk,\

i18nutil/Library_i18nutil.mk

@@ -23,6 +23,10 @@ $(eval $(call gb_Library_use_externals,i18nutil,\
 	icu_headers \
 ))
 
+$(eval $(call gb_Library_use_custom_headers,i18nutil,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,i18nutil))
 
 $(eval $(call gb_Library_add_defs,i18nutil,\

officecfg/CppunitTest_officecfg_cppheader_test.mk

@@ -13,6 +13,10 @@ $(eval $(call gb_CppunitTest_use_libraries,officecfg_cppheader_test,\
 	$(gb_UWINAPI) \
 ))
 
+$(eval $(call gb_CppUnitTest_use_custom_headers,officecfg_cppheader_test,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_CppunitTest_add_exception_objects,officecfg_cppheader_test, \
     officecfg/qa/cppheader \
 ))
@@ -21,6 +25,4 @@ $(eval $(call gb_CppunitTest_use_api,officecfg_cppheader_test, \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_package,officecfg_cppheader_test,officecfg_cppheader))
-
 # vim: set noet sw=4 ts=4:

officecfg/CustomTarget_registry.mk

@@ -11,10 +11,10 @@ $(eval $(call gb_CustomTarget_CustomTarget,officecfg/registry))
 
 $(call gb_CustomTarget_get_target,officecfg/registry) : \
 	$(foreach i,officecfg_qa_allheaders $(officecfg_XCSFILES),\
-		$(call gb_CustomTarget_get_workdir,officecfg/registry)/$(i).hxx)
+		$(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg/$(i).hxx)
 
 # auto generated header file for unit test qa/cppheader.cxx
-$(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg_qa_allheaders.hxx: \
+$(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg/officecfg_qa_allheaders.hxx: \
 		$(SRCDIR)/officecfg/files.mk
 	$(call gb_Output_announce,officecfg_qa_allheaders.hxx,$(true),CAT,1)
 	mkdir -p $(dir $@) && \
@@ -25,7 +25,7 @@ $(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg_qa_allheaders.h
 # pass the stem as space separated path elements and get a set of --stringparam ns<level> <element> in return
 officecfg_xsltparams=$(if $(filter-out $(lastword $1),$1),$(call officecfg_xsltparams,$(filter-out $(lastword $1),$1))) --stringparam ns$(words $1) $(lastword $1)
 
-$(call gb_CustomTarget_get_workdir,officecfg/registry)/%.hxx: \
+$(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg/%.hxx: \
             $(SRCDIR)/officecfg/registry/schema/org/openoffice/%.xcs \
             $(SRCDIR)/officecfg/registry/cppheader.xsl\
 	    | $(call gb_ExternalExecutable_get_dependencies,xsltproc)

officecfg/Module_officecfg.mk

@@ -22,7 +22,6 @@ include $(SRCDIR)/officecfg/files.mk
 
 $(eval $(call gb_Module_add_targets,officecfg,\
     CustomTarget_registry \
-    Package_cppheader \
     Package_misc \
     Package_tools \
     Configuration_officecfg \

officecfg/Package_cppheader.mk

-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,officecfg_cppheader,$(WORKDIR)/CustomTarget/officecfg/registry))
-
-$(eval $(foreach i,officecfg_qa_allheaders $(officecfg_XCSFILES),$(call \
-    gb_Package_add_file,officecfg_cppheader,inc/officecfg/$(i).hxx,$(i).hxx)))
-
-# vim: set noet sw=4 ts=4:

padmin/Library_spa.mk

@@ -25,6 +25,10 @@ $(eval $(call gb_Library_add_defs,spa,\
 
 $(eval $(call gb_Library_use_external,spa,boost_headers))
 
+$(eval $(call gb_Library_use_custom_headers,spa,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,spa))
 
 $(eval $(call gb_Library_use_libraries,spa,\
@@ -40,7 +44,6 @@ $(eval $(call gb_Library_use_libraries,spa,\
 	$(gb_UWINAPI) \
 ))
 
-
 $(eval $(call gb_Library_add_exception_objects,spa,\
     padmin/source/adddlg \
     padmin/source/cmddlg \

sc/Library_sc.mk

@@ -29,6 +29,10 @@ $(eval $(call gb_Library_add_defs,sc,\
 	-DSC_INFO_OSVERSION=\"$(OS)\" \
 ))
 
+$(eval $(call gb_Library_use_custom_headers,sc,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,sc))
 
 $(eval $(call gb_Library_use_externals,sc,\

sc/Library_scfilt.mk

@@ -21,6 +21,10 @@ $(eval $(call gb_Library_set_include,scfilt,\
 
 $(eval $(call gb_Library_use_sdk_api,scfilt))
 
+$(eval $(call gb_Library_use_custom_headers,scfilt,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_externals,scfilt,\
 	boost_headers \
 	mdds_headers \

sd/Library_sd.mk

@@ -52,6 +52,10 @@ $(eval $(call gb_Library_add_defs,sd,\
 ))
 endif
 
+$(eval $(call gb_Library_use_custom_headers,sd,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,sd))
 
 $(eval $(call gb_Library_use_libraries,sd,\

sfx2/Library_sfx.mk

@@ -27,6 +27,10 @@ $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots))
 
 $(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx))
 
+$(eval $(call gb_Library_use_custom_headers,sfx,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,sfx))
 
 $(eval $(call gb_Library_set_include,sfx,\

svl/Library_svl.mk

@@ -37,6 +37,10 @@ $(eval $(call gb_Library_set_include,svl,\
     $$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_use_custom_headers,svl,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,svl))
 
 $(eval $(call gb_Library_add_defs,svl,\

svtools/Library_svt.mk

@@ -23,6 +23,10 @@ $(eval $(call gb_Library_set_precompiled_header,svt,$(SRCDIR)/svtools/inc/pch/pr
 
 $(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt))
 
+$(eval $(call gb_Library_use_custom_headers,svt,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,svt))
 
 $(eval $(call gb_Library_set_include,svt,\

svx/Library_svxcore.mk

@@ -27,6 +27,10 @@ $(eval $(call gb_Library_use_packages,svxcore,\
     svx_sdi \
 ))
 
+$(eval $(call gb_Library_use_custom_headers,svxcore,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,svxcore))
 
 $(eval $(call gb_Library_set_include,svxcore,\

sw/Library_sw.mk

@@ -34,6 +34,10 @@ $(eval $(call gb_Library_set_include,sw,\
     $$(INCLUDE) \
 ))
 
+$(eval $(call gb_Library_use_custom_headers,sw,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,sw))
 
 $(eval $(call gb_Library_add_defs,sw,\

sw/Library_swui.mk

@@ -30,6 +30,10 @@ $(eval $(call gb_Library_set_include,swui,\
 
 $(eval $(call gb_Library_use_external,swui,boost_headers))
 
+$(eval $(call gb_Library_use_custom_headers,swui,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,swui))
 
 ifeq ($(SYSTEM_LIBXML),YES)

vcl/Library_vcl.mk

@@ -60,6 +60,10 @@ $(eval $(call gb_Library_add_defs,vcl,\
 
 $(eval $(call gb_Library_use_sdk_api,vcl))
 
+$(eval $(call gb_Library_use_custom_headers,vcl,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_externals,vcl,\
 	jpeg \
 	nss3 \

vcl/Library_vclplug_gtk.mk

@@ -36,6 +36,10 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk,\
 ))
 endif
 
+$(eval $(call gb_Library_use_custom_headers,vclplug_gtk,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,vclplug_gtk))
 
 $(eval $(call gb_Library_use_libraries,vclplug_gtk,\

vcl/Library_vclplug_gtk3.mk

@@ -37,6 +37,10 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk3,\
     -DVCLPLUG_GTK_IMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_use_custom_headers,vclplug_gtk3,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,vclplug_gtk3))
 
 $(eval $(call gb_Library_add_libs,vclplug_gtk3,\

xmloff/Library_xo.mk

@@ -34,6 +34,10 @@ $(eval $(call gb_Library_add_defs,xo,\
 
 $(eval $(call gb_Library_use_external,xo,boost_headers))
 
+$(eval $(call gb_Library_use_custom_headers,xo,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,xo))
 
 $(eval $(call gb_Library_use_libraries,xo,\

xmlsecurity/Library_xsec_xmlsec.mk

@@ -22,6 +22,10 @@ $(eval $(call gb_Library_set_include,xsec_xmlsec,\
 	-I$(call gb_UnpackedTarball_get_dir,xmlsec/include) \
 ))
 
+$(eval $(call gb_Library_use_custom_headers,xsec_xmlsec,\
+	officecfg/registry \
+))
+
 $(eval $(call gb_Library_use_sdk_api,xsec_xmlsec))
 
 $(eval $(call gb_Library_add_defs,xsec_xmlsec,\