diff options
| -rw-r--r-- | basctl/AllLangResTarget_basctl.mk | 5 | ||||
| -rw-r--r-- | dbaccess/AllLangResTarget_dbu.mk | 5 | ||||
| -rw-r--r-- | reportdesign/AllLangResTarget_rpt.mk | 5 | ||||
| -rw-r--r-- | reportdesign/AllLangResTarget_rptui.mk | 5 | ||||
| -rw-r--r-- | sc/AllLangResTarget_sc.mk | 5 | ||||
| -rw-r--r-- | sd/AllLangResTarget_sd.mk | 5 | ||||
| -rw-r--r-- | starmath/AllLangResTarget_sm.mk | 5 | ||||
| -rw-r--r-- | svx/Module_svx.mk | 1 | ||||
| -rw-r--r-- | svx/Package_globlmn_hrc.mk | 14 | ||||
| -rw-r--r-- | sw/AllLangResTarget_sw.mk | 5 |
10 files changed, 8 insertions, 47 deletions
diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk index 657c9690acfd..34c8dc7fec96 100644 --- a/basctl/AllLangResTarget_basctl.mk +++ b/basctl/AllLangResTarget_basctl.mk @@ -34,11 +34,8 @@ $(eval $(call gb_AllLangResTarget_add_srs,basctl,\ $(eval $(call gb_SrsTarget_SrsTarget,basctl/res)) -$(eval $(call gb_SrsTarget_use_packages,basctl/res,\ - svx_globlmn_hrc \ -)) - $(eval $(call gb_SrsTarget_set_include,basctl/res,\ + -I$(call gb_SrsTemplateTarget_get_include_dir,) \ -I$(SRCDIR)/basctl/inc \ -I$(SRCDIR)/basctl/source/inc \ -I$(SRCDIR)/basctl/source/basicide \ diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk index 646282ca9495..084d5363336e 100644 --- a/dbaccess/AllLangResTarget_dbu.mk +++ b/dbaccess/AllLangResTarget_dbu.mk @@ -17,15 +17,12 @@ $(eval $(call gb_AllLangResTarget_add_srs,dbu,\ $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbu)) -$(eval $(call gb_SrsTarget_use_packages,dbaccess/dbu,\ - svx_globlmn_hrc \ -)) - $(eval $(call gb_SrsTarget_set_include,dbaccess/dbu,\ $$(INCLUDE) \ -I$(call gb_SrsTemplateTarget_get_include_dir,dbaccess) \ -I$(SRCDIR)/dbaccess/inc \ -I$(SRCDIR)/dbaccess/source/ui/inc \ + -I$(call gb_SrsTemplateTarget_get_include_dir,) \ )) $(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\ diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk index 43b91b71c9be..c330adf17b93 100644 --- a/reportdesign/AllLangResTarget_rpt.mk +++ b/reportdesign/AllLangResTarget_rpt.mk @@ -17,13 +17,10 @@ $(eval $(call gb_AllLangResTarget_add_srs,rpt,\ $(eval $(call gb_SrsTarget_SrsTarget,reportdesign/res)) -$(eval $(call gb_SrsTarget_use_packages,reportdesign/res,\ - svx_globlmn_hrc \ -)) - $(eval $(call gb_SrsTarget_set_include,reportdesign/res,\ $$(INCLUDE) \ -I$(SRCDIR)/reportdesign/source/core/inc \ + -I$(call gb_SrsTemplateTarget_get_include_dir,) \ )) $(eval $(call gb_SrsTarget_add_files,reportdesign/res,\ diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk index a496a54718c3..ce526ed046c6 100644 --- a/reportdesign/AllLangResTarget_rptui.mk +++ b/reportdesign/AllLangResTarget_rptui.mk @@ -34,14 +34,11 @@ $(eval $(call gb_AllLangResTarget_add_srs,rptui,reportdesign/rptui)) $(eval $(call gb_SrsTarget_SrsTarget,reportdesign/rptui)) -$(eval $(call gb_SrsTarget_use_packages,reportdesign/rptui,\ - svx_globlmn_hrc \ -)) - $(eval $(call gb_SrsTarget_set_include,reportdesign/rptui,\ $$(INCLUDE) \ -I$(SRCDIR)/reportdesign/source/ui/inc \ -I$(SRCDIR)/reportdesign/inc \ + -I$(call gb_SrsTemplateTarget_get_include_dir,) \ )) diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk index dbfcd2b4e555..9b0541a562b5 100644 --- a/sc/AllLangResTarget_sc.mk +++ b/sc/AllLangResTarget_sc.mk @@ -16,10 +16,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,sc,\ $(eval $(call gb_SrsTarget_SrsTarget,sc/res)) -$(eval $(call gb_SrsTarget_use_packages,sc/res,\ - svx_globlmn_hrc \ -)) - $(eval $(call gb_SrsTarget_set_include,sc/res,\ $$(INCLUDE) \ -I$(SRCDIR)/sc/inc \ @@ -29,6 +25,7 @@ $(eval $(call gb_SrsTarget_set_include,sc/res,\ -I$(SRCDIR)/sc/source/ui/pagedlg \ -I$(SRCDIR)/sc/source/ui/dbgui \ -I$(SRCDIR)/sc/source/ui/formdlg \ + -I$(call gb_SrsTemplateTarget_get_include_dir,) \ )) $(eval $(call gb_SrsTarget_add_files,sc/res,\ diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk index 0e5938471e13..28e3b942883d 100644 --- a/sd/AllLangResTarget_sd.mk +++ b/sd/AllLangResTarget_sd.mk @@ -17,16 +17,13 @@ $(eval $(call gb_AllLangResTarget_add_srs,sd,\ $(eval $(call gb_SrsTarget_SrsTarget,sd/res)) -$(eval $(call gb_SrsTarget_use_packages,sd/res,\ - svx_globlmn_hrc \ -)) - $(eval $(call gb_SrsTarget_set_include,sd/res,\ $$(INCLUDE) \ -I$(SRCDIR)/sd/inc \ -I$(SRCDIR)/sd/source/ui/inc \ -I$(SRCDIR)/sd/source/ui/slidesorter/inc \ -I$(call gb_SrsTemplateTarget_get_include_dir,sd) \ + -I$(call gb_SrsTemplateTarget_get_include_dir,) \ )) $(eval $(call gb_SrsTarget_add_files,sd/res,\ diff --git a/starmath/AllLangResTarget_sm.mk b/starmath/AllLangResTarget_sm.mk index 90c684d15f26..40025ab4762f 100644 --- a/starmath/AllLangResTarget_sm.mk +++ b/starmath/AllLangResTarget_sm.mk @@ -20,13 +20,10 @@ $(eval $(call gb_SrsTarget_SrsTarget,sm/res)) $(eval $(call gb_SrsTarget_set_include,sm/res,\ -I$(SRCDIR)/starmath/inc \ + -I$(call gb_SrsTemplateTarget_get_include_dir,) \ $$(INCLUDE) \ )) -$(eval $(call gb_SrsTarget_use_packages,sm/res,\ - svx_globlmn_hrc \ -)) - $(eval $(call gb_SrsTarget_add_files,sm/res,\ starmath/source/smres.src \ starmath/source/commands.src \ diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index 9a08fc40dc14..dce20c0297d6 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Module_add_targets,svx,\ AllLangResTarget_ofa \ AllLangResTarget_gal \ AllLangResTarget_textconversiondlgs \ - Package_globlmn_hrc \ UIConfig_svx \ )) diff --git a/svx/Package_globlmn_hrc.mk b/svx/Package_globlmn_hrc.mk deleted file mode 100644 index 77b3787f1272..000000000000 --- a/svx/Package_globlmn_hrc.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,svx_globlmn_hrc,$(call gb_SrsTemplateTarget_get_include_dir,svx))) - -$(eval $(call gb_Package_add_file,svx_globlmn_hrc,inc/svx/globlmn.hrc,globlmn.hrc)) - -# vim:set noet sw=4 ts=4: diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index 4aa005c083c6..bfb95fc19aca 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -25,10 +25,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,sw,\ $(eval $(call gb_SrsTarget_SrsTarget,sw/res)) -$(eval $(call gb_SrsTarget_use_packages,sw/res,\ - svx_globlmn_hrc \ -)) - $(eval $(call gb_SrsTarget_set_include,sw/res,\ $$(INCLUDE) \ -I$(SRCDIR)/sw/inc \ @@ -57,6 +53,7 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\ -I$(SRCDIR)/sw/source/ui/utlui \ -I$(SRCDIR)/sw/source/ui/web \ -I$(SRCDIR)/sw/source/ui/wrtsh \ + -I$(call gb_SrsTemplateTarget_get_include_dir,) \ )) $(eval $(call gb_SrsTarget_add_files,sw/res,\ |