diff options
29 files changed, 105 insertions, 24 deletions
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index 4e7d1d7e1822..4b163ae405b9 100644 --- a/basctl/Library_basctl.mk +++ b/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,\ diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index 0a5db3fe17f0..0be06a5dbf66 100644 --- a/chart2/Library_chartcore.mk +++ b/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,\ diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index 1402f3cb4ca6..0746889742b2 100644 --- a/comphelper/Library_comphelper.mk +++ b/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)) diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk index c7c80cf62166..19cf4f982653 100644 --- a/connectivity/Library_mork.mk +++ b/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, \ diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 724b47934838..ade10e44f98f 100644 --- a/cui/Library_cui.mk +++ b/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,\ diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 59b843a43e8f..9980da7203d2 100644 --- a/dbaccess/Library_dbu.mk +++ b/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,\ diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 2985000dd1d5..63969960408d 100644 --- a/desktop/Library_sofficeapp.mk +++ b/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,\ diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk index d28bdcd1396d..4ffcbc60ddd6 100644 --- a/fpicker/Library_fps_office.mk +++ b/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,\ diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index 1ca1ddc4dab9..f534aab81979 100644 --- a/framework/Library_fwk.mk +++ b/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,\ diff --git a/i18nutil/Library_i18nutil.mk b/i18nutil/Library_i18nutil.mk index 2b79b79344a0..8c0aaf0ef1eb 100644 --- a/i18nutil/Library_i18nutil.mk +++ b/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,\ diff --git a/officecfg/CppunitTest_officecfg_cppheader_test.mk b/officecfg/CppunitTest_officecfg_cppheader_test.mk index d1cdf92e9270..09a4932810e9 100644 --- a/officecfg/CppunitTest_officecfg_cppheader_test.mk +++ b/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: diff --git a/officecfg/CustomTarget_registry.mk b/officecfg/CustomTarget_registry.mk index aaf6f16089b2..a482585d0323 100644 --- a/officecfg/CustomTarget_registry.mk +++ b/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) diff --git a/officecfg/Module_officecfg.mk b/officecfg/Module_officecfg.mk index 6e526e98dfbc..0e1e94396e96 100644 --- a/officecfg/Module_officecfg.mk +++ b/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 \ diff --git a/officecfg/Package_cppheader.mk b/officecfg/Package_cppheader.mk deleted file mode 100644 index 9542b790dc16..000000000000 --- a/officecfg/Package_cppheader.mk +++ /dev/null @@ -1,15 +0,0 @@ -# -*- 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: diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk index da49de249591..c4588a5d097f 100644 --- a/padmin/Library_spa.mk +++ b/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 \ diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index f7be65cc91e3..613151f51037 100644 --- a/sc/Library_sc.mk +++ b/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,\ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 8a28db9079e9..eb5ff86c2619 100644 --- a/sc/Library_scfilt.mk +++ b/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 \ diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 55fb129ec698..5c9839af094c 100644 --- a/sd/Library_sd.mk +++ b/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,\ diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index ef81f31c3482..4b11e9b02707 100644 --- a/sfx2/Library_sfx.mk +++ b/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,\ diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index eb89abfab68d..b97387d73d84 100644 --- a/svl/Library_svl.mk +++ b/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,\ diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 4b339e9958e8..df2608568940 100644 --- a/svtools/Library_svt.mk +++ b/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,\ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index c28e0f8c730f..9b77538a656f 100644 --- a/svx/Library_svxcore.mk +++ b/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,\ diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 4fab3fc5a528..5ace8e832707 100644 --- a/sw/Library_sw.mk +++ b/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,\ diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index f2c62e905bae..bec90c2251f6 100644 --- a/sw/Library_swui.mk +++ b/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) diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 88cbfcf9be94..a4a69570e668 100644 --- a/vcl/Library_vcl.mk +++ b/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 \ diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index d92e3cd761e4..894d6d6f7bd1 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/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,\ diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 948e5282892f..5cd310f50603 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/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,\ diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index ef8a54c6d5ba..ba9efca2ba7d 100644 --- a/xmloff/Library_xo.mk +++ b/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,\ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 7d53a765b615..e8fb908e9162 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/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,\ |