diff options
| -rw-r--r-- | offapi/Module_offapi.mk | 4 | ||||
| -rw-r--r-- | offapi/Package_offapi_idl.mk | 31 | ||||
| -rw-r--r-- | offapi/Package_offapi_inc.mk | 31 | ||||
| -rw-r--r-- | offapi/UnoApiMerge_types.mk (renamed from offapi/UnoApi_types.mk) | 10 | ||||
| -rw-r--r-- | offapi/UnoApi_offapi.mk | 432 | ||||
| -rw-r--r-- | oovbaapi/Module_oovbaapi.mk | 2 | ||||
| -rw-r--r-- | oovbaapi/Package_oovbaapi_idl.mk | 31 | ||||
| -rw-r--r-- | oovbaapi/Package_oovbaapi_inc.mk | 31 | ||||
| -rw-r--r-- | oovbaapi/UnoApi_oovbaapi.mk | 34 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 18 | ||||
| -rw-r--r-- | solenv/gbuild/TypesRdb.mk | 89 | ||||
| -rw-r--r-- | solenv/gbuild/UnoApi.mk | 156 | ||||
| -rw-r--r-- | solenv/gbuild/UnoApiMerge.mk | 59 | ||||
| -rw-r--r-- | solenv/gbuild/UnoApiTarget.mk | 333 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 3 | ||||
| -rw-r--r-- | udkapi/Module_udkapi.mk | 4 | ||||
| -rw-r--r-- | udkapi/Package_udkapi_idl.mk | 31 | ||||
| -rw-r--r-- | udkapi/Package_udkapi_inc.mk | 31 | ||||
| -rw-r--r-- | udkapi/UnoApiMerge_uretypes.mk (renamed from udkapi/UnoApi_uretypes.mk) | 4 | ||||
| -rw-r--r-- | udkapi/UnoApi_udkapi.mk | 96 |
20 files changed, 691 insertions, 739 deletions
diff --git a/offapi/Module_offapi.mk b/offapi/Module_offapi.mk index 6f77ab6d8633..a78b14126846 100644 --- a/offapi/Module_offapi.mk +++ b/offapi/Module_offapi.mk @@ -31,9 +31,7 @@ $(eval $(call gb_Module_Module,offapi)) $(eval $(call gb_Module_add_targets,offapi,\ UnoApi_offapi \ - UnoApi_types \ - Package_offapi_idl \ - Package_offapi_inc \ + UnoApiMerge_types \ )) # vim: set noet sw=4 ts=4: diff --git a/offapi/Package_offapi_idl.mk b/offapi/Package_offapi_idl.mk deleted file mode 100644 index e1a01fb6c9f1..000000000000 --- a/offapi/Package_offapi_idl.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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_UnoApiTarget_autopackage_idl,offapi)) - -# vim: set noet sw=4 ts=4: diff --git a/offapi/Package_offapi_inc.mk b/offapi/Package_offapi_inc.mk deleted file mode 100644 index f7f7634f16c6..000000000000 --- a/offapi/Package_offapi_inc.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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_UnoApiTarget_autopackage_inc,offapi)) - -# vim: set noet sw=4 ts=4: diff --git a/offapi/UnoApi_types.mk b/offapi/UnoApiMerge_types.mk index df0da0603c27..a97945d3dfe5 100644 --- a/offapi/UnoApi_types.mk +++ b/offapi/UnoApiMerge_types.mk @@ -26,21 +26,21 @@ # #************************************************************************* -$(eval $(call gb_UnoApiTarget_UnoApiTarget,types)) +$(eval $(call gb_UnoApiMerge_UnoApiMerge,types)) -$(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,types,\ +$(eval $(call gb_UnoApiMerge_add_rdbfiles,types,\ udkapi \ offapi \ )) -$(eval $(call gb_UnoApiTarget_add_reference_rdbfile,types,\ +$(eval $(call gb_UnoApiMerge_add_reference_rdbfile,types,\ offapi/type_reference/types \ )) # ugly hack for now! statistic : $(gb_Helper_MISC)/api_statistic -$(gb_Helper_MISC)/api_statistic: $(call gb_UnoApiTarget_get_target,types) - $(PERL) util/checknewapi.pl $(call gb_UnoApiTarget_get_target,types) $(UNOAPI_REFERENCE_types) "$(RSCREVISION)" "$(gb_UnoApiTarget_REGVIEWTARGET)" > $@ +$(gb_Helper_MISC)/api_statistic: $(call gb_UnoApiMerge_get_target,types) + $(PERL) util/checknewapi.pl $(call gb_UnoApiMerge_get_target,types) $(UNOAPI_REFERENCE_types) "$(RSCREVISION)" "$(gb_UnoApiMerge_REGVIEWTARGET)" > $@ # vim: set noet sw=4 ts=4: diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 23c4523c790a..1074f6fb0a8b 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -26,75 +26,75 @@ # #************************************************************************* -$(eval $(call gb_UnoApiTarget_UnoApiTarget,offapi)) +$(eval $(call gb_UnoApi_UnoApi,offapi)) -$(eval $(call gb_UnoApiTarget_add_rdbfiles,offapi,\ +$(eval $(call gb_UnoApi_add_api,offapi,\ udkapi \ )) -$(eval $(call gb_UnoApiTarget_set_include,offapi,\ +$(eval $(call gb_UnoApi_set_include,offapi,\ $$(INCLUDE) \ -I$(SRCDIR)/offapi \ -I$(OUTDIR)/idl \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/animations,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/animations,\ TargetPropertiesCreator \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,\ AsyncCallback \ ContainerWindowProvider \ DialogProvider \ DialogProvider2 \ UnoControlDialogModelProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/grid,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/grid,\ DefaultGridDataModel \ SortableGridDataModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tab,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tab,\ UnoControlTabPageModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tree,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/tree,\ MutableTreeDataModel \ MutableTreeNode \ TreeControl \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2/data,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2/data,\ DatabaseDataProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/configuration,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/configuration,\ ReadOnlyAccess \ ReadWriteAccess \ Update \ theDefaultProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment,\ ExtensionManager \ PackageInformationProvider \ PackageRegistryBackend \ UpdateInformationProvider \ thePackageManagerFactory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment/test,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment/test,\ SmoketestCommandEnvironment \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment/ui,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/deployment/ui,\ LicenseDialog \ PackageManagerDialog \ UpdateRequiredDialog \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/document,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/document,\ DocumentProperties \ DocumentRevisionListPersistence \ OOXMLDocumentPropertiesImporter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing,\ SlideRenderer \ SlideSorter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing/framework,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing/framework,\ BasicPaneFactory \ BasicToolBarFactory \ BasicViewFactory \ @@ -103,33 +103,33 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/draw ModuleController \ ResourceId \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/embed,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/embed,\ DocumentCloser \ InstanceLocker \ OLESimpleStorage \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/inspection,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/inspection,\ DefaultFormComponentInspectorModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/runtime,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/runtime,\ FormOperations \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/graphic,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/graphic,\ GraphicObject \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/inspection,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/inspection,\ DefaultHelpProvider \ GenericPropertyHandler \ ObjectInspector \ ObjectInspectorModel \ StringRepresentation \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/linguistic2,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/linguistic2,\ LanguageGuessing \ Proofreader \ ProofreadingIterator \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/logging,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/logging,\ ConsoleHandler \ CsvLogFormatter \ DocumentIOLogRing \ @@ -138,29 +138,29 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/logg PlainTextFormatter \ SimpleLogRing \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mail,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mail,\ MailMessage \ MailServiceProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/media,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/media,\ Manager \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/presentation,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/presentation,\ SlideShow \ TransitionFactory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/rdf,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/rdf,\ BlankNode \ Literal \ Repository \ URI \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/rendering,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/rendering,\ Canvas \ CanvasFactory \ MtfRenderer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report,\ FixedLine \ FixedText \ FormatCondition \ @@ -175,42 +175,42 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/repo Section \ Shape \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report/inspection,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/report/inspection,\ DefaultComponentInspectorModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/resource,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/resource,\ OfficeResourceLoader \ StringResource \ StringResourceWithLocation \ StringResourceWithStorage \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script,\ DocumentDialogLibraryContainer \ DocumentScriptLibraryContainer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/provider,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/provider,\ ScriptURIHelper \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/vba,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script/vba,\ VBAEventProcessor \ VBAMacroResolver \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb,\ DataAccessDescriptorFactory \ DatabaseInteractionHandler \ InteractionHandler \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb/application,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdb/application,\ CopyTableWizard \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdbc,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sdbc,\ ConnectionPool \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/security,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/security,\ CertificateContainer \ SerialNumberAdapter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sheet,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/sheet,\ ExternalDocLink \ ExternalDocLinks \ ExternalSheetCache \ @@ -218,49 +218,49 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/shee FormulaOpCodeMapper \ Solver \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/smarttags,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/smarttags,\ SmartTagAction \ SmartTagRecognizer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/task,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/task,\ InteractionRequestStringResolver \ OfficeRestartManager \ PasswordContainerInteractionHandler \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ucb,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ucb,\ CommandEnvironment \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui,\ GlobalAcceleratorConfiguration \ WindowContentFactory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui/dialogs,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui/dialogs,\ Wizard \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/util,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/util,\ JobManager \ UriAbbreviation \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/sax,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/sax,\ FastShapeContextHandler \ FastTokenHandler \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star,\ modules \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/accessibility,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/accessibility,\ AccessBridge \ Accessible \ AccessibleContext \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/auth,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/auth,\ SSOExceptions \ SSOManagerFactory \ SSOPasswordCache \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\ AccessibleButton \ AccessibleCheckBox \ AccessibleComboBox \ @@ -359,21 +359,21 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/a UnoControlTimeField \ UnoControlTimeFieldModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/grid,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/grid,\ DefaultGridColumnModel \ GridColumn \ UnoControlGrid \ UnoControlGridModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/tab,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/tab,\ UnoControlTabPage \ UnoControlTabPageContainer \ UnoControlTabPageContainerModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/tree,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/tree,\ TreeControlModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart,\ AccessibleChartDocumentView \ AccessibleChartElement \ AreaDiagram \ @@ -410,7 +410,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/c StockDiagram \ XYDiagram \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2,\ Axis \ CandleStickChartType \ ChartDocument \ @@ -440,7 +440,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/c StandardDiagramCreationParameters \ Title \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2/data,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2/data,\ DataFilter \ DataProvider \ DataSequence \ @@ -451,7 +451,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/c RangeHighlightListener \ TabularDataProviderArguments \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration,\ AccessRootElement \ AdministrationProvider \ ConfigurationAccess \ @@ -472,7 +472,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/c SimpleSetUpdate \ UpdateRootElement \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/backend,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/backend,\ Backend \ BackendAdapter \ CopyImporter \ @@ -507,30 +507,30 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/c SystemIntegration \ UpdatableLayer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/backend/xml,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/backend/xml,\ LayerParser \ LayerWriter \ SchemaParser \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/bootstrap,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/configuration/bootstrap,\ BootstrapContext \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer,\ DataFormatTranslator \ MimeContentTypeFactory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/clipboard,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/clipboard,\ ClipboardManager \ GenericClipboard \ SystemClipboard \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/dnd,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/datatransfer/dnd,\ OleDragSource \ OleDropTarget \ X11DragSource \ X11DropTarget \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/document,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/document,\ DocumentInfo \ EventDescriptor \ Events \ @@ -555,7 +555,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/d XMLOasisBasicExporter \ XMLOasisBasicImporter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/drawing,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/drawing,\ AccessibleDrawDocumentView \ AccessibleGraphControl \ AccessibleGraphicShape \ @@ -626,7 +626,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/d TransparencyGradientTable \ modules \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/embed,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/embed,\ BaseStorage \ EmbeddedObjectDescriptor \ FileSystemStorage \ @@ -635,7 +635,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/e StorageFactory \ StorageStream \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form,\ DataAwareControlModel \ FormComponent \ FormComponents \ @@ -646,7 +646,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f PropertyBrowserController \ modules \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/binding,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/binding,\ BindableControlModel \ BindableDataAwareControlModel \ BindableDatabaseCheckBox \ @@ -662,7 +662,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f ListEntrySource \ ValueBinding \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/component,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/component,\ CheckBox \ ComboBox \ CommandButton \ @@ -702,7 +702,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f TextField \ TimeField \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/control,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/control,\ CheckBox \ ComboBox \ CommandButton \ @@ -723,7 +723,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f TextField \ TimeField \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/inspection,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/inspection,\ ButtonNavigationHandler \ CellBindingPropertyHandler \ EditPropertyHandler \ @@ -733,19 +733,19 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f XMLFormsPropertyHandler \ XSDValidationPropertyHandler \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/runtime,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/runtime,\ FormController \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/validation,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/form/validation,\ ValidatableBindableControlModel \ ValidatableControlModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/formula,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/formula,\ AccessibleFormulaText \ AccessibleFormulaView \ FormulaProperties \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\ Components \ ContentHandler \ ContentHandlerFactory \ @@ -780,12 +780,12 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f ToolbarController \ TransientDocumentsDocumentContentFactory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/gallery,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/gallery,\ GalleryItem \ GalleryTheme \ GalleryThemeProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/graphic,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/graphic,\ Graphic \ GraphicDescriptor \ GraphicProvider \ @@ -793,7 +793,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/g GraphicRendererVCL \ MediaProperties \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/i18n,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/i18n,\ BreakIterator \ ChapterCollator \ CharacterClassification \ @@ -808,21 +808,21 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/i TextConversion \ Transliteration \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/image,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/image,\ ImageMap \ ImageMapCircleObject \ ImageMapObject \ ImageMapPolygonObject \ ImageMapRectangleObject \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/installation,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/installation,\ InstallationCheck \ InstallationCheckService \ InternetSettings \ ProtocolHandlerCheck \ ProtocolHandlerCheckService \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/linguistic2,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/linguistic2,\ ConversionDictionary \ ConversionDictionaryList \ Dictionary \ @@ -834,24 +834,24 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/l SpellChecker \ Thesaurus \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/mozilla,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/mozilla,\ MenuProxy \ MenuProxyListener \ MozillaBootstrap \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages,\ Package \ PackageFolder \ PackageFolderEnumeration \ PackageStream \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages/zip,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages/zip,\ ZipFileAccess \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/plugin,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/plugin,\ PluginManager \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation,\ ChartShape \ CustomPresentation \ CustomPresentationAccess \ @@ -880,33 +880,33 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/p SubtitleShape \ TitleTextShape \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation/textfield,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation/textfield,\ DateTime \ Footer \ Header \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/rendering,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/rendering,\ BitmapCanvas \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/report,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/report,\ modules \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/report/inspection,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/report/inspection,\ DataProviderHandler \ ReportComponentHandler \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/scaddins,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/scaddins,\ analysisadd \ dateadd \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/scanner,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/scanner,\ ScannerManager \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/browse,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/browse,\ BrowseNode \ BrowseNodeFactory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/provider,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/provider,\ LanguageScriptProvider \ MasterScriptProvider \ MasterScriptProviderFactory \ @@ -916,11 +916,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s ScriptProviderForJava \ ScriptProviderForJavaScript \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/vba,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/vba,\ VBASpreadsheetEventProcessor \ VBATextEventProcessor \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb,\ CallableStatement \ Column \ ColumnDescriptorControl \ @@ -968,10 +968,10 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s TableDescriptor \ TableDesign \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb/application,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdb/application,\ DefaultViewController \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbc,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbc,\ CallableStatement \ Connection \ ConnectionProperties \ @@ -987,7 +987,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s RowSet \ Statement \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbcx,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbcx,\ Column \ ColumnDescriptor \ Container \ @@ -1015,14 +1015,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s View \ ViewDescriptor \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/security,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/security,\ DocumentDigitalSignatures \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/setup,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/setup,\ ProductRegistration \ Setup \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/sheet,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sheet,\ AccessibleCell \ AccessibleCsvCell \ AccessibleCsvRuler \ @@ -1135,7 +1135,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s UniqueCellFormatRangesEnumeration \ VolatileResult \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/style,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/style,\ CellStyle \ CharacterProperties \ CharacterPropertiesAsian \ @@ -1154,11 +1154,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s StyleFamilies \ StyleFamily \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/sync,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sync,\ SyncCollector \ Synchronizer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/system,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/system,\ ProxySettings \ SOffice52ProxySettings \ SimpleCommandMail \ @@ -1166,7 +1166,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s SystemProxySettings \ SystemShellExecute \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/table,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/table,\ AccessibleCellView \ AccessibleTableView \ Cell \ @@ -1188,14 +1188,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t TableSortDescriptor \ TableSortDescriptor2 \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/task,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/task,\ AsyncJob \ InteractionHandler \ Job \ JobExecutor \ PasswordContainer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\ AccessibleEndnoteView \ AccessibleFootnoteView \ AccessibleHeaderFooterView \ @@ -1307,14 +1307,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t ViewSettings \ WebDocument \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/fieldmaster,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/fieldmaster,\ Bibliography \ DDE \ Database \ SetExpression \ User \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/textfield,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/textfield,\ Annotation \ Author \ Bibliography \ @@ -1357,7 +1357,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t User \ WordCount \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/textfield/docinfo,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text/textfield/docinfo,\ ChangeAuthor \ ChangeDateTime \ CreateAuthor \ @@ -1376,7 +1376,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t Subject \ Title \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/ucb,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ucb,\ AnyCompareFactory \ CachedContentResultSet \ CachedContentResultSetFactory \ @@ -1437,7 +1437,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/u WebDAVDocumentContent \ WebDAVFolderContent \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui,\ ActionTrigger \ ActionTriggerContainer \ ActionTriggerSeparator \ @@ -1457,12 +1457,12 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/u UIElementSettings \ WindowStateConfiguration \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui/dialogs,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui/dialogs,\ FilePicker \ FilterOptionsDialog \ FolderPicker \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/util,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/util,\ NumberFormatProperties \ NumberFormatSettings \ NumberFormats \ @@ -1479,7 +1479,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/u TextSearch \ URLTransformer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/view,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/view,\ OfficeDocumentView \ PrintOptions \ PrintSettings \ @@ -1488,10 +1488,10 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/v RenderOptions \ ViewSettings \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xforms,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xforms,\ Binding \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml,\ AttributeContainer \ ExportFilter \ ImportFilter \ @@ -1503,7 +1503,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/x XMLExportFilter \ XMLImportFilter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto,\ SEInitializer \ SecurityEnvironment \ XMLEncryption \ @@ -1512,29 +1512,29 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/x XMLSignature \ XMLSignatureTemplate \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto/sax,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/crypto/sax,\ Decryptor \ Encryptor \ SAXEventKeeper \ SignatureCreator \ SignatureVerifier \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/dom,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/dom,\ SAXDocumentBuilder \ DocumentBuilder \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/input,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/input,\ SaxDocumentHandler \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/wrapper,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/wrapper,\ XMLDocumentWrapper \ XMLElementWrapper \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/xpath,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xml/xpath,\ XPathAPI \ XPathExtension \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/xsd,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/xsd,\ Boolean \ Date \ DateTime \ @@ -1547,7 +1547,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/x )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/accessibility,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/accessibility,\ AccessibleEventId \ AccessibleEventObject \ AccessibleRelation \ @@ -1581,7 +1581,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/accessibil XAccessibleTextMarkup \ XAccessibleValue \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/animations,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/animations,\ AnimationAdditiveMode \ AnimationCalcMode \ AnimationColorSpace \ @@ -1614,7 +1614,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/animations XTimeContainer \ XTransitionFilter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/auth,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/auth,\ AuthenticationFailedException \ InvalidArgumentException \ InvalidContextException \ @@ -1629,7 +1629,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/auth,\ XSSOManagerFactory \ XSSOPasswordCache \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\ ActionEvent \ AdjustmentEvent \ AdjustmentType \ @@ -1826,7 +1826,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt,\ XWindowListener2 \ XWindowPeer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt/grid,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/grid,\ GridColumnEvent \ GridDataEvent \ GridInvalidDataException \ @@ -1846,7 +1846,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt/grid,\ XSortableGridData \ XSortableMutableGridDataModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt/tab,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/tab,\ TabPageActivatedEvent \ XTabPage \ XTabPageContainer \ @@ -1854,7 +1854,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt/tab,\ XTabPageContainerModel \ XTabPageModel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt/tree,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt/tree,\ ExpandVetoException \ TreeDataModelEvent \ TreeExpansionEvent \ @@ -1867,7 +1867,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/awt/tree,\ XTreeExpansionListener \ XTreeNode \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/chart,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart,\ ChartAxisArrangeOrderType \ ChartAxisAssign \ ChartAxisLabelPosition \ @@ -1916,7 +1916,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/chart,\ XTwoAxisXSupplier \ XTwoAxisYSupplier \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/chart2,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart2,\ AxisOrientation \ AxisType \ CoordinateSystemTypeID \ @@ -1969,7 +1969,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/chart2,\ XTitled \ XTransformation \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/chart2/data,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart2/data,\ DataSequenceRole \ HighlightedRange \ LabelOrigin \ @@ -1986,7 +1986,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/chart2/dat XSheetDataProvider \ XTextualDataSequence \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/configuration,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/configuration,\ CannotLoadConfigurationException \ CorruptedConfigurationException \ CorruptedUIConfigurationException \ @@ -1998,7 +1998,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/configurat XTemplateInstance \ XUpdate \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/configuration/backend,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/configuration/backend,\ AuthenticationFailedException \ BackendAccessException \ BackendSetupException \ @@ -2032,7 +2032,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/configurat XUpdateHandler \ XVersionedSchemaSupplier \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/datatransfer,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer,\ DataFlavor \ UnsupportedFlavorException \ XDataFormatTranslator \ @@ -2045,7 +2045,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/datatransf XTransferableSource \ XTransferableSupplier \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/clipboard,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/clipboard,\ ClipboardEvent \ RenderingCapabilities \ XClipboard \ @@ -2057,7 +2057,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/datatransf XClipboardOwner \ XFlushableClipboard \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/dnd,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/datatransfer/dnd,\ DNDConstants \ DragGestureEvent \ DragSourceDragEvent \ @@ -2079,7 +2079,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/datatransf XDropTargetDropContext \ XDropTargetListener \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/deployment,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/deployment,\ DependencyException \ DeploymentException \ ExtensionRemovedException \ @@ -2099,7 +2099,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/deployment XPackageTypeInfo \ XUpdateInformationProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/document,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/document,\ AmbigousFilterRequest \ BrokenPackageRequest \ ChangedByOthersRequest \ @@ -2167,7 +2167,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/document,\ XVbaMethodParameter \ XViewDataSupplier \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/drawing,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing,\ Alignment \ Arrangement \ BezierPoint \ @@ -2284,7 +2284,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/drawing,\ XSlideSorterBase \ XUniversalShapeDescriptor \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/drawing/framework,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/drawing/framework,\ AnchorBindingMode \ BorderType \ ConfigurationChangeEvent \ @@ -2310,7 +2310,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/drawing/fr XToolBar \ XView \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/embed,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/embed,\ Actions \ Aspects \ ElementModes \ @@ -2377,7 +2377,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/embed,\ XVisualObject \ XWindowSupplier \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form,\ DataSelectionType \ DatabaseDeleteEvent \ DatabaseParameterEvent \ @@ -2428,7 +2428,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form,\ XUpdateBroadcaster \ XUpdateListener \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form/binding,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/binding,\ IncompatibleTypesException \ InvalidBindingStateException \ ListEntryEvent \ @@ -2438,7 +2438,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form/bindi XListEntrySource \ XValueBinding \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form/runtime,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/runtime,\ FeatureState \ FilterEvent \ FormFeature \ @@ -2449,22 +2449,22 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form/runti XFormControllerContext \ XFormOperations \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form/submission,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/submission,\ XSubmission \ XSubmissionSupplier \ XSubmissionVetoListener \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/form/validation,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/form/validation,\ XFormComponentValidityListener \ XValidatable \ XValidatableFormComponent \ XValidator \ XValidityConstraintListener \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/formula,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/formula,\ SymbolDescriptor \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/frame,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame,\ BorderWidths \ CommandGroup \ ControlCommand \ @@ -2557,7 +2557,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/frame,\ XUrlList \ XWindowArranger \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/frame/status,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame/status,\ ClipboardFormats \ FontHeight \ ItemState \ @@ -2569,13 +2569,13 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/frame/stat Verb \ Visibility \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/gallery,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/gallery,\ GalleryItemType \ XGalleryItem \ XGalleryTheme \ XGalleryThemeProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/geometry,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/geometry,\ AffineMatrix2D \ AffineMatrix3D \ EllipticalArc \ @@ -2591,7 +2591,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/geometry,\ RealSize2D \ XMapping2D \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/graphic,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/graphic,\ GraphicColorMode \ GraphicType \ XGraphic \ @@ -2604,7 +2604,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/graphic,\ XPrimitive3D \ XPrimitiveFactory2D \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/i18n,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/i18n,\ AmPmValue \ Boundary \ BreakType \ @@ -2682,7 +2682,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/i18n,\ XTransliteration \ reservedWords \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/inspection,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/inspection,\ InteractiveSelectionResult \ LineDescriptor \ PropertyCategoryDescriptor \ @@ -2701,17 +2701,17 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/inspection XStringListControl \ XStringRepresentation \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/installation,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/installation,\ ProtDlgRes \ XInstallationCheck \ XProtocolHandlerCheck \ protocols \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ldap,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ldap,\ LdapConnectionException \ LdapGenericException \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/linguistic2,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/linguistic2,\ ConversionDictionaryType \ ConversionDirection \ ConversionPropertyType \ @@ -2755,7 +2755,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/linguistic XSupportedLocales \ XThesaurus \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/logging,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/logging,\ LogLevel \ LogRecord \ XConsoleHandler \ @@ -2766,7 +2766,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/logging,\ XLoggerPool \ XSimpleLogRing \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/mail,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/mail,\ MailAttachment \ MailException \ MailServiceType \ @@ -2780,14 +2780,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/mail,\ XMailServiceProvider \ XSmtpService \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/media,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/media,\ XFrameGrabber \ XManager \ XPlayer \ XPlayerWindow \ ZoomLevel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/mozilla,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/mozilla,\ MenuMultipleChange \ MenuSingleChange \ MozillaProductType \ @@ -2806,30 +2806,30 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/mozilla,\ XProxyRunner \ XRemoteServiceManagerProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/office,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/office,\ XAnnotation \ XAnnotationAccess \ XAnnotationEnumeration \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/packages,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages,\ EncryptionNotAllowedException \ NoEncryptionException \ NoRawFormatException \ WrongPasswordException \ XDataSinkEncrSupport \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/packages/manifest,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages/manifest,\ XManifestReader \ XManifestWriter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/packages/zip,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages/zip,\ XZipFileAccess \ ZipConstants \ ZipEntry \ ZipException \ ZipIOException \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/plugin,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/plugin,\ PluginDescription \ PluginException \ PluginMode \ @@ -2838,7 +2838,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/plugin,\ XPluginContext \ XPluginManager \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/presentation,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/presentation,\ AnimationEffect \ AnimationSpeed \ ClickAction \ @@ -2864,7 +2864,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/presentati XTransition \ XTransitionFactory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/rdf,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/rdf,\ FileFormat \ ParseException \ QueryException \ @@ -2885,7 +2885,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/rdf,\ XResource \ XURI \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/rendering,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/rendering,\ ARGBColor \ AnimationAttributes \ AnimationRepeat \ @@ -2963,7 +2963,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/rendering, XTextLayout \ XVolatileBitmap \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/report,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/report,\ Calculation \ ForceNewPage \ GroupKeepTogether \ @@ -2989,13 +2989,13 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/report,\ XSection \ XShape \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/report/meta,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/report/meta,\ XFormulaParser \ XFunctionCategory \ XFunctionDescription \ XFunctionManager \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/resource,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/resource,\ MissingResourceException \ XLocale \ XResourceBundle \ @@ -3007,14 +3007,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/resource,\ XStringResourceWithLocation \ XStringResourceWithStorage \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/scanner,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/scanner,\ ScanError \ ScannerContext \ ScannerException \ XScannerManager \ XScannerManager2 \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script,\ LibraryNotLoadedException \ ModuleInfo \ ModuleSizeExceededRequest \ @@ -3029,13 +3029,13 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script,\ XPersistentLibraryContainer \ XStorageBasedLibraryContainer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script/browse,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/browse,\ BrowseNodeFactoryViewTypes \ BrowseNodeTypes \ XBrowseNode \ XBrowseNodeFactory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script/provider,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/provider,\ ScriptErrorRaisedException \ ScriptExceptionRaisedException \ ScriptFrameworkErrorException \ @@ -3047,7 +3047,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script/pro XScriptProviderSupplier \ XScriptURIHelper \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script/vba,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/script/vba,\ VBAEventId \ VBAScriptEvent \ VBAScriptEventId \ @@ -3057,7 +3057,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/script/vba XVBAModuleInfo \ XVBAScriptListener \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdb,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb,\ BooleanComparisonMode \ CommandType \ DatabaseRegistrationEvent \ @@ -3109,7 +3109,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdb,\ XSingleSelectQueryComposer \ XSubDocument \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdb/application,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb/application,\ CopyTableContinuation \ CopyTableOperation \ CopyTableRowEvent \ @@ -3121,7 +3121,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdb/applic XDatabaseDocumentUI \ XTableUIProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdb/tools,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdb/tools,\ CompositionType \ XConnectionSupplier \ XConnectionTools \ @@ -3134,7 +3134,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdb/tools, XTableRename \ XViewAccess \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdbc,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdbc,\ BatchUpdateException \ BestRowScope \ BestRowType \ @@ -3194,7 +3194,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdbc,\ XStruct \ XWarningsSupplier \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdbcx,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sdbcx,\ CheckOption \ CompareBookmark \ KeyType \ @@ -3221,7 +3221,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sdbcx,\ XUsersSupplier \ XViewsSupplier \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/security,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/security,\ CertAltNameEntry \ CertificateCharacters \ CertificateContainerStatus \ @@ -3243,7 +3243,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/security,\ XSanExtension \ XSerialNumberAdapter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/setup,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/setup,\ ActionType \ BaseAction \ CopyFileAction \ @@ -3273,7 +3273,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/setup,\ WindowsRegistryAction \ XSetup \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sheet,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sheet,\ ActivationEvent \ AddressConvention \ Border \ @@ -3472,12 +3472,12 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sheet,\ XVolatileResult \ _NamedRange \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/smarttags,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/smarttags,\ SmartTagRecognizerMode \ XSmartTagAction \ XSmartTagRecognizer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/style,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/style,\ BreakType \ CaseMap \ DropCapFormat \ @@ -3505,11 +3505,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/style,\ XStyleLoader \ XStyleSupplier \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/svg,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/svg,\ XSVGPrinter \ XSVGWriter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sync,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sync,\ FilterData \ SyncAction \ SyncElement \ @@ -3522,10 +3522,10 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sync,\ XSyncCollector \ XSynchronizer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/sync2,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sync2,\ BadPartnershipException \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/system,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/system,\ SimpleMailClientFlags \ SystemShellExecuteException \ SystemShellExecuteFlags \ @@ -3535,7 +3535,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/system,\ XSimpleMailMessage \ XSystemShellExecute \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/table,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/table,\ BorderLine \ BorderLine2 \ BorderLineStyle \ @@ -3569,7 +3569,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/table,\ XTableColumns \ XTableRows \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/task,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/task,\ ClassifiedInteractionRequest \ DocumentMSPasswordRequest \ DocumentMSPasswordRequest2 \ @@ -3608,7 +3608,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/task,\ XStatusIndicatorSupplier \ XUrlContainer \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/text,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/text,\ AuthorDisplayFormat \ BibliographyDataField \ BibliographyDataType \ @@ -3734,7 +3734,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/text,\ XTextViewCursorSupplier \ XWordCursor \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ucb,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\ AlreadyInitializedException \ AuthenticationRequest \ CHAOSProgressStart \ @@ -3907,7 +3907,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ucb,\ XSourceInitialization \ XWebDAVCommandEnvironment \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ui,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui,\ ActionTriggerSeparatorType \ ConfigurationEvent \ ContextMenuExecuteEvent \ @@ -3937,7 +3937,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ui,\ XUIElementSettings \ XUIFunctionListener \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ui/dialogs,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui/dialogs,\ CommonFilePickerElementIds \ ControlActions \ DialogClosedEvent \ @@ -3968,7 +3968,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/ui/dialogs XWizardController \ XWizardPage \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/util,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/util,\ AliasProgrammaticPair \ AtomClassRequest \ AtomDescription \ @@ -4066,7 +4066,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/util,\ XUniqueIDFactory \ XUpdatable \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/view,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/view,\ DocumentZoomType \ DuplexMode \ PaperFormat \ @@ -4094,7 +4094,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/view,\ XViewCursor \ XViewSettingsSupplier \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xforms,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xforms,\ InvalidDataOnSubmitException \ XDataTypeRepository \ XFormsEvent \ @@ -4103,14 +4103,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xforms,\ XModel \ XSubmission \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml,\ Attribute \ AttributeData \ FastAttribute \ XExportFilter \ XImportFilter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto,\ CipherID \ DigestID \ SecurityOperationStatus \ @@ -4130,7 +4130,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto XXMLSignature \ XXMLSignatureTemplate \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto/sax,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto/sax,\ ConstOfSecurityId \ ElementMarkPriority \ ElementMarkType \ @@ -4156,11 +4156,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/crypto XSignatureVerifyResultBroadcaster \ XSignatureVerifyResultListener \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/csax,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/csax,\ XCompressedDocumentHandler \ XMLAttribute \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/dom,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom,\ DOMException \ DOMExceptionType \ NodeType \ @@ -4185,7 +4185,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/dom,\ XSAXDocumentBuilder \ XText \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/events,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/events,\ AttrChangeType \ EventException \ EventType \ @@ -4198,17 +4198,17 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/ev XMutationEvent \ XUIEvent \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/views,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/dom/views,\ XAbstractView \ XDocumentView \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/input,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/input,\ XAttributes \ XElement \ XNamespaceMapping \ XRoot \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/sax,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/sax,\ FastToken \ InputSource \ SAXException \ @@ -4232,11 +4232,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/sax,\ XParser \ XSAXSerializable \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/wrapper,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/wrapper,\ XXMLDocumentWrapper \ XXMLElementWrapper \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/xpath,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/xpath,\ Libxml2ExtensionHandle \ XPathException \ XPathObjectType \ @@ -4244,7 +4244,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xml/xpath, XXPathExtension \ XXPathObject \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/xsd,\ +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xsd,\ DataTypeClass \ WhiteSpaceTreatment \ XDataType \ diff --git a/oovbaapi/Module_oovbaapi.mk b/oovbaapi/Module_oovbaapi.mk index 7d35c00a68b5..dd1f94b27a40 100644 --- a/oovbaapi/Module_oovbaapi.mk +++ b/oovbaapi/Module_oovbaapi.mk @@ -31,8 +31,6 @@ $(eval $(call gb_Module_Module,oovbaapi)) $(eval $(call gb_Module_add_targets,oovbaapi,\ UnoApi_oovbaapi \ - Package_oovbaapi_inc \ - Package_oovbaapi_idl \ )) # vim: set noet sw=4 ts=4: diff --git a/oovbaapi/Package_oovbaapi_idl.mk b/oovbaapi/Package_oovbaapi_idl.mk deleted file mode 100644 index 891f15a43198..000000000000 --- a/oovbaapi/Package_oovbaapi_idl.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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_UnoApiTarget_autopackage_idl,oovbaapi)) - -# vim: set noet sw=4 ts=4: diff --git a/oovbaapi/Package_oovbaapi_inc.mk b/oovbaapi/Package_oovbaapi_inc.mk deleted file mode 100644 index bb8b5e661532..000000000000 --- a/oovbaapi/Package_oovbaapi_inc.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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_UnoApiTarget_autopackage_inc,oovbaapi)) - -# vim: set noet sw=4 ts=4: diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk index 57a0c1161497..b3d8e20ffe1f 100644 --- a/oovbaapi/UnoApi_oovbaapi.mk +++ b/oovbaapi/UnoApi_oovbaapi.mk @@ -26,20 +26,20 @@ # #************************************************************************* -$(eval $(call gb_UnoApiTarget_UnoApiTarget,oovbaapi)) +$(eval $(call gb_UnoApi_UnoApi,oovbaapi)) -$(eval $(call gb_UnoApiTarget_add_rdbfiles,oovbaapi,\ +$(eval $(call gb_UnoApi_add_api,oovbaapi,\ udkapi \ offapi \ )) -$(eval $(call gb_UnoApiTarget_set_include,oovbaapi,\ +$(eval $(call gb_UnoApi_set_include,oovbaapi,\ $$(INCLUDE) \ -I$(SRCDIR)/oovbaapi \ -I$(OUTDIR)/idl \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,oovbaapi,oovbaapi/ooo/vba/excel,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,oovbaapi,oovbaapi/ooo/vba/excel,\ Globals \ Hyperlink \ Range \ @@ -49,18 +49,18 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,oovbaapi,oovbaapi/ooo/vba/excel Worksheet \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba,\ ControlProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba/msforms,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba/msforms,\ MSFormReturnTypes \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba/excel,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,oovbaapi,oovbaapi/ooo/vba/excel,\ Button \ SheetObjects \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\ +$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\ FormShowConstants \ VbAppWinStyle \ VbCalendar \ @@ -110,7 +110,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\ XVBAToOOEventDescGen \ XWindowBase \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/access,\ +$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/access,\ AcCloseSave \ AcColorIndex \ AcCommand \ @@ -165,7 +165,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/access,\ ProcKind \ RefKind \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/adodb,\ +$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/adodb,\ ADCPROP_ASYNCTHREADPRIORITY_ENUM \ ADCPROP_AUTORECALC_ENUM \ ADCPROP_UPDATECRITERIA_ENUM \ @@ -200,7 +200,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/adodb,\ StringFormatEnum \ XactAttributeEnum \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/dao,\ +$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/dao,\ CollatingOrderEnum \ CommitTransOptionsEnum \ CursorDriverEnum \ @@ -227,7 +227,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/dao,\ UpdateTypeEnum \ WorkspaceTypeEnum \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/excel,\ +$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/excel,\ Constants \ XApplication \ XAxes \ @@ -492,7 +492,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/excel,\ XWorksheetFunction \ XWorksheets \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/msforms,\ +$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/msforms,\ fmAction \ fmAlignment \ fmBackStyle \ @@ -565,7 +565,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/msforms,\ XToggleButton \ XUserForm \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/office,\ +$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/office,\ DocProperties \ MailFormat \ MsoAlertButtonType \ @@ -689,7 +689,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/office,\ MsoWizardMsgType \ MsoZOrderCmd \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/powerpoint,\ +$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/powerpoint,\ MsoAnimAccumulate \ MsoAnimAdditive \ MsoAnimAfterEffect \ @@ -760,11 +760,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/powerpoint, PpViewType \ PpWindowState \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/stdole,\ +$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/stdole,\ LoadPictureConstants \ OLE_TRISTATE \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/word,\ +$(eval $(call gb_UnoApi_add_idlfiles,oovbaapi,oovbaapi/ooo/vba/word,\ WdAlertLevel \ WdAnimation \ WdArabicNumeral \ diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 3bce08d293d9..858045e7fd8e 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -46,8 +46,8 @@ gb_PackagePart_get_target = $(OUTDIR)/$(1) gb_Rdb_get_outdir_target = $(OUTDIR)/xml/$(1).rdb gb_ResTarget_get_outdir_imagelist_target = $(OUTDIR)/res/img/$(1).ilst gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res -gb_TypesRdb_get_outdir_target = $(OUTDIR)/rdb/$(1).rdb -gb_UnoApiTarget_get_outdir_target = $(OUTDIR)/bin/$(1).rdb +gb_UnoApi_get_target = $(OUTDIR)/bin/$(1).rdb +gb_UnoApiMerge_get_target = $(OUTDIR)/bin/$(1).rdb gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar gb_Zip_get_outdir_target = $(OUTDIR)/pck/$(1).zip # outdir targets: $(1) is path @@ -119,10 +119,14 @@ gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1) gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/inc/$(firstword $(subst /, ,$(1)))/$(subst _tmpl,,$(notdir $(1))) gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1) -gb_TypesRdb_get_target = $(WORKDIR)/TypesRdb/$(1).rdb -gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).done +gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb +gb_UnoApiHeadersTarget_get_comprehensive_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive +gb_UnoApiHeadersTarget_get_lightweight_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/lightweight +gb_UnoApiHeadersTarget_get_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal +gb_UnoApiHeadersTarget_get_comprehensive_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive.done +gb_UnoApiHeadersTarget_get_lightweight_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/lightweight.done +gb_UnoApiHeadersTarget_get_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal.done gb_UnoApiPartTarget_get_target = $(WORKDIR)/UnoApiPartTarget/$(1) -gb_UnoApiTarget_get_header_target = $(WORKDIR)/UnoApiHeaders/$(1) gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX) # workdir targets: $(1) is prefix/path gb_Configuration_get_target = $(WORKDIR)/Configuration/$(1).done @@ -174,10 +178,10 @@ $(eval $(call gb_Helper_make_clean_targets,\ SdiTarget \ SrsTarget \ SrsTemplateTarget \ - TypesRdb \ CppunitTest \ CustomTarget \ ExternalLib \ + UnoApiHeadersTarget \ UnoApiTarget \ WinResTarget \ YaccTarget \ @@ -195,6 +199,8 @@ $(eval $(call gb_Helper_make_outdir_clean_targets,\ Executable \ Library \ StaticLibrary \ + UnoApi \ + UnoApiMerge \ )) $(eval $(call gb_Helper_make_dep_targets,\ diff --git a/solenv/gbuild/TypesRdb.mk b/solenv/gbuild/TypesRdb.mk deleted file mode 100644 index 9beb9218a07a..000000000000 --- a/solenv/gbuild/TypesRdb.mk +++ /dev/null @@ -1,89 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com> -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -gb_TypesRdb_REGMERGETARGET := $(call gb_Executable_get_target_for_build,regmerge) -gb_TypesRdb_REGMERGECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_TypesRdb_REGMERGETARGET) - -define gb_TypesRdb__command_impl -RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(call gb_Helper_convert_native,$(1) $(2) $(3))) && \ -$(gb_TypesRdb_REGMERGECOMMAND) @$${RESPONSEFILE} && \ -rm -f $${RESPONSEFILE} -endef - -define gb_TypesRdb__command -$(call gb_Output_announce,$*,$(true),RDB,3) -mkdir -p $(dir $(1)) && \ -$(if $(TYPESRDB_FILES),$(call gb_TypesRdb__command_impl,$(1),UCR,$(TYPESRDB_FILES)),true) && \ -$(if $(TYPESRDB_MERGE),$(call gb_TypesRdb__command_impl,$(1),/,$(TYPESRDB_MERGE)),true) -endef - -$(call gb_TypesRdb_get_outdir_target,%) : - $(call gb_Deliver_deliver,$(call gb_TypesRdb_get_target,$*),$@) - -$(call gb_TypesRdb_get_target,%) : - $(call gb_TypesRdb__command,$@,$*,$<,$?) - -.PHONY : $(call gb_TypesRdb_get_clean_target,%) -$(call gb_TypesRdb_get_clean_target,%) : - $(call gb_Output_announce,$*,$(false),RDB,3) - $(call gb_Helper_convert_native,\ - rm -f $(call gb_TypesRdb_get_target,$*) $(call gb_TypesRdb_get_outdir_target,$*)) - -define gb_TypesRdb_TypesRdb -$(call gb_TypesRdb_get_outdir_target,$(1)) : $(call gb_TypesRdb_get_target,$(1)) -$(call gb_TypesRdb_get_target,$(1)) : TYPESRDB_FILES := -$(call gb_TypesRdb_get_target,$(1)) : TYPESRDB_MERGE := - -$(call gb_Deliver_add_deliverable,$(call gb_TypesRdb_get_outdir_target,$(1)),$(call gb_TypesRdb_get_target,$(1)),$(1)) - -$$(eval $$(call gb_Module_register_target,$(call gb_TypesRdb_get_outdir_target,$(1)),$(call gb_TypesRdb_get_clean_target,$(1)))) - -endef - -define gb_TypesRdb_add_urdfile -$(call gb_TypesRdb_get_target,$(1)) : TYPESRDB_FILES += $(2) -$(call gb_TypesRdb_get_target,$(1)) : $(2) - -endef - -define gb_TypesRdb_add_urdfiles -$(foreach urd,$(2),$(call gb_TypesRdb_add_urdfile,$(1),$(urd))) - -endef - -define gb_TypesRdb_add_rdbfile -$(call gb_TypesRdb_get_target,$(1)) : TYPESRDB_MERGE += $(call gb_TypesRdb_get_outdir_target,$(2)) -$(call gb_TypesRdb_get_target,$(1)) : $(call gb_TypesRdb_get_outdir_target,$(2)) - -endef - -define gb_TypesRdb_add_rdbfiles -$(foreach rdb,$(2),$(call gb_TypesRdb_add_rdbfile,$(1),$(rdb))) - -endef - -# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk new file mode 100644 index 000000000000..8348826ee903 --- /dev/null +++ b/solenv/gbuild/UnoApi.mk @@ -0,0 +1,156 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(call gb_UnoApi_get_target,%) : + $(call gb_Output_announce,$*,$(true),UNO,4) + $(call gb_Deliver_deliver,$(call gb_UnoApiTarget_get_target,$*),$@) + +.PHONY : $(call gb_UnoApi_get_clean_target,%) +$(call gb_UnoApi_get_clean_target,%) : + $(call gb_Output_announce,$*,$(false),UNO,4) + $(call gb_Helper_abbreviate_dirs_native,\ + rm -f $(call gb_UnoApi_get_target,$*)) + +define gb_UnoApi_UnoApi +$(call gb_UnoApiTarget_UnoApiTarget,$(1)) +$(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1)) +$(call gb_Package_Package,$(1)_idl,$(SRCDIR)) +$(call gb_Package_Package,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_lightweight_dir,$(1))) + +$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) +$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_lightweight_target,$(1)) +$(call gb_UnoApi_get_target,$(1)) : $(call gb_Package_get_target,$(1)_idl) +$(call gb_UnoApi_get_target,$(1)) : $(call gb_Package_get_target,$(1)_inc) +$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)) +$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1)) +$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_idl) +$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_inc) + +$(call gb_Package_get_preparation_target,$(1)_inc) : $(call gb_UnoApiHeadersTarget_get_lightweight_target,$(1)) + +$(call gb_Deliver_add_deliverable,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1)) + +$$(eval $$(call gb_Module_register_target,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApi_get_clean_target,$(1)))) + +endef + +define gb_UnoApi__add_idlfile +$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,idl/%,$(2)),$(2)) + +endef + +define gb_UnoApi__add_headerfile_impl +$(call gb_Package_add_file,$(1)_inc,inc/$(2),$(3)) +$(call gb_UnoApiHeadersTarget_add_headerfile,$(1),$(3)) + +endef + +# Note: the expression in 3rd arg of call of gb_UnoApi__add_headerfile_impl +# removes the leftmost dir in the subpath .-) +define gb_UnoApi__add_headerfile +$(call gb_UnoApi__add_headerfile_impl,$(1),$(2),$(subst $() $(),/,$(wordlist 2,$(words $(subst /, ,$(2))),$(subst /, ,$(2))))) + +endef + +define gb_UnoApi__add_idlfile_noheader +$(call gb_UnoApi__add_idlfile,$(1),$(2).idl) + +endef + +define gb_UnoApi__add_idlfile_nohdl +$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2)) +$(call gb_UnoApi__add_headerfile,$(1),$(2).hpp) + +endef + +define gb_UnoApi__add_idlfile_full +$(call gb_UnoApi__add_idlfile_nohdl,$(1),$(2)) +$(call gb_UnoApi__add_headerfile,$(1),$(2).hdl) + +endef + +# for interfaces, exceptions, structs, enums, constant groups +define gb_UnoApi_add_idlfile +$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3)) +$(call gb_UnoApi__add_idlfile_full,$(1),$(2)/$(3)) + +endef + +define gb_UnoApi_add_idlfiles +$(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3)) +$(foreach idl,$(3),$(call gb_UnoApi__add_idlfile_full,$(1),$(2)/$(idl))) + +endef + +# for new-style services +define gb_UnoApi_add_idlfile_nohdl +$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3)) +$(call gb_UnoApi__add_idlfile_nohdl,$(1),$(2)/$(3)) + +endef + +define gb_UnoApi_add_idlfiles_nohdl +$(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3)) +$(foreach idl,$(3),$(call gb_UnoApi__add_idlfile_nohdl,$(1),$(2)/$(idl))) + +endef + +# for old-style services and modules +define gb_UnoApi_add_idlfile_noheader +$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3)) +$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2)/$(3)) + +endef + +define gb_UnoApi_add_idlfiles_noheader +$(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3)) +$(foreach idl,$(3),$(call gb_UnoApi__add_idlfile_noheader,$(1),$(2)/$(idl))) + +endef + +define gb_UnoApi__add_api +$(call gb_UnoApiHeadersTarget_add_rdbfile,$(1),$(2)) +$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApi_get_target,$(2)) + +endef + +define gb_UnoApi_add_api +$(foreach rdb,$(2),$(call gb_UnoApi__add_api,$(1),$(rdb))) + +endef + +define gb_UnoApi_add_reference_rdbfile +$(call gb_UnoApiTarget_add_reference_rdbfile,$(1),$(2)) + +endef + +define gb_UnoApi_set_include +$(call gb_UnoApiTarget_set_include,$(1),$(2)) + +endef + +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/UnoApiMerge.mk b/solenv/gbuild/UnoApiMerge.mk new file mode 100644 index 000000000000..d23ce75bc429 --- /dev/null +++ b/solenv/gbuild/UnoApiMerge.mk @@ -0,0 +1,59 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +# Note: targets for this class are the same as for UnoApi, therefore +# there is no need to define them again (and if we did, they would +# overwrite the UnoApi targets anyway...) + +define gb_UnoApiMerge_UnoApiMerge +$(call gb_UnoApiTarget_UnoApiTarget,$(1)) + +$(call gb_UnoApiMerge_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) +$(call gb_UnoApiMerge_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)) + +$(call gb_Deliver_add_deliverable,$(call gb_UnoApiMerge_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1)) + +$$(eval $$(call gb_Module_register_target,$(call gb_UnoApiMerge_get_target,$(1)),$(call gb_UnoApiMerge_get_clean_target,$(1)))) + +endef + +define gb_UnoApiMerge_add_rdbfile +$(call gb_UnoApiTarget_merge_rdbfile,$(1),$(2)) + +endef + +define gb_UnoApiMerge_add_rdbfiles +$(foreach rdb,$(2),$(call gb_UnoApiMerge_add_rdbfile,$(1),$(rdb))) + +endef + +define gb_UnoApiMerge_add_reference_rdbfile +$(call gb_UnoApiTarget_add_reference_rdbfile,$(1),$(2)) + +endef + +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 3fc9cfe0d592..eaf4aa204b70 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -26,62 +26,141 @@ # #************************************************************************* -gb_UnoApiTarget_IDLCTARGET := $(OUTDIR_FOR_BUILD)/bin/idlc$(gb_Executable_EXT_for_build) -gb_UnoApiTarget_IDLCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_IDLCTARGET) -gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR_FOR_BUILD)/bin/regcompare$(gb_Executable_EXT_for_build) -gb_UnoApiTarget_REGCOMPARECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGCOMPARETARGET) -gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR_FOR_BUILD)/bin/cppumaker$(gb_Executable_EXT_for_build) -gb_UnoApiTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET) -gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR_FOR_BUILD)/bin/regview$(gb_Executable_EXT_for_build) -gb_UnoApiTarget_REGVIEWCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGVIEWTARGET) +# UnoApiPartTarget + +gb_UnoApiPartTarget_IDLCTARGET := $(call gb_Executable_get_target_for_build,idlc) +gb_UnoApiPartTarget_IDLCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiPartTarget_IDLCTARGET) -$(call gb_UnoApiTarget_get_outdir_target,%) : - $(call gb_Deliver_deliver,$(call gb_TypesRdb_get_target,$*),$@) +# The .urd files are actually created by the gb_UnoApiPartTarget__command, +# invoked for the per-directory .done files. +# The reason why .urd files are tracked is so new files that are added are +# picked up and cause a rebuild, even if older than the .done file (also, as a +# convenience for users who delete them from the workdir by hand; this dummy +# rule plus the dependency from the .done target to the .urd file plus the +# sort/patsubst call in gb_UnoApiPartTarget__command cause command to be +# invoked with the .idl file corresponding to the .urd in that case. +# Touch the .urd file, so it is newer than the .done file, causing that to +# be rebuilt and overwriting the .urd file again. +$(call gb_UnoApiPartTarget_get_target,%.urd) : + mkdir -p $(dir $@) && touch $@ -define gb_UnoApiTarget_autopackage_inc -$$(eval $$(call gb_Package_Package,$(1)_inc,$$(patsubst %/empty,%,$$(call gb_UnoApiTarget_get_header_target,empty)))) -$(foreach onefile,$(gb_UnoApiTarget_HPPFILES_$(1)), \ - $$(eval $$(call gb_Package_add_file,$(1)_inc,$(patsubst $(1)/%,inc/$(1)/%,$(onefile)),$(onefile)))) +# TODO: +# - get idlc switch "-P" (generate .urd into package dir) +# - empty $? in headertarget? -$(call gb_Package_get_target,$(1)_inc) : $(call gb_UnoApiTarget_get_target,$(1)) +define gb_UnoApiPartTarget__command + $(call gb_Output_announce,$(2),$(true),IDL,2) + mkdir -p $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) && \ + RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\ + $(call gb_Helper_convert_native,$(INCLUDE) $(DEFS) \ + -M $(basename $(call gb_UnoApiPartTarget_get_dep_target,$(dir $(2)))) \ + -O $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) -verbose -C \ + $(sort $(patsubst $(call gb_UnoApiPartTarget_get_target,%.urd),$(SRCDIR)/%.idl,$(3))))) && \ + $(gb_UnoApiPartTarget_IDLCCOMMAND) @$${RESPONSEFILE} > /dev/null && \ + rm -f $${RESPONSEFILE} && \ + touch $(1) endef -define gb_UnoApiTarget_autopackage_idl -$$(eval $$(call gb_Package_Package,$(1)_idl,$(SRCDIR))) -$(foreach onefile,$(gb_UnoApiTarget_IDLFILES_$(1)), \ - $$(eval $$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,idl/%,$(onefile)),$(onefile)))) +$(call gb_UnoApiPartTarget_get_target,%.done) : + $(call gb_UnoApiPartTarget__command,$@,$*,$?) + +ifeq ($(gb_FULLDEPS),$(true)) + +$(call gb_UnoApiPartTarget_get_dep_target,%) : + $(if $(realpath $@),touch $@,\ + $(call gb_Object__command_dep,$@,$(call gb_UnoApiPartTarget_get_target,$*.urd))) + +endif + +# UnoApiTarget + +gb_UnoApiTarget_REGCOMPARETARGET := $(call gb_Executable_get_target_for_build,regcompare) +gb_UnoApiTarget_REGCOMPARECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGCOMPARETARGET) +gb_UnoApiTarget_REGMERGETARGET := $(call gb_Executable_get_target_for_build,regmerge) +gb_UnoApiTarget_REGMERGECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGMERGETARGET) +define gb_UnoApiTarget__command_impl +RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(call gb_Helper_convert_native,$(1) $(2) $(3))) && \ +$(gb_UnoApiTarget_REGMERGECOMMAND) @$${RESPONSEFILE} && \ +rm -f $${RESPONSEFILE} endef +define gb_UnoApiTarget__command +$(call gb_Output_announce,$*,$(true),RDB,3) +mkdir -p $(dir $(1)) && \ +$(if $(UNOAPI_FILES),\ + $(call gb_UnoApiTarget__command_impl,$(1),UCR,$(UNOAPI_FILES)),\ + $(call gb_UnoApiTarget__command_impl,$(1),/,$(UNOAPI_MERGE))) \ +$(if $(UNOAPI_REFERENCE), \ + $(call gb_Output_announce,$*,$(true),DBc,3) \ + && $(gb_UnoApiTarget_REGCOMPARECOMMAND) \ + -f -t \ + -r1 $(call gb_Helper_convert_native,$(UNOAPI_REFERENCE)) \ + -r2 $(call gb_Helper_convert_native,$(1))) +endef + +$(call gb_UnoApiTarget_get_target,%): + $(if $(and $(UNOAPI_FILES),$(UNOAPI_MERGE)),\ + $(error Both IDL files and merged RDBs were added: this is not supported),\ + $(if $(or $(UNOAPI_FILES),$(UNOAPI_MERGE)),,\ + $(error Neither IDL files nor merged RDBs were added: nothing will be produced))) + $(call gb_UnoApiTarget__command,$@,$*,$<,$?) + +.PHONY : $(call gb_UnoApiTarget_get_clean_target,%) +$(call gb_UnoApiTarget_get_clean_target,%) : + $(call gb_Output_announce,$*,$(false),RDB,3) + -$(call gb_Helper_abbreviate_dirs,\ + rm -f $(call gb_UnoApiTarget_get_target,$*)) + -rm -rf $(call gb_UnoApiTarget_get_dep_target,$*) \ + $(basename $(call gb_UnoApiPartTarget_get_dep_target,$*)) \ + $(call gb_UnoApiPartTarget_get_target,$*) + +# cat the deps of all IDLs in one file, then we need only open that one file +define gb_UnoApiTarget__command_dep +$(call gb_Output_announce,IDL:$(2),$(true),DEP,1) +$(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(dir $(1)) && \ + RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\ + $(foreach idl,$(patsubst %.idl,%,$(3)),$(call gb_UnoApiPartTarget_get_dep_target,$(idl)))) && \ + $(SOLARENV)/bin/concat-deps $${RESPONSEFILE} > $(1)) && \ + rm -f $${RESPONSEFILE} + +endef + +ifeq ($(gb_FULLDEPS),$(true)) + +$(call gb_UnoApiTarget_get_dep_target,%) : $(call gb_UnoApiTarget_get_target,%) + $(call gb_UnoApiTarget__command_dep,$@,$*,$(UNOAPI_IDLFILES)) + +endif + define gb_UnoApiTarget_UnoApiTarget -$(call gb_TypesRdb_TypesRdb,$(1)) -$$(eval $$(call gb_Module_register_target,$(call gb_UnoApiTarget_get_outdir_target,$(1)),$(call gb_UnoApiTarget_get_clean_target,$(1)))) -$(call gb_UnoApiTarget_get_outdir_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) -$(call gb_UnoApiTarget_get_outdir_target,$(1)) : $(call gb_TypesRdb_get_outdir_target,$(1)) -$(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_TypesRdb_get_target,$(1)) -$(call gb_UnoApiTarget_get_clean_target,$(1)) : $(call gb_TypesRdb_get_clean_target,$(1)) $(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE := -$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_DEPS := +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_FILES := +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE := $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := -gb_UnoApiTarget_HPPFILES_$(1) := -gb_UnoApiTarget_IDLFILES_$(1) := - -$(call gb_Deliver_add_deliverable,$(call gb_UnoApiTarget_get_outdir_target,$(1)),$(call gb_TypesRdb_get_target,$(1)),$(1)) ifeq ($(gb_FULLDEPS),$(true)) +$(call gb_UnoApiTarget_get_dep_target,$(1)) : UNOAPI_IDLFILES := -include $(call gb_UnoApiTarget_get_dep_target,$(1)) endif endef +define gb_UnoApiTarget__add_urdfile +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_FILES += $(2) +$(call gb_UnoApiTarget_get_target,$(1)) : $(2) + +endef + define gb_UnoApiTarget__add_idlfile $(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : \ $(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd) -gb_UnoApiTarget_IDLFILES_$(1) += $(2)/$(3).idl -$(call gb_TypesRdb_add_urdfile,$(1),$(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd)) +$(call gb_UnoApiTarget__add_urdfile,$(1),$(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd)) ifeq ($(gb_FULLDEPS),$(true)) +$(call gb_UnoApiTarget_get_dep_target,$(1)) : UNOAPI_IDLFILES += $(2)/$(3).idl $(call gb_UnoApiTarget_get_dep_target,$(1)) : \ $(call gb_UnoApiPartTarget_get_dep_target,$(2)/$(3)) $(call gb_UnoApiPartTarget_get_dep_target,$(2)/$(3)) : \ @@ -104,68 +183,19 @@ $(call gb_UnoApiTarget__add_idlfiles,$(1),$(2),$(3)) endef -# for interfaces, exceptions, structs, enums, constant groups define gb_UnoApiTarget_add_idlfile -gb_UnoApiTarget_HPPFILES_$(1) += $(2)/$(3).hdl $(2)/$(3).hpp - -$(call gb_UnoApiTarget_get_header_target,$(2)/$(3).hpp) :| \ - $(call gb_UnoApiTarget_get_target,$(1)) -$(call gb_UnoApiTarget_get_header_target,$(2)/$(3).hdl) :| \ - $(call gb_UnoApiTarget_get_target,$(1)) - -$(call gb_UnoApiTarget__add_idlfile,$(1),$(2),$(3)) - -endef - -define gb_UnoApiTarget_add_idlfiles_noheader -$(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile_noheader,$(1),$(2),$(idl))) -$(call gb_UnoApiTarget__add_idlfiles,$(1),$(2),$(3)) - -endef - -# for old-style services and modules -define gb_UnoApiTarget_add_idlfile_noheader -$(call gb_UnoApiTarget__add_idlfile,$(1),$(2),$(3)) - -endef - -define gb_UnoApiTarget_add_idlfiles_nohdl -$(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile_nohdl,$(1),$(2),$(idl))) -$(call gb_UnoApiTarget__add_idlfiles,$(1),$(2),$(3)) - -endef - -# for new-style services -define gb_UnoApiTarget_add_idlfile_nohdl -gb_UnoApiTarget_HPPFILES_$(1) += $(2)/$(3).hpp - -$(call gb_UnoApiTarget_get_header_target,$(2)/$(3).hpp) :| \ - $(call gb_UnoApiTarget_get_target,$(1)) - $(call gb_UnoApiTarget__add_idlfile,$(1),$(2),$(3)) endef -define gb_UnoApiTarget_add_rdbfiles -$(foreach rdb,$(2),$(call gb_UnoApiTarget_add_rdbfile,$(1),$(rdb))) - -endef - -define gb_UnoApiTarget_add_rdbfile -$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_DEPS += -X$(call gb_TypesRdb_get_outdir_target,$(2)) -$(call gb_UnoApiTarget_get_target,$(1)) : \ - $(call gb_TypesRdb_get_outdir_target,$(2)) \ - $(call gb_Package_get_target,$(2)_idl) - -endef - -define gb_UnoApiTarget_add_merge_rdbfiles -$(foreach rdb,$(2),$(call gb_UnoApiTarget_add_merge_rdbfile,$(1),$(rdb))) +define gb_UnoApiTarget_merge_rdbfiles +$(foreach rdb,$(2),$(call gb_UnoApiTarget_merge_rdbfile,$(1),$(rdb))) endef -define gb_UnoApiTarget_add_merge_rdbfile -$(call gb_TypesRdb_add_rdbfile,$(1),$(2)) +define gb_UnoApiTarget_merge_rdbfile +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE += $(call gb_UnoApiTarget_get_target,$(2)) +$(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2)) endef @@ -179,96 +209,77 @@ $(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE := $(2) endef -.PHONY : $(call gb_UnoApiTarget_get_clean_target,%) -$(call gb_UnoApiTarget_get_clean_target,%) : - $(call gb_Output_announce,$*,$(false),UNO,2) - -$(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_UnoApiTarget_get_target,$*) \ - $(call gb_UnoApiTarget_get_outdir_target,$*)) - -rm -rf $(call gb_UnoApiTarget_get_header_target,$*)\ - $(call gb_UnoApiTarget_get_dep_target,$*) \ - $(basename $(call gb_UnoApiPartTarget_get_dep_target,$*)) \ - $(call gb_UnoApiPartTarget_get_target,$*) +# UnoApiHeadersTarget -# The .urd files are actually created by the gb_UnoApiPartTarget__command, -# invoked for the per-directory .done files. -# The reason why .urd files are tracked is so new files that are added are -# picked up and cause a rebuild, even if older than the .done file (also, as a -# convenience for users who delete them from the workdir by hand; this dummy -# rule plus the dependency from the .done target to the .urd file plus the -# sort/patsubst call in gb_UnoApiPartTarget__command cause command to be -# invoked with the .idl file corresponding to the .urd in that case. -# Touch the .urd file, so it is newer than the .done file, causing that to -# be rebuilt and overwriting the .urd file again. -$(call gb_UnoApiPartTarget_get_target,%.urd) : - mkdir -p $(dir $@) && touch $@ +gb_UnoApiHeadersTarget_CPPUMAKERTARGET := $(call gb_Executable_get_target_for_build,cppumaker) +gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiHeadersTarget_CPPUMAKERTARGET) -$(call gb_UnoApiPartTarget_get_target,%.done) : - $(call gb_UnoApiPartTarget__command,$@,$*,$?) - - -define gb_UnoApiPartTarget__command - $(call gb_Output_announce,$(2),$(true),IDL,2) - mkdir -p $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) && \ - RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\ - $(call gb_Helper_convert_native,$(INCLUDE) $(DEFS) \ - -M $(basename $(call gb_UnoApiPartTarget_get_dep_target,$(dir $(2)))) \ - -O $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) -verbose -C \ - $(sort $(patsubst $(call gb_UnoApiPartTarget_get_target,%.urd),$(SRCDIR)/%.idl,$(3))))) && \ - $(gb_UnoApiTarget_IDLCCOMMAND) @$${RESPONSEFILE} > /dev/null && \ - rm -f $${RESPONSEFILE} && \ - touch $(1) +define gb_UnoApiHeadersTarget__command +RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\ + $(call gb_Helper_convert_native,-Gc $(4) -BUCR \ + -O$(3) $(call gb_UnoApiTarget_get_target,$(2)) $(UNOAPI_DEPS))) && \ +$(gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND) @$${RESPONSEFILE} && \ +rm -f $${RESPONSEFILE} && \ +touch $(1) endef -define gb_UnoApiTarget__command -$(call gb_Output_announce,$*,$(true),UNO,2) -$(call gb_Helper_abbreviate_dirs_native,\ - mkdir -p $(dir $(1)) && touch $(1)) +$(call gb_UnoApiHeadersTarget_get_target,%) : + $(call gb_Output_announce,$*,$(true),HPP,3) + $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_dir,$*)) + +$(call gb_UnoApiHeadersTarget_get_comprehensive_target,%) : + $(call gb_Output_announce,$*,$(true),HPC,3) + $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$*),-C) + +$(call gb_UnoApiHeadersTarget_get_lightweight_target,%) : + $(call gb_Output_announce,$*,$(true),HPL,3) + $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_lightweight_dir,$*),-L) + +.PHONY : $(call gb_UnoApiHeadersTarget_get_clean_target,%) +$(call gb_UnoApiHeadersTarget_get_clean_target,%) : + $(call gb_Output_announce,$*,$(false),HPP,3) + $(call gb_Helper_abbreviate_dirs_native,\ + rm -rf \ + $(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$*) \ + $(call gb_UnoApiHeadersTarget_get_lightweight_dir,$*) \ + $(call gb_UnoApiHeadersTarget_get_dir,$*) \ + $(call gb_UnoApiHeadersTarget_get_comprehensive_target,$*) \ + $(call gb_UnoApiHeadersTarget_get_lightweight_target,$*) \ + $(call gb_UnoApiHeadersTarget_get_target,$*)) + +define gb_UnoApiHeadersTarget_UnoApiHeadersTarget +$(call gb_UnoApiHeadersTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) +$(call gb_UnoApiHeadersTarget_get_comprehensive_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) +$(call gb_UnoApiHeadersTarget_get_lightweight_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) +$(call gb_UnoApiHeadersTarget_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)) + +$(call gb_UnoApiHeadersTarget_get_target,$(1)) : UNOAPI_DEPS := +$(call gb_UnoApiHeadersTarget_get_comprehensive_target,$(1)) : UNOAPI_DEPS := +$(call gb_UnoApiHeadersTarget_get_lightweight_target,$(1)) : UNOAPI_DEPS := + endef -define gb_UnoApiHeaderTarget__command - RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\ - $(call gb_Helper_convert_native,-Gc -L -BUCR \ - -O$(call gb_UnoApiTarget_get_header_target,$(2)) $(3) $(1))) && \ - $(gb_UnoApiTarget_CPPUMAKERCOMMAND) @$${RESPONSEFILE} && \ - rm -f $${RESPONSEFILE} +define gb_UnoApiHeadersTarget_add_headerfile endef -# cat the deps of all IDLs in one file, then we need only open that one file -define gb_UnoApiTarget__command_dep -$(call gb_Output_announce,IDL:$(2),$(true),DEP,1) -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) && \ - RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\ - $(foreach idl,$(patsubst %.idl,%,$(3)),$(call gb_UnoApiPartTarget_get_dep_target,$(idl)))) && \ - $(SOLARENV)/bin/concat-deps $${RESPONSEFILE} > $(1)) && \ - rm -f $${RESPONSEFILE} +define gb_UnoApiHeadersTarget__add_rdbfile +$(call gb_UnoApiHeadersTarget_get_$(3),$(1)) : $(call gb_UnoApiTarget_get_target,$(2)) +$(call gb_UnoApiHeadersTarget_get_$(3),$(1)) : UNOAPI_DEPS += -X$(call gb_UnoApiTarget_get_target,$(2)) endef -ifeq ($(gb_FULLDEPS),$(true)) -$(call gb_UnoApiPartTarget_get_dep_target,%) : - $(if $(realpath $@),touch $@,\ - $(call gb_Object__command_dep,$@,$(call gb_UnoApiPartTarget_get_target,$*.urd))) +define gb_UnoApiHeadersTarget_add_rdbfile +$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),target) +$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),comprehensive_target) +$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),lightweight_target) -$(call gb_UnoApiTarget_get_dep_target,%) : $(call gb_UnoApiTarget_get_target,%) - $(call gb_UnoApiTarget__command_dep,$@,$*,$(gb_UnoApiTarget_IDLFILES_$*)) +endef -endif +define gb_UnoApiHeadersTarget_add_rdbfiles +$(foreach rdb,$(2),$(call gb_UnoApiHeadersTarget_add_rdbfile,$(1),$(rdb))) -# TODO: -# - get idlc switch "-P" (generate .urd into package dir) -# - empty $? in headertarget? - -$(call gb_UnoApiTarget_get_target,%): - $(call gb_UnoApiTarget__command,$@,$*,$<,$?) - $(if $(UNOAPI_REFERENCE), \ - $(call gb_Output_announce,$*,$(true),DBc,4) \ - $(gb_UnoApiTarget_REGCOMPARECOMMAND) -f -t -r1 $(call gb_Helper_convert_native,$(UNOAPI_REFERENCE)) -r2 $(call gb_Helper_convert_native,$(call gb_TypesRdb_get_target,$*))) - $(if $(gb_UnoApiTarget_IDLFILES_$*), \ - $(call gb_Output_announce,$*,$(true),HPP,4) \ - $(call gb_UnoApiHeaderTarget__command,$(call gb_TypesRdb_get_target,$*),$*,$(UNOAPI_DEPS))) +endef # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 6884b34520f8..198e167c886f 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -289,8 +289,9 @@ include $(foreach class, \ JavaClassSet \ JunitTest \ Module \ - TypesRdb \ UnoApiTarget \ + UnoApi \ + UnoApiMerge \ Zip \ Configuration \ Extension \ diff --git a/udkapi/Module_udkapi.mk b/udkapi/Module_udkapi.mk index d25344355f66..e8bafe8308fe 100644 --- a/udkapi/Module_udkapi.mk +++ b/udkapi/Module_udkapi.mk @@ -31,9 +31,7 @@ $(eval $(call gb_Module_Module,udkapi)) $(eval $(call gb_Module_add_targets,udkapi,\ UnoApi_udkapi \ - UnoApi_uretypes \ - Package_udkapi_inc \ - Package_udkapi_idl \ + UnoApiMerge_uretypes \ )) # vim: set noet sw=4 ts=4: diff --git a/udkapi/Package_udkapi_idl.mk b/udkapi/Package_udkapi_idl.mk deleted file mode 100644 index 4c6591fb944a..000000000000 --- a/udkapi/Package_udkapi_idl.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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_UnoApiTarget_autopackage_idl,udkapi)) - -# vim: set noet sw=4 ts=4: diff --git a/udkapi/Package_udkapi_inc.mk b/udkapi/Package_udkapi_inc.mk deleted file mode 100644 index 3fc8a1b609d8..000000000000 --- a/udkapi/Package_udkapi_inc.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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_UnoApiTarget_autopackage_inc,udkapi)) - -# vim: set noet sw=4 ts=4: diff --git a/udkapi/UnoApi_uretypes.mk b/udkapi/UnoApiMerge_uretypes.mk index d61d07912ec2..3b01834f9c3a 100644 --- a/udkapi/UnoApi_uretypes.mk +++ b/udkapi/UnoApiMerge_uretypes.mk @@ -26,9 +26,9 @@ # #************************************************************************* -$(eval $(call gb_UnoApiTarget_UnoApiTarget,ure/types)) +$(eval $(call gb_UnoApiMerge_UnoApiMerge,ure/types)) -$(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,ure/types,\ +$(eval $(call gb_UnoApiMerge_add_rdbfiles,ure/types,\ udkapi \ )) diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk index fb1ac947187e..9bef9ca19e5a 100644 --- a/udkapi/UnoApi_udkapi.mk +++ b/udkapi/UnoApi_udkapi.mk @@ -26,24 +26,24 @@ # #************************************************************************* -$(eval $(call gb_UnoApiTarget_UnoApiTarget,udkapi)) +$(eval $(call gb_UnoApi_UnoApi,udkapi)) -$(eval $(call gb_UnoApiTarget_set_include,udkapi,\ +$(eval $(call gb_UnoApi_set_include,udkapi,\ $$(INCLUDE) \ -I$(SRCDIR)/udkapi \ -I$(OUTDIR)/idl \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star,\ udk-modules \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/beans,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/beans,\ Introspection \ PropertyBag \ PropertySet \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge,\ Bridge \ BridgeFactory \ IiopBridge \ @@ -54,24 +54,24 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/b OleObjectFactory \ UrpBridge \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge/oleautomation,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge/oleautomation,\ ApplicationRegistration \ BridgeSupplier \ Factory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba,\ corba \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/giop,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/giop,\ giop \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/iiop,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/iiop,\ iiop \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/iop,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/iop,\ iop \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/io,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/io,\ DataInputStream \ DataOutputStream \ MarkableInputStream \ @@ -83,33 +83,33 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/i TextInputStream \ TextOutputStream \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/java,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/java,\ JavaVirtualMachine \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/lang,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/lang,\ MultiServiceFactory \ RegistryServiceManager \ ServiceManager \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/loader,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/loader,\ Dynamic \ Java \ Java2 \ SharedLibrary \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/reflection,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/reflection,\ CoreReflection \ ProxyFactory \ TypeDescriptionManager \ TypeDescriptionProvider \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/registry,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/registry,\ DefaultRegistry \ ImplementationRegistration \ NestedRegistry \ SimpleRegistry \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/script,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/script,\ AllListenerAdapter \ Converter \ Engine \ @@ -117,43 +117,43 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/s InvocationAdapterFactory \ JavaScript \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/security,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/security,\ AccessController \ Policy \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/test,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/test,\ TestFactory \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/uno,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/uno,\ NamingService \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util,\ BootstrapMacroExpander \ MacroExpander \ theMacroExpander \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util/logging,\ +$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util/logging,\ Logger \ LoggerRemote \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/bridge,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/bridge,\ UnoUrlResolver \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/connection,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/connection,\ Acceptor \ Connector \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/container,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/container,\ EnumerableMap \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/io,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/io,\ SequenceInputStream \ SequenceOutputStream \ TempFile \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uri,\ +$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uri,\ ExternalUriReferenceTranslator \ UriReferenceFactory \ UriSchemeParser_vndDOTsunDOTstarDOTexpand \ @@ -162,7 +162,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uri, )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\ Ambiguous \ Defaulted \ GetDirectPropertyTolerantResult \ @@ -218,7 +218,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\ XTolerantMultiPropertySet \ XVetoableChangeListener \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/bridge,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge,\ BridgeExistsException \ InvalidProtocolChangeException \ ModelDependent \ @@ -231,7 +231,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/bridge,\ XProtocolProperties \ XUnoUrlResolver \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/bridge/oleautomation,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/bridge/oleautomation,\ Currency \ Date \ Decimal \ @@ -240,7 +240,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/bridge/ole SCode \ XAutomationObject \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/connection,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/connection,\ AlreadyAcceptingException \ ConnectionSetupException \ NoConnectException \ @@ -251,7 +251,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/connection XConnectionBroadcaster \ XConnector \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/container,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/container,\ ContainerEvent \ ElementExistException \ NoSuchElementException \ @@ -290,7 +290,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/container, XStringKeyMap \ XUniqueIDAccess \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/io,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/io,\ AlreadyConnectedException \ BufferSizeExceededException \ ConnectException \ @@ -333,7 +333,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/io,\ XTruncate \ XXMLExtractor \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/java,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/java,\ InvalidJavaSettingsException \ JavaDisabledException \ JavaInitializationException \ @@ -346,7 +346,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/java,\ XJavaThreadRegister_11 \ XJavaVM \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/lang,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/lang,\ ArrayIndexOutOfBoundsException \ ClassNotFoundException \ DisposedException \ @@ -383,11 +383,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/lang,\ XTypeProvider \ XUnoTunnel \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/loader,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/loader,\ CannotActivateFactoryException \ XImplementationLoader \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/reflection,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/reflection,\ FieldAccessMode \ InvalidTypeNameException \ InvocationTargetException \ @@ -433,7 +433,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/reflection XTypeDescriptionEnumerationAccess \ XUnionTypeDescription \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/registry,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/registry,\ CannotRegisterImplementationException \ InvalidRegistryException \ InvalidValueException \ @@ -445,7 +445,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/registry,\ XRegistryKey \ XSimpleRegistry \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/script,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/script,\ AllEventObject \ ArrayWrapper \ BasicErrorException \ @@ -489,7 +489,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/script,\ XStarBasicModuleInfo \ XTypeConverter \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/security,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/security,\ AccessControlException \ AllPermission \ RuntimePermission \ @@ -498,7 +498,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/security,\ XAction \ XPolicy \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/task,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/task,\ XInteractionAbort \ XInteractionContinuation \ XInteractionHandler \ @@ -506,19 +506,19 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/task,\ XInteractionRequest \ XInteractionRetry \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/test,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/test,\ TestEvent \ XSimpleTest \ XTest \ XTestListener \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/test/bridge,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/test/bridge,\ XBridgeTest \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/test/performance,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/test/performance,\ XPerformanceTest \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/uno,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uno,\ DeploymentException \ Exception \ RuntimeException \ @@ -535,7 +535,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/uno,\ XUnloadingPreference \ XWeak \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/uri,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uri,\ RelativeUriExcessParentSegments \ XExternalUriReferenceTranslator \ XUriReference \ @@ -547,11 +547,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/uri,\ XVndSunStarScriptUrl \ XVndSunStarScriptUrlReference \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/util,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/util,\ XMacroExpander \ XVeto \ )) -$(eval $(call gb_UnoApiTarget_add_idlfiles,udkapi,udkapi/com/sun/star/util/logging,\ +$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/util/logging,\ LogLevel \ XLogger \ XLoggerRemote \ |