diff options
| -rw-r--r-- | officecfg/Configuration_officecfg.mk | 20 | ||||
| -rw-r--r-- | solenv/gbuild/Configuration.mk | 21 |
2 files changed, 25 insertions, 16 deletions
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index 0b0470d9d1d9..64a10c7b9939 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Configuration_Configuration,registry,SRCDIR)) -$(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\ +$(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\ org/openoffice/LDAP.xcs \ org/openoffice/Inet.xcs \ org/openoffice/Setup.xcs \ @@ -118,9 +118,9 @@ $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\ org/openoffice/ucb/Hierarchy.xcs \ org/openoffice/ucb/InteractionHandler.xcs \ org/openoffice/ucb/Store.xcs \ -) +)) -$(call gb_Configuration_add_datas,registry,officecfg/registry/data,\ +$(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\ org/openoffice/Inet.xcu \ org/openoffice/System.xcu \ org/openoffice/UserProfile.xcu \ @@ -148,9 +148,9 @@ $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\ org/openoffice/Office/UI/Factories.xcu \ org/openoffice/TypeDetection/UISort.xcu \ org/openoffice/ucb/Configuration.xcu \ -) +)) -$(call gb_Configuration_add_spool_modules,registry,officecfg/registry/data,\ +$(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/data,\ org/openoffice/Inet-macosx.xcu \ org/openoffice/Inet-unixdesktop.xcu \ org/openoffice/Inet-wnt.xcu \ @@ -209,14 +209,14 @@ $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/data,\ org/openoffice/TypeDetection/UISort-impress.xcu \ org/openoffice/TypeDetection/UISort-math.xcu \ org/openoffice/ucb/Configuration-gio.xcu \ -) +)) # perhaps this file should be moved 2 levels up? -$(call gb_Configuration_add_spool_langpack,registry,officecfg/registry/data/org/openoffice,\ +$(eval $(call gb_Configuration_add_spool_langpack,registry,officecfg/registry/data/org/openoffice,\ Langpack.xcu \ -) +)) -$(call gb_Configuration_add_localized_datas,registry,officecfg/registry/data,\ +$(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/data,\ org/openoffice/Setup.xcu \ org/openoffice/Office/Accelerators.xcu \ org/openoffice/Office/Common.xcu \ @@ -259,5 +259,5 @@ $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/data,\ org/openoffice/Office/UI/WriterWebWindowState.xcu \ org/openoffice/Office/UI/WriterCommands.xcu \ org/openoffice/Office/UI/GenericCategories.xcu \ -) +)) diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 6e8e007d66f3..b4441675de87 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -327,6 +327,7 @@ $(foreach lang,$(gb_Configuration_LANGS),$(eval \ $(call gb_Configuration_get_clean_target,$(1)) : \ $(call gb_Zip_get_clean_target,$(1)_$(lang)))) $$(eval $$(call gb_Module_register_target,$(call gb_Configuration_get_target,$(1)),$(call gb_Configuration_get_clean_target,$(1)))) + endef # $(call gb_Configuration_add_schema,zipfile,prefix,xcsfile) @@ -343,11 +344,13 @@ $(call gb_XcsTarget_get_outdir_target,$(3)) : \ $(call gb_XcsTarget_get_target,$(2)/$(3)) $(call gb_Deliver_add_deliverable,$(call gb_XcsTarget_get_outdir_target,$(3)),\ $(call gb_XcsTarget_get_target,$(2)/$(3)),$(2)/$(3)) + endef #$(call gb_Configuration_add_schemas,zipfile,prefix,xcsfiles) define gb_Configuration_add_schemas -$(foreach xcs,$(3),$(eval $(call gb_Configuration_add_schema,$(1),$(2),$(xcs)))) +$(foreach xcs,$(3),$(call gb_Configuration_add_schema,$(1),$(2),$(xcs))) + endef # $(call gb_Configuration_add_data,zipfile,prefix,xcufile) @@ -367,11 +370,13 @@ $(call gb_Deliver_add_deliverable,\ $(call gb_XcuDataTarget_get_outdir_target,$(3)),\ $(call gb_XcuDataTarget_get_target,$(2)/$(3)),\ $(2)/$(3)) + endef #$(call gb_Configuration_add_schemas,zipfile,prefix,xcufiles) define gb_Configuration_add_datas -$(foreach xcu,$(3),$(eval $(call gb_Configuration_add_data,$(1),$(2),$(xcu)))) +$(foreach xcu,$(3),$(call gb_Configuration_add_data,$(1),$(2),$(xcu))) + endef # $(call gb_Configuration_add_spool_module,zipfile,prefix,xcufile) @@ -390,12 +395,13 @@ $(call gb_Deliver_add_deliverable,\ $(call gb_XcuModuleTarget_get_outdir_target,$(3)),\ $(call gb_XcuModuleTarget_get_target,$(2)/$(3)),\ $(2)/$(3)) + endef # $(call gb_Configuration_add_spool_modules,zipfile,prefix,xcufiles) define gb_Configuration_add_spool_modules -$(foreach xcu,$(3),$(eval \ - $(call gb_Configuration_add_spool_module,$(1),$(2),$(xcu)))) +$(foreach xcu,$(3),$(call gb_Configuration_add_spool_module,$(1),$(2),$(xcu))) + endef define gb_Configuration__add_langpack @@ -413,12 +419,14 @@ $(call gb_Deliver_add_deliverable,\ $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4)),\ $(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)),\ $(call gb_XcuLangpackTarget__get_name_with_lang,$(2)/$(3),$(4))) + endef # $(call gb_Configuration_add_spool_langpack,zipfile,prefix,xcufile) define gb_Configuration_add_spool_langpack $(foreach lang,$(gb_Configuration_LANGS),$(eval \ $(call gb_Configuration__add_langpack,$(1),$(2),$(strip $(3)),$(lang)))) + endef # $(call gb_Configuration_add_localized_data,zipfile,prefix,xcufile) @@ -436,12 +444,13 @@ $(foreach lang,$(gb_Configuration_LANGS),$(eval \ $(foreach lang,$(gb_Configuration_LANGS),$(eval \ $(call gb_Configuration_get_clean_target,$(1)) : \ $(call gb_XcuResTarget_get_clean_target,$(1)/$(lang)/$(3)))) + endef # $(call gb_Configuration_add_localized_datas,zipfile,prefix,xcufile) define gb_Configuration_add_localized_datas -$(foreach xcu,$(3),$(eval \ - $(call gb_Configuration_add_localized_data,$(1),$(2),$(xcu)))) +$(foreach xcu,$(3),$(call gb_Configuration_add_localized_data,$(1),$(2),$(xcu))) + endef # vim: set noet sw=4 ts=4: |