diff options
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/Configuration_officecfg.mk | 99 | ||||
| -rw-r--r-- | officecfg/CustomTarget_registry.mk | 6 | ||||
| -rw-r--r-- | officecfg/Module_officecfg.mk | 2 | ||||
| -rw-r--r-- | officecfg/Package_cppheader.mk | 4 | ||||
| -rw-r--r-- | officecfg/registry/files.mk | 2 |
5 files changed, 7 insertions, 106 deletions
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index 682a3e25a4a7..503a0a49ae2c 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -19,104 +19,7 @@ $(eval $(call gb_Configuration_Configuration,registry)) $(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\ - org/openoffice/LDAP.xcs \ - org/openoffice/Inet.xcs \ - org/openoffice/Setup.xcs \ - org/openoffice/System.xcs \ - org/openoffice/UserProfile.xcs \ - org/openoffice/VCL.xcs \ - org/openoffice/FirstStartWizard.xcs \ - org/openoffice/Interaction.xcs \ - org/openoffice/Office/Accelerators.xcs \ - org/openoffice/Office/Addons.xcs \ - org/openoffice/Office/Calc.xcs \ - org/openoffice/Office/CalcAddIns.xcs \ - org/openoffice/Office/Canvas.xcs \ - org/openoffice/Office/Chart.xcs \ - org/openoffice/Office/Commands.xcs \ - org/openoffice/Office/Common.xcs \ - org/openoffice/Office/Compatibility.xcs \ - org/openoffice/Office/DataAccess.xcs \ - org/openoffice/Office/Draw.xcs \ - org/openoffice/Office/Events.xcs \ - org/openoffice/Office/Embedding.xcs \ - org/openoffice/Office/ExtensionManager.xcs \ - org/openoffice/Office/Impress.xcs \ - org/openoffice/Office/Java.xcs \ - org/openoffice/Office/Jobs.xcs \ - org/openoffice/Office/Labels.xcs \ - org/openoffice/Office/Linguistic.xcs \ - org/openoffice/Office/Logging.xcs \ - org/openoffice/Office/Math.xcs \ - org/openoffice/Office/OptionsDialog.xcs \ - org/openoffice/Office/ProtocolHandler.xcs \ - org/openoffice/Office/SFX.xcs \ - org/openoffice/Office/Substitution.xcs \ - org/openoffice/Office/TableWizard.xcs \ - org/openoffice/Office/UI.xcs \ - org/openoffice/Office/Views.xcs \ - org/openoffice/Office/Writer.xcs \ - org/openoffice/Office/WriterWeb.xcs \ - org/openoffice/Office/Scripting.xcs \ - org/openoffice/Office/Security.xcs \ - org/openoffice/Office/WebWizard.xcs \ - org/openoffice/Office/Recovery.xcs \ - org/openoffice/Office/FormWizard.xcs \ - org/openoffice/Office/ExtendedColorScheme.xcs \ - org/openoffice/Office/TypeDetection.xcs \ - org/openoffice/Office/TabBrowse.xcs \ - org/openoffice/Office/Paths.xcs \ - org/openoffice/Office/Histories.xcs \ - org/openoffice/Office/UI/Controller.xcs \ - org/openoffice/Office/UI/Factories.xcs \ - org/openoffice/Office/UI/Commands.xcs \ - org/openoffice/Office/UI/BasicIDECommands.xcs \ - org/openoffice/Office/UI/BibliographyCommands.xcs \ - org/openoffice/Office/UI/CalcCommands.xcs \ - org/openoffice/Office/UI/ChartCommands.xcs \ - org/openoffice/Office/UI/DbuCommands.xcs \ - org/openoffice/Office/UI/BaseWindowState.xcs \ - org/openoffice/Office/UI/WriterFormWindowState.xcs \ - org/openoffice/Office/UI/WriterReportWindowState.xcs \ - org/openoffice/Office/UI/DbBrowserWindowState.xcs \ - org/openoffice/Office/UI/DbTableDataWindowState.xcs \ - org/openoffice/Office/UI/DrawImpressCommands.xcs \ - org/openoffice/Office/UI/GenericCommands.xcs \ - org/openoffice/Office/UI/MathCommands.xcs \ - org/openoffice/Office/UI/StartModuleCommands.xcs \ - org/openoffice/Office/UI/WriterCommands.xcs \ - org/openoffice/Office/UI/WindowState.xcs \ - org/openoffice/Office/UI/BasicIDEWindowState.xcs \ - org/openoffice/Office/UI/BibliographyWindowState.xcs \ - org/openoffice/Office/UI/CalcWindowState.xcs \ - org/openoffice/Office/UI/ChartWindowState.xcs \ - org/openoffice/Office/UI/DbQueryWindowState.xcs \ - org/openoffice/Office/UI/DbRelationWindowState.xcs \ - org/openoffice/Office/UI/DbTableWindowState.xcs \ - org/openoffice/Office/UI/DrawWindowState.xcs \ - org/openoffice/Office/UI/ImpressWindowState.xcs \ - org/openoffice/Office/UI/MathWindowState.xcs \ - org/openoffice/Office/UI/StartModuleWindowState.xcs \ - org/openoffice/Office/UI/WriterWindowState.xcs \ - org/openoffice/Office/UI/XFormsWindowState.xcs \ - org/openoffice/Office/UI/WriterGlobalWindowState.xcs \ - org/openoffice/Office/UI/WriterWebWindowState.xcs \ - org/openoffice/Office/UI/Effects.xcs \ - org/openoffice/Office/UI/Category.xcs \ - org/openoffice/Office/UI/GenericCategories.xcs \ - org/openoffice/Office/UI/GlobalSettings.xcs \ - org/openoffice/Office/UI/WindowContentFactories.xcs \ - org/openoffice/Office/DataAccess/Drivers.xcs \ - org/openoffice/Office/OOoImprovement/Settings.xcs \ - org/openoffice/TypeDetection/Types.xcs \ - org/openoffice/TypeDetection/Filter.xcs \ - org/openoffice/TypeDetection/GraphicFilter.xcs \ - org/openoffice/TypeDetection/Misc.xcs \ - org/openoffice/TypeDetection/UISort.xcs \ - org/openoffice/ucb/Configuration.xcs \ - org/openoffice/ucb/Hierarchy.xcs \ - org/openoffice/ucb/InteractionHandler.xcs \ - org/openoffice/ucb/Store.xcs \ + $(addprefix org/openoffice/,$(addsuffix .xcs,$(officecfg_XCSFILES))) \ )) $(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\ diff --git a/officecfg/CustomTarget_registry.mk b/officecfg/CustomTarget_registry.mk index fac8aee073ae..32e61902be9a 100644 --- a/officecfg/CustomTarget_registry.mk +++ b/officecfg/CustomTarget_registry.mk @@ -26,12 +26,10 @@ ## instead of those above. ## -include $(SRCDIR)/officecfg/registry/files.mk - $(eval $(call gb_CustomTarget_CustomTarget,officecfg/registry)) $(call gb_CustomTarget_get_target,officecfg/registry) : \ - $(foreach i,officecfg_qa_allheaders $(officecfg_FILES),\ + $(foreach i,officecfg_qa_allheaders $(officecfg_XCSFILES),\ $(call gb_CustomTarget_get_workdir,officecfg/registry)/$(i).hxx) # auto generated header file for unit test qa/cppheader.cxx @@ -39,7 +37,7 @@ $(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg_qa_allheaders.h $(SRCDIR)/officecfg/registry/files.mk $(call gb_Output_announce,officecfg_qa_allheaders.hxx,$(true),CAT,1) rm -f $@ \ - $(foreach file,$(officecfg_FILES),\ + $(foreach file,$(officecfg_XCSFILES),\ && echo "#include <officecfg/$(file).hxx>" >> $@) define officecfg_TARGET diff --git a/officecfg/Module_officecfg.mk b/officecfg/Module_officecfg.mk index ca4209c6e6aa..ef46599e58db 100644 --- a/officecfg/Module_officecfg.mk +++ b/officecfg/Module_officecfg.mk @@ -18,6 +18,8 @@ $(eval $(call gb_Module_Module,officecfg)) +include $(SRCDIR)/officecfg/registry/files.mk + $(eval $(call gb_Module_add_targets,officecfg,\ CustomTarget_registry \ Package_cppheader \ diff --git a/officecfg/Package_cppheader.mk b/officecfg/Package_cppheader.mk index 3e4a5727cb90..0f14f8132e30 100644 --- a/officecfg/Package_cppheader.mk +++ b/officecfg/Package_cppheader.mk @@ -26,9 +26,7 @@ ## instead of those above. ## -include $(SRCDIR)/officecfg/registry/files.mk - $(eval $(call gb_Package_Package,officecfg_cppheader,$(WORKDIR)/CustomTarget/officecfg/registry)) -$(eval $(foreach i,officecfg_qa_allheaders $(officecfg_FILES),$(call \ +$(eval $(foreach i,officecfg_qa_allheaders $(officecfg_XCSFILES),$(call \ gb_Package_add_file,officecfg_cppheader,inc/officecfg/$(i).hxx,$(i).hxx))) diff --git a/officecfg/registry/files.mk b/officecfg/registry/files.mk index 4413da4149b8..8501acb26cdd 100644 --- a/officecfg/registry/files.mk +++ b/officecfg/registry/files.mk @@ -1,4 +1,4 @@ -officecfg_FILES := \ +officecfg_XCSFILES := \ FirstStartWizard \ Inet \ Interaction \ |