basctl/Library_basctl.mk | 4 ++ chart2/Library_chartcore.mk | 4 ++ comphelper/Library_comphelper.mk | 4 +- connectivity/Library_calc.mk | 1 connectivity/Library_dbase.mk | 1 connectivity/Library_evoab.mk | 1 connectivity/Library_file.mk | 5 --- connectivity/Library_flat.mk | 1 connectivity/Library_jdbc.mk | 5 --- connectivity/Library_mork.mk | 9 +++--- connectivity/Library_odbcbase.mk | 5 --- connectivity/Module_connectivity.mk | 1 connectivity/Package_generated.mk | 14 --------- cui/Library_cui.mk | 4 ++ dbaccess/Library_dba.mk | 5 --- dbaccess/Library_dbu.mk | 5 +++ desktop/Library_sofficeapp.mk | 4 ++ forms/Library_frm.mk | 1 fpicker/Library_fps_office.mk | 4 ++ framework/Library_fwk.mk | 4 ++ i18nutil/Library_i18nutil.mk | 4 ++ officecfg/CppunitTest_officecfg_cppheader_test.mk | 6 ++-- officecfg/CustomTarget_registry.mk | 6 ++-- officecfg/Module_officecfg.mk | 1 officecfg/Package_cppheader.mk | 15 ---------- oox/CustomTarget_generated.mk | 2 - oox/Library_oox.mk | 6 ---- oox/Module_oox.mk | 2 - oox/Package_generated.mk | 17 ----------- oox/Package_tokens.mk | 14 --------- padmin/Library_spa.mk | 5 ++- sc/Library_sc.mk | 4 ++ sc/Library_scfilt.mk | 5 +++ sd/Library_sd.mk | 4 ++ sd/Library_sdfilt.mk | 4 ++ setup_native/Library_sellangmsi.mk | 4 +- setup_native/Module_setup_native.mk | 1 setup_native/Package_spell.mk | 14 --------- sfx2/Library_sfx.mk | 4 ++ starmath/Library_sm.mk | 2 + svl/Library_svl.mk | 4 ++ svtools/Library_svt.mk | 4 ++ svx/Library_svxcore.mk | 5 +++ sw/Library_msword.mk | 5 ++- sw/Library_sw.mk | 4 ++ sw/Library_swui.mk | 4 ++ sw/inc/pch/precompiled_msword.hxx | 2 - sw/source/filter/ww8/wrtw8nds.cxx | 2 - sw/source/filter/ww8/wrtw8num.cxx | 2 - sw/source/filter/ww8/wrtw8sty.cxx | 2 - sw/source/filter/ww8/wrtww8.cxx | 2 - sw/source/filter/ww8/wrtww8gr.cxx | 2 - sw/source/filter/ww8/ww8atr.cxx | 2 - vcl/Library_vcl.mk | 4 ++ vcl/Library_vclplug_gtk.mk | 4 ++ vcl/Library_vclplug_gtk3.mk | 4 ++ writerfilter/CustomTarget_source.mk | 7 ++-- writerfilter/Library_writerfilter.mk | 1 writerfilter/Module_writerfilter.mk | 1 writerfilter/Package_sprmids.mk | 33 ---------------------- xmloff/Library_xo.mk | 4 ++ xmlsecurity/Library_xsec_xmlsec.mk | 4 ++ 62 files changed, 143 insertions(+), 161 deletions(-)
New commits: commit a7b7f03a219c63632093a58ca998ae0382f2e77a Author: Michael Stahl <mst...@redhat.com> Date: Tue May 7 16:59:27 2013 +0200 setup_native: remove Package_spell Change-Id: I082956036843b6a88e3e1db3d799985599ae2980 diff --git a/setup_native/Library_sellangmsi.mk b/setup_native/Library_sellangmsi.mk index 2979f1e..2df29fc 100644 --- a/setup_native/Library_sellangmsi.mk +++ b/setup_native/Library_sellangmsi.mk @@ -9,8 +9,8 @@ $(eval $(call gb_Library_Library,sellangmsi)) -$(eval $(call gb_Library_use_packages,sellangmsi,\ - setup_native_spell \ +$(eval $(call gb_Library_use_custom_headers,sellangmsi,\ + setup_native/spell \ )) $(eval $(call gb_Library_add_defs,sellangmsi,\ diff --git a/setup_native/Module_setup_native.mk b/setup_native/Module_setup_native.mk index 1f6ad5c..b74ac08 100644 --- a/setup_native/Module_setup_native.mk +++ b/setup_native/Module_setup_native.mk @@ -13,7 +13,6 @@ $(eval $(call gb_Module_add_targets,setup_native,\ $(if $(filter LINUX SOLARIS,$(OS)),Library_getuid) \ CustomTarget_spell \ Package_packinfo \ - Package_spell \ Package_misc \ )) diff --git a/setup_native/Package_spell.mk b/setup_native/Package_spell.mk deleted file mode 100644 index ab61229..0000000 --- a/setup_native/Package_spell.mk +++ /dev/null @@ -1,14 +0,0 @@ -# -*- Mode: makefile-gmake; 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,setup_native_spell,$(call gb_CustomTarget_get_workdir,setup_native/spell))) - -$(eval $(call gb_Package_add_file,setup_native_spell,inc/spellchecker_selection.hxx,spellchecker_selection.hxx)) - -# vim: set noet sw=4 ts=4: commit ee6713269255bddc5b97892a5875ef4e015b6ee2 Author: Michael Stahl <mst...@redhat.com> Date: Tue May 7 16:44:36 2013 +0200 connectivity: remove Package_generated This one is ugly, the Yacc generated header is used in lots of places; the dependencies are already right because using the header requires using the dbtools library which builds the YaccTarget, so just yet another include path has to be added. Change-Id: I031fde80ac326551d4719533305b1ae35351ca43 diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk index 6056e26..4f71c14 100644 --- a/connectivity/Library_calc.mk +++ b/connectivity/Library_calc.mk @@ -20,6 +20,7 @@ $(eval $(call gb_Library_set_include,calc,\ $$(INCLUDE) \ -I$(SRCDIR)/connectivity/inc \ -I$(SRCDIR)/connectivity/source/inc \ + -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) $(eval $(call gb_Library_use_libraries,calc,\ diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk index 62c5632..c19731d 100644 --- a/connectivity/Library_dbase.mk +++ b/connectivity/Library_dbase.mk @@ -20,6 +20,7 @@ $(eval $(call gb_Library_set_include,dbase,\ $$(INCLUDE) \ -I$(SRCDIR)/connectivity/inc \ -I$(SRCDIR)/connectivity/source/inc \ + -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) $(eval $(call gb_Library_use_libraries,dbase,\ diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk index 3add37a..a413581 100644 --- a/connectivity/Library_evoab.mk +++ b/connectivity/Library_evoab.mk @@ -13,6 +13,7 @@ $(eval $(call gb_Library_Library,evoab)) $(eval $(call gb_Library_set_include,evoab,\ -I$(SRCDIR)/connectivity/source/inc \ $$(INCLUDE) \ + -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) $(eval $(call gb_Library_use_externals,evoab,\ diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk index ffdf141..765b13b 100644 --- a/connectivity/Library_file.mk +++ b/connectivity/Library_file.mk @@ -10,10 +10,6 @@ $(eval $(call gb_Library_Library,file)) -$(eval $(call gb_Library_use_packages,file,\ - connectivity_generated \ -)) - $(eval $(call gb_Library_add_defs,file,\ -DOOO_DLLIMPLEMENTATION_FILE \ )) @@ -24,6 +20,7 @@ $(eval $(call gb_Library_set_include,file,\ $$(INCLUDE) \ -I$(SRCDIR)/connectivity/inc \ -I$(SRCDIR)/connectivity/source/inc \ + -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) $(eval $(call gb_Library_use_external,file,boost_headers)) diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk index ecea162..3916d16 100644 --- a/connectivity/Library_flat.mk +++ b/connectivity/Library_flat.mk @@ -22,6 +22,7 @@ $(eval $(call gb_Library_set_include,flat,\ $$(INCLUDE) \ -I$(SRCDIR)/connectivity/inc \ -I$(SRCDIR)/connectivity/source/inc \ + -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) $(eval $(call gb_Library_use_libraries,flat,\ diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk index 6af6826..9222bc5 100644 --- a/connectivity/Library_jdbc.mk +++ b/connectivity/Library_jdbc.mk @@ -12,10 +12,6 @@ $(eval $(call gb_Library_Library,jdbc)) $(eval $(call gb_Library_set_componentfile,jdbc,connectivity/source/drivers/jdbc/jdbc)) -$(eval $(call gb_Library_use_packages,jdbc,\ - connectivity_generated \ -)) - $(eval $(call gb_Library_use_external,jdbc,boost_headers)) $(eval $(call gb_Library_use_sdk_api,jdbc)) @@ -24,6 +20,7 @@ $(eval $(call gb_Library_set_include,jdbc,\ $$(INCLUDE) \ -I$(SRCDIR)/connectivity/inc \ -I$(SRCDIR)/connectivity/source/inc \ + -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) $(eval $(call gb_Library_use_libraries,jdbc,\ diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk index 19cf4f9..4041049 100644 --- a/connectivity/Library_mork.mk +++ b/connectivity/Library_mork.mk @@ -11,10 +11,6 @@ $(eval $(call gb_Library_Library,mork)) $(eval $(call gb_Library_set_componentfile,mork,connectivity/source/drivers/mork/mork)) -$(eval $(call gb_Library_use_packages,mork,\ - connectivity_generated \ -)) - $(eval $(call gb_Library_add_defs,mork,\ -DLO_DLLIMPLEMENTATION_MORK \ )) @@ -22,6 +18,7 @@ $(eval $(call gb_Library_add_defs,mork,\ $(eval $(call gb_Library_set_include,mork,\ -I$(SRCDIR)/connectivity/source/inc \ $$(INCLUDE) \ + -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) $(eval $(call gb_Library_use_custom_headers,mork,\ diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk index 9819cfa..2db5823 100644 --- a/connectivity/Library_odbcbase.mk +++ b/connectivity/Library_odbcbase.mk @@ -12,16 +12,13 @@ $(eval $(call gb_Library_Library,odbcbase)) $(eval $(call gb_Library_set_warnings_not_errors,odbcbase)) -$(eval $(call gb_Library_use_packages,odbcbase,\ - connectivity_generated \ -)) - $(eval $(call gb_Library_use_sdk_api,odbcbase)) $(eval $(call gb_Library_set_include,odbcbase,\ $$(INCLUDE) \ -I$(SRCDIR)/connectivity/inc \ -I$(SRCDIR)/connectivity/source/inc \ + -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) $(eval $(call gb_Library_add_defs,odbcbase,\ diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index b10575a..da4f5c9 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -30,7 +30,6 @@ $(eval $(call gb_Module_add_targets,connectivity,\ Library_odbc \ Library_odbcbase) \ Library_sdbc2 \ - Package_generated \ )) ifneq ($(SOLAR_JAVA),) diff --git a/connectivity/Package_generated.mk b/connectivity/Package_generated.mk deleted file mode 100644 index 7d6fd8e..0000000 --- a/connectivity/Package_generated.mk +++ /dev/null @@ -1,14 +0,0 @@ -# -*- Mode: makefile-gmake; 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,connectivity_generated,$(WORKDIR)/YaccTarget/connectivity)) - -$(eval $(call gb_Package_add_file,connectivity_generated,inc/sqlbison.hxx,source/parse/sqlbison.hxx)) - -# vim: set noet sw=4 ts=4: diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index 2c2b894..b3b794d 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -9,14 +9,11 @@ $(eval $(call gb_Library_Library,dba)) -$(eval $(call gb_Library_use_packages,dba,\ - connectivity_generated \ -)) - $(eval $(call gb_Library_set_include,dba,\ $$(INCLUDE) \ -I$(SRCDIR)/dbaccess/source/inc \ -I$(SRCDIR)/dbaccess/source/core/inc \ + -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) $(eval $(call gb_Library_add_defs,dba,\ diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 9980da7..d2e9285 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -15,6 +15,7 @@ $(eval $(call gb_Library_set_include,dbu,\ -I$(SRCDIR)/dbaccess/source/inc \ -I$(SRCDIR)/dbaccess/source/ui/inc \ -I$(call gb_SrsTemplateTarget_get_include_dir,dbaccess) \ + -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) $(eval $(call gb_Library_set_precompiled_header,dbu,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbu)) diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 5dc85a9..61e88ca 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -13,6 +13,7 @@ $(eval $(call gb_Library_set_include,frm,\ $$(INCLUDE) \ -I$(SRCDIR)/forms/source/inc \ -I$(SRCDIR)/forms/source/solar/inc \ + -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) $(eval $(call gb_Library_use_api,frm,\ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 9b77538..f3601ba 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_set_include,svxcore,\ -I$(SRCDIR)/svx/source/inc \ $$(INCLUDE) \ -I$(WORKDIR)/SdiTarget/svx/sdi \ + -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) $(eval $(call gb_Library_set_precompiled_header,svxcore,$(SRCDIR)/svx/inc/pch/precompiled_svxcore)) commit 38f5717b1d488b866d55a603eea1260c6203fd69 Author: Michael Stahl <mst...@redhat.com> Date: Tue May 7 15:53:03 2013 +0200 oox: remove Package_generated and Package_tokens Change-Id: Iab5eb4fbfecea905f4eeb9f1b1f503c1908dadc8 diff --git a/oox/CustomTarget_generated.mk b/oox/CustomTarget_generated.mk index 2d7b67c..aca38ab 100644 --- a/oox/CustomTarget_generated.mk +++ b/oox/CustomTarget_generated.mk @@ -11,7 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,oox/generated)) oox_SRC := $(SRCDIR)/oox/source/token oox_MISC := $(call gb_CustomTarget_get_workdir,oox/generated)/misc -oox_INC := $(call gb_CustomTarget_get_workdir,oox/generated)/inc +oox_INC := $(call gb_CustomTarget_get_workdir,oox/generated) oox_GENHEADERPATH := $(oox_INC)/oox/token $(oox_MISC)/vmlexport-shape-types.cxx : \ diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index a8c95ee..3d8743f 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -9,11 +9,6 @@ $(eval $(call gb_Library_Library,oox)) -$(eval $(call gb_Library_use_packages,oox,\ - oox_generated \ - oox_tokens \ -)) - $(eval $(call gb_Library_set_precompiled_header,oox,$(SRCDIR)/oox/inc/pch/precompiled_oox)) $(eval $(call gb_Library_use_custom_headers,oox,oox/generated)) @@ -21,7 +16,6 @@ $(eval $(call gb_Library_use_custom_headers,oox,oox/generated)) $(eval $(call gb_Library_set_include,oox,\ $$(INCLUDE) \ -I$(SRCDIR)/oox/inc \ - -I$(call gb_CustomTarget_get_workdir,oox/generated)/inc \ )) ifeq ($(COM)-$(OS)-$(CPUNAME),GCC-LINUX-IA64) diff --git a/oox/Module_oox.mk b/oox/Module_oox.mk index 3de3f1a..c086254 100644 --- a/oox/Module_oox.mk +++ b/oox/Module_oox.mk @@ -12,8 +12,6 @@ $(eval $(call gb_Module_Module,oox)) $(eval $(call gb_Module_add_targets,oox,\ CustomTarget_generated \ Library_oox \ - Package_generated \ - Package_tokens \ )) # vim: set noet sw=4 ts=4: diff --git a/oox/Package_generated.mk b/oox/Package_generated.mk deleted file mode 100644 index 69e8c90..0000000 --- a/oox/Package_generated.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -*- Mode: makefile-gmake; 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,oox_generated,$(call gb_CustomTarget_get_workdir,oox/generated))) - -$(eval $(call gb_Package_add_file,oox_generated,inc/oox/token/tokens.hxx,inc/oox/token/tokens.hxx)) -$(eval $(call gb_Package_add_file,oox_generated,inc/oox/token/namespaces.hxx,inc/oox/token/namespaces.hxx)) -$(eval $(call gb_Package_add_file,oox_generated,inc/oox/token/properties.hxx,inc/oox/token/properties.hxx)) -$(eval $(call gb_Package_add_file,oox_generated,inc/oox/namespaces.txt,misc/namespaces.txt)) - -# vim: set noet sw=4 ts=4: diff --git a/oox/Package_tokens.mk b/oox/Package_tokens.mk deleted file mode 100644 index d79743b..0000000 --- a/oox/Package_tokens.mk +++ /dev/null @@ -1,14 +0,0 @@ -# -*- Mode: makefile-gmake; 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,oox_tokens,$(SRCDIR)/oox/source/token)) - -$(eval $(call gb_Package_add_file,oox_tokens,inc/oox/tokens.txt,tokens.txt)) - -# vim: set noet sw=4 ts=4: diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index eb5ff86..5b383c4 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -22,6 +22,7 @@ $(eval $(call gb_Library_set_include,scfilt,\ $(eval $(call gb_Library_use_sdk_api,scfilt)) $(eval $(call gb_Library_use_custom_headers,scfilt,\ + oox/generated \ officecfg/registry \ )) diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk index 144e384..0282269 100644 --- a/sd/Library_sdfilt.mk +++ b/sd/Library_sdfilt.mk @@ -22,6 +22,10 @@ endif $(eval $(call gb_Library_use_external,sdfilt,boost_headers)) +$(eval $(call gb_Library_use_custom_headers,sdfilt,\ + oox/generated \ +)) + $(eval $(call gb_Library_use_sdk_api,sdfilt)) $(eval $(call gb_Library_use_libraries,sdfilt,\ diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 624a484..56f0959 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -23,6 +23,8 @@ $(eval $(call gb_Library_set_include,sm,\ $(eval $(call gb_Library_use_external,sm,boost_headers)) +$(eval $(call gb_Library_use_custom_headers,sm,oox/generated)) + $(eval $(call gb_Library_use_sdk_api,sm)) $(eval $(call gb_Library_use_libraries,sm,\ diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index a2b64e3..93a43d1 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -21,7 +21,10 @@ $(eval $(call gb_Library_Library,msword)) $(eval $(call gb_Library_set_componentfile,msword,sw/util/msword)) -$(eval $(call gb_Library_use_custom_headers,msword,writerfilter/source)) +$(eval $(call gb_Library_use_custom_headers,msword,\ + oox/generated \ + writerfilter/source \ +)) $(eval $(call gb_Library_set_precompiled_header,msword,$(SRCDIR)/sw/inc/pch/precompiled_msword)) diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk index 903cf4f..2c467ed 100644 --- a/writerfilter/CustomTarget_source.mk +++ b/writerfilter/CustomTarget_source.mk @@ -61,7 +61,7 @@ writerfilter_ALL = \ $(patsubst %,$(writerfilter_WORK)/OOXMLFactory_%.hxx,$(writerfilter_OOXMLNAMESPACES)) \ $(patsubst %,$(writerfilter_WORK)/OOXMLFactory_%.cxx,$(writerfilter_OOXMLNAMESPACES)) \ -writerfilter_DEP_ooxml_Namespaces_txt=$(OUTDIR)/inc/oox/namespaces.txt +writerfilter_DEP_ooxml_Namespaces_txt=$(call gb_CustomTarget_get_workdir,oox/generated)/misc/namespaces.txt writerfilter_GEN_doctok_ResourceIds_hxx=$(writerfilter_WORK)/doctok/resourceids.hxx writerfilter_GEN_doctok_Resources_cxx=$(writerfilter_WORK)/resources.cxx writerfilter_GEN_doctok_Resources_hxx=$(writerfilter_WORK)/doctok/resources.hxx @@ -187,9 +187,10 @@ $(writerfilter_GEN_ooxml_ResourceIds_hxx) : $(writerfilter_SRC_ooxml_ResourceIds $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1) $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_ooxml_ResourceIds_xsl) $(writerfilter_GEN_ooxml_Model_processed)) > $@ -$(writerfilter_GEN_ooxml_Token_tmp) : $(OUTDIR)/inc/oox/tokens.txt | $(writerfilter_WORK)/.dir +$(writerfilter_GEN_ooxml_Token_tmp) : $(SRCDIR)/oox/source/token/tokens.txt | $(writerfilter_WORK)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CAT,1) - sed "s/\(.*\)/<fasttoken>\1<\/fasttoken>/" < $(OUTDIR)/inc/oox/tokens.txt > $@ + sed "s/\(.*\)/<fasttoken>\1<\/fasttoken>/" \ + < $(SRCDIR)/oox/source/token/tokens.txt > $@ $(writerfilter_GEN_ooxml_Token_xml) : $(writerfilter_SRC)/ooxml/tokenxmlheader $(writerfilter_GEN_ooxml_Token_tmp) $(writerfilter_SRC)/ooxml/tokenxmlfooter $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CAT,1) diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 81d7df2..1993590 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -10,6 +10,7 @@ $(eval $(call gb_Library_Library,writerfilter)) $(eval $(call gb_Library_use_custom_headers,writerfilter,\ + oox/generated \ writerfilter/source \ )) commit 5a8f5914c2077fe330d713a5d3a2be3b3f6a7e9a Author: Michael Stahl <mst...@redhat.com> Date: Tue May 7 15:27:54 2013 +0200 writerfilter: remove Package_sprmids Change-Id: I3791f7f513246faaeb76f9209c08008c78a38619 diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index ef640cd..a2b64e3 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Library_Library,msword)) $(eval $(call gb_Library_set_componentfile,msword,sw/util/msword)) -$(eval $(call gb_Library_use_package,msword,writerfilter_sprmids)) +$(eval $(call gb_Library_use_custom_headers,msword,writerfilter/source)) $(eval $(call gb_Library_set_precompiled_header,msword,$(SRCDIR)/sw/inc/pch/precompiled_msword)) diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index 456f452..461e572 100644 --- a/sw/inc/pch/precompiled_msword.hxx +++ b/sw/inc/pch/precompiled_msword.hxx @@ -265,7 +265,7 @@ #include <vcl/virdev.hxx> #include <vcl/wmf.hxx> #include <vector> -#include <writerfilter/doctok/sprmids.hxx> +#include <doctok/sprmids.hxx> #include <xmloff/odffields.hxx> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 717af47..182c514 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -82,7 +82,7 @@ #include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/i18n/WordType.hpp> -#include <writerfilter/doctok/sprmids.hxx> +#include <doctok/sprmids.hxx> #include "writerhelper.hxx" #include "writerwordglue.hxx" diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index eb1cf9d..82c54c1 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -30,7 +30,7 @@ #include <ndtxt.hxx> #include <com/sun/star/i18n/ScriptType.hpp> -#include <writerfilter/doctok/sprmids.hxx> +#include <doctok/sprmids.hxx> #include "ww8attributeoutput.hxx" #include "writerhelper.hxx" diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 5e3a2c4..097a8a7 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -60,7 +60,7 @@ #include <msfilter.hxx> #include <swmodule.hxx> -#include <writerfilter/doctok/sprmids.hxx> +#include <doctok/sprmids.hxx> #include "writerhelper.hxx" #include "writerwordglue.hxx" diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 53308d8..af5c55f 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -84,7 +84,7 @@ #include <comphelper/extract.hxx> #include <comphelper/stlunosequence.hxx> #include <comphelper/string.hxx> -#include <writerfilter/doctok/sprmids.hxx> +#include <doctok/sprmids.hxx> #include "writerhelper.hxx" #include "writerwordglue.hxx" diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 32c5b2e..80a078b 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -51,7 +51,7 @@ #include <fmtfsize.hxx> #include <fmtornt.hxx> -#include <writerfilter/doctok/sprmids.hxx> +#include <doctok/sprmids.hxx> #include <doc.hxx> #include "writerhelper.hxx" diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 9bd6af9..cc5d402 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -115,7 +115,7 @@ #include <chpfld.hxx> #include <fmthdft.hxx> -#include <writerfilter/doctok/sprmids.hxx> +#include <doctok/sprmids.hxx> #include <fmtcntnt.hxx> #include "writerhelper.hxx" diff --git a/writerfilter/Module_writerfilter.mk b/writerfilter/Module_writerfilter.mk index 40e059c..fe73d1d 100644 --- a/writerfilter/Module_writerfilter.mk +++ b/writerfilter/Module_writerfilter.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,writerfilter)) $(eval $(call gb_Module_add_targets,writerfilter,\ CustomTarget_source \ Library_writerfilter \ - Package_sprmids \ )) $(eval $(call gb_Module_add_check_targets,writerfilter,\ diff --git a/writerfilter/Package_sprmids.mk b/writerfilter/Package_sprmids.mk deleted file mode 100644 index 2eaa530..0000000 --- a/writerfilter/Package_sprmids.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,writerfilter_sprmids,$(call gb_CustomTarget_get_workdir,writerfilter/source))) - -$(eval $(call gb_Package_add_file,writerfilter_sprmids,inc/writerfilter/doctok/sprmids.hxx,doctok/sprmids.hxx)) - -# vim: set noet sw=4 ts=4: commit 368e06b05affe72b7589b340b2b557c4d387c298 Author: Michael Stahl <mst...@redhat.com> Date: Tue May 7 14:23:10 2013 +0200 officecfg: remove Package_cppheader Instead include generated headers directly from workdir. Change-Id: I9d2bcc07175d2bbc16d3cc548c2245e7a4fb0c65 diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index 4e7d1d7..4b163ae 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 0a5db3f..0be06a5 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 1402f3c..0746889 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 c7c80cf..19cf4f9 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 724b479..ade10e4 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 59b843a..9980da7 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 2985000..6396996 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 d28bdcd..4ffcbc6 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 1ca1ddc..f534aab 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 2b79b79..8c0aaf0 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 d1cdf92..09a4932 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 aaf6f16..a482585 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 6e526e9..0e1e943 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 9542b79..0000000 --- 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 da49de2..c4588a5 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 f7be65cc..613151f 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 8a28db9..eb5ff86 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 55fb129..5c9839a 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 ef81f31..4b11e9b 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 eb89abf..b97387d 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 4b339e9..df26085 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 c28e0f8..9b77538 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 4fab3fc..5ace8e8 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 f2c62e9..bec90c2 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 88cbfcf..a4a6957 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 d92e3cd..894d6d6 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 948e528..5cd310f 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 ef8a54c..ba9efca 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 7d53a76..e8fb908 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,\ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits