diff options
author | David Tardon <dtardon@redhat.com> | 2011-09-09 07:24:40 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2011-09-09 07:46:24 +0200 |
commit | 63850a7f28f31b8e6792478aa7ba170f489196a4 (patch) | |
tree | bc245ef37153d8d1593f73f65cba057fad1ad4f6 /officecfg | |
parent | avoid the need for calling eval here (diff) | |
download | core-63850a7f28f31b8e6792478aa7ba170f489196a4.tar.gz core-63850a7f28f31b8e6792478aa7ba170f489196a4.zip |
make use of Configuration consistent with other gbuild classes
Diffstat (limited to 'officecfg')
-rw-r--r-- | officecfg/Configuration_officecfg.mk | 20 |
1 files changed, 10 insertions, 10 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 \ -) +)) |