[Libreoffice-commits] .: 22 commits - io/inc io/InternalUnoApi_acceptor.mk io/InternalUnoApi_connectr.mk io/InternalUnoApi_stm.mk io/Library_acceptor.mk io/Library_connector.mk io/Library_streams.mk io/Library_textinstream.mk io/Library_textoutstream.mk io/Makefile io/Module_io.mk io/Package_xml.mk io/prj io/source Makefile offapi/com offapi/Module_offapi.mk offapi/Package_offapi_idl.mk offapi/Package_offapi_inc.mk offapi/UnoApiMerge_types.mk offapi/UnoApi_offapi.mk offapi/UnoApi_types.mk oovbaapi/Module_oovbaapi.mk oovbaapi/Package_oovbaapi_idl.mk oovbaapi/Package_oovbaapi_inc.mk oovbaapi/UnoApi_oovbaapi.mk Repository.mk RepositoryModule_ooo.mk scaddins/idl scaddins/InternalUnoApi_scaddins.mk scaddins/Library_analysis.mk scaddins/Library_date.mk scaddins/Module_scaddins.mk solenv/gbuild stoc/inc stoc/InternalUnoApi_bootstrap.mk stoc/InternalUnoApi_corefl.mk stoc/InternalUnoApi_insp.mk stoc/InternalUnoApi_invadp.mk stoc/InternalUnoApi_inv.mk stoc/InternalUnoApi_javaloader.mk stoc/Internal UnoApi_jen.mk stoc/InternalUnoApi_namingservice.mk stoc/InternalUnoApi_proxyfac.mk stoc/InternalUnoApi_stocserv.mk stoc/Library_bootstrap.mk stoc/Library_introspection.mk stoc/Library_invocadapt.mk stoc/Library_invocation.mk stoc/Library_javaloader.mk stoc/Library_javavm.mk stoc/Library_namingservice.mk stoc/Library_proxyfac.mk stoc/Library_reflection.mk stoc/Library_stocservices.mk stoc/Makefile stoc/Module_stoc.mk stoc/Package_xml.mk stoc/prj stoc/source stoc/util udkapi/Module_udkapi.mk udkapi/Package_udkapi_idl.mk udkapi/Package_udkapi_inc.mk udkapi/UnoApiMerge_uretypes.mk udkapi/UnoApi_udkapi.mk udkapi/UnoApi_uretypes.mk ure/Rdb_ure.mk

David Tardon dtardon at kemper.freedesktop.org
Fri Apr 6 05:58:47 PDT 2012


 Makefile                                                      |    4 
 Repository.mk                                                 |   12 
 RepositoryModule_ooo.mk                                       |    1 
 io/InternalUnoApi_acceptor.mk                                 |   32 
 io/InternalUnoApi_connectr.mk                                 |   32 
 io/InternalUnoApi_stm.mk                                      |   32 
 io/Library_acceptor.mk                                        |   49 
 io/Library_connector.mk                                       |   49 
 io/Library_streams.mk                                         |   52 
 io/Library_textinstream.mk                                    |   47 
 io/Library_textoutstream.mk                                   |   47 
 io/Makefile                                                   |   40 
 io/Module_io.mk                                               |   42 
 io/Package_xml.mk                                             |   34 
 io/inc/makefile.mk                                            |   40 
 io/prj/build.lst                                              |    7 
 io/prj/d.lst                                                  |   13 
 io/prj/makefile.mk                                            |    1 
 io/source/TextInputStream/makefile.mk                         |   69 -
 io/source/TextOutputStream/makefile.mk                        |   70 -
 io/source/acceptor/makefile.mk                                |   87 -
 io/source/connector/makefile.mk                               |   87 -
 io/source/stm/makefile.mk                                     |   83 -
 offapi/Module_offapi.mk                                       |    4 
 offapi/Package_offapi_idl.mk                                  |   31 
 offapi/Package_offapi_inc.mk                                  |   31 
 offapi/UnoApiMerge_types.mk                                   |   46 
 offapi/UnoApi_offapi.mk                                       |  447 +++----
 offapi/UnoApi_types.mk                                        |   46 
 offapi/com/sun/star/scaddins/analysisadd.idl                  |  596 ----------
 offapi/com/sun/star/scaddins/dateadd.idl                      |  120 --
 oovbaapi/Module_oovbaapi.mk                                   |    2 
 oovbaapi/Package_oovbaapi_idl.mk                              |   31 
 oovbaapi/Package_oovbaapi_inc.mk                              |   31 
 oovbaapi/UnoApi_oovbaapi.mk                                   |   34 
 scaddins/InternalUnoApi_scaddins.mk                           |   54 
 scaddins/Library_analysis.mk                                  |    5 
 scaddins/Library_date.mk                                      |    5 
 scaddins/Module_scaddins.mk                                   |    1 
 scaddins/idl/com/sun/star/sheet/addin/Analysis.idl            |   59 
 scaddins/idl/com/sun/star/sheet/addin/DateFunctions.idl       |   59 
 scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl           |  584 +++++++++
 scaddins/idl/com/sun/star/sheet/addin/XCompatibilityNames.idl |   58 
 scaddins/idl/com/sun/star/sheet/addin/XDateFunctions.idl      |  100 +
 scaddins/idl/com/sun/star/sheet/addin/XMiscFunctions.idl      |   62 +
 solenv/gbuild/Executable.mk                                   |    3 
 solenv/gbuild/InternalUnoApi.mk                               |  112 +
 solenv/gbuild/Library.mk                                      |    3 
 solenv/gbuild/LinkTarget.mk                                   |   30 
 solenv/gbuild/TargetLocations.mk                              |   17 
 solenv/gbuild/UnoApi.mk                                       |  154 ++
 solenv/gbuild/UnoApiMerge.mk                                  |   62 +
 solenv/gbuild/UnoApiTarget.mk                                 |  374 +++---
 solenv/gbuild/gbuild.mk                                       |    3 
 stoc/InternalUnoApi_bootstrap.mk                              |   32 
 stoc/InternalUnoApi_corefl.mk                                 |   32 
 stoc/InternalUnoApi_insp.mk                                   |   32 
 stoc/InternalUnoApi_inv.mk                                    |   32 
 stoc/InternalUnoApi_invadp.mk                                 |   32 
 stoc/InternalUnoApi_javaloader.mk                             |   32 
 stoc/InternalUnoApi_jen.mk                                    |   32 
 stoc/InternalUnoApi_namingservice.mk                          |   32 
 stoc/InternalUnoApi_proxyfac.mk                               |   32 
 stoc/InternalUnoApi_stocserv.mk                               |   32 
 stoc/Library_bootstrap.mk                                     |   99 +
 stoc/Library_introspection.mk                                 |   58 
 stoc/Library_invocadapt.mk                                    |   57 
 stoc/Library_invocation.mk                                    |   57 
 stoc/Library_javaloader.mk                                    |   58 
 stoc/Library_javavm.mk                                        |   62 +
 stoc/Library_namingservice.mk                                 |   57 
 stoc/Library_proxyfac.mk                                      |   57 
 stoc/Library_reflection.mk                                    |   62 +
 stoc/Library_stocservices.mk                                  |   70 +
 stoc/Makefile                                                 |   40 
 stoc/Module_stoc.mk                                           |   61 +
 stoc/Package_xml.mk                                           |   43 
 stoc/inc/makefile.mk                                          |   39 
 stoc/prj/build.lst                                            |   24 
 stoc/prj/d.lst                                                |   29 
 stoc/prj/makefile.mk                                          |    1 
 stoc/source/bootstrap/makefile.mk                             |   50 
 stoc/source/corereflection/makefile.mk                        |   76 -
 stoc/source/cppumaker.mk                                      |   41 
 stoc/source/defaultregistry/makefile.mk                       |   46 
 stoc/source/implementationregistration/makefile.mk            |   47 
 stoc/source/inspect/makefile.mk                               |   74 -
 stoc/source/invocation/makefile.mk                            |   71 -
 stoc/source/invocation_adapterfactory/makefile.mk             |   73 -
 stoc/source/javaloader/makefile.mk                            |   80 -
 stoc/source/javavm/makefile.mk                                |   94 -
 stoc/source/loader/makefile.mk                                |   47 
 stoc/source/namingservice/makefile.mk                         |   73 -
 stoc/source/proxy_factory/makefile.mk                         |   73 -
 stoc/source/registry_tdprovider/makefile.mk                   |   61 -
 stoc/source/security/makefile.mk                              |   62 -
 stoc/source/servicemanager/makefile.mk                        |   47 
 stoc/source/simpleregistry/makefile.mk                        |   47 
 stoc/source/stocservices/makefile.mk                          |   49 
 stoc/source/stocservices/stocserv.xml                         |   27 
 stoc/source/tdmanager/makefile.mk                             |   49 
 stoc/source/typeconv/makefile.mk                              |   48 
 stoc/source/uriproc/makefile.mk                               |   53 
 stoc/util/makefile.mk                                         |  110 -
 udkapi/Module_udkapi.mk                                       |    4 
 udkapi/Package_udkapi_idl.mk                                  |   31 
 udkapi/Package_udkapi_inc.mk                                  |   31 
 udkapi/UnoApiMerge_uretypes.mk                                |   35 
 udkapi/UnoApi_udkapi.mk                                       |  102 -
 udkapi/UnoApi_uretypes.mk                                     |   35 
 ure/Rdb_ure.mk                                                |   30 
 111 files changed, 3566 insertions(+), 3388 deletions(-)

New commits:
commit 0c6ebe5d225d6a655f078977455cec6d0a3afa6e
Merge: 7545dbb... 8a01ee6...
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Apr 6 14:51:42 2012 +0200

    Merge remote-tracking branch 'origin/master'

commit 7545dbbf64e959cfb166556935946f442199e92b
Merge: 7d82fb1... 7e94a37...
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Apr 6 14:24:47 2012 +0200

    merge feature/gbuild_components

diff --cc offapi/UnoApi_offapi.mk
index ffe8d77,989b516..1a47d49
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@@ -47,12 -47,9 +47,12 @@@ $(eval $(call gb_UnoApi_add_idlfiles_no
  	ContainerWindowProvider \
  	DialogProvider \
  	DialogProvider2 \
 +	MenuBar \
 +	PopupMenu \
 +	TabController \
  	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 \
  ))
@@@ -88,13 -85,12 +88,13 @@@ $(eval $(call gb_UnoApi_add_idlfiles_no
  	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 \
 +	OleEmbeddedServerRegistration \
  	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 \
  ))
@@@ -107,30 -103,21 +107,30 @@@ $(eval $(call gb_UnoApi_add_idlfiles_no
  	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 \
 +	FileSystemStorageFactory \
  	InstanceLocker \
  	OLESimpleStorage \
 +	StorageFactory \
  ))
- $(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/frame,\
++$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\
 +	DispatchHelper \
 +	DispatchRecorderSupplier \
 +	DocumentTemplates \
 +	MediaTypeDetectionHelper \
 +))
- $(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 \
 +	GraphicProvider \
  ))
- $(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 \
@@@ -155,16 -142,10 +155,16 @@@ $(eval $(call gb_UnoApi_add_idlfiles_no
  	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/mozilla,\
++$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mozilla,\
 +	MozillaBootstrap \
 +))
- $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/plugin,\
++$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/plugin,\
 +	PluginManager \
 +))
- $(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 \
  ))
@@@ -203,10 -184,7 +203,10 @@@ $(eval $(call gb_UnoApi_add_idlfiles_no
  	StringResourceWithLocation \
  	StringResourceWithStorage \
  ))
- $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/scanner,\
++$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/scanner,\
 +	ScannerManager \
 +))
- $(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 \
  ))
@@@ -238,50 -216,32 +238,50 @@@ $(eval $(call gb_UnoApi_add_idlfiles_no
  	ExternalSheetCache \
  	FilterFormulaParser \
  	FormulaOpCodeMapper \
 +	RecentFunctions \
  	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 \
 +	JobExecutor \
  	OfficeRestartManager \
  	PasswordContainerInteractionHandler \
  ))
- $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/text,\
++$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/text,\
 +	DefaultNumberingProvider \
 +))
- $(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,\
 +	AnyCompareFactory \
 +	CachedContentResultSetFactory \
 +	CachedContentResultSetStubFactory \
 +	CachedDynamicResultSetFactory \
 +	CachedDynamicResultSetStubFactory \
  	CommandEnvironment \
 +	ContentProviderProxyFactory \
 +	PropertiesManager \
 +	SimpleFileAccess \
 +	SortedDynamicResultSetFactory \
 +	Store \
  ))
- $(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 \
 +	PathSubstitution \
 +	TextSearch \
  	UriAbbreviation \
 +	URLTransformer \
  ))
- $(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 \
  ))
@@@ -666,10 -630,12 +666,10 @@@ $(eval $(call gb_UnoApi_add_idlfiles_no
  	BaseStorage \
  	EmbeddedObjectDescriptor \
  	FileSystemStorage \
 -	FileSystemStorageFactory \
  	Storage \
 -	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 \
@@@ -815,9 -785,10 +815,9 @@@ $(eval $(call gb_UnoApi_add_idlfiles_no
  	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 \
  	GraphicRasterizer \
  	GraphicRendererVCL \
  	MediaProperties \
@@@ -863,20 -834,24 +863,20 @@@ $(eval $(call gb_UnoApi_add_idlfiles_no
  	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/presentation,\
 -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/plugin,\
 -	PluginManager \
 -))
+ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation,\
  	ChartShape \
  	CustomPresentation \
  	CustomPresentationAccess \
@@@ -920,11 -895,10 +920,7 @@@ $(eval $(call gb_UnoApi_add_idlfiles_no
  	DataProviderHandler \
  	ReportComponentHandler \
  ))
- $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/scaddins,\
- 	analysisadd \
- 	dateadd \
- ))
- $(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/scanner,\
 -	ScannerManager \
 -))
+ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/browse,\
  	BrowseNode \
  	BrowseNodeFactory \
  ))
@@@ -1213,9 -1188,10 +1209,9 @@@ $(eval $(call gb_UnoApi_add_idlfiles_no
  	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 \
@@@ -1395,11 -1372,16 +1391,12 @@@ $(eval $(call gb_UnoApi_add_idlfiles_no
  	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 \
  	CachedContentResultSetStub \
 -	CachedContentResultSetStubFactory \
  	CachedDynamicResultSet \
 -	CachedDynamicResultSetFactory \
  	CachedDynamicResultSetStub \
 -	CachedDynamicResultSetStubFactory \
  	CmisContentProvider \
  	Content \
  	ContentProvider \
@@@ -1484,8 -1472,10 +1481,8 @@@ $(eval $(call gb_UnoApi_add_idlfiles_no
  	SortDescriptor \
  	SortDescriptor2 \
  	Sortable \
 -	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 \
diff --cc udkapi/UnoApi_udkapi.mk
index 09cc2f3,17e37b6..2c3e178
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@@ -35,10 -35,11 +35,10 @@@ $(eval $(call gb_UnoApi_set_include,udk
  ))
  
  
- $(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 \
  ))
@@@ -102,19 -103,30 +102,19 @@@ $(eval $(call gb_UnoApi_add_idlfiles_no
  	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 \
  	Engine \
  	InvocationAdapterFactory \
  	JavaScript \
  ))
- $(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/security,\
 -	AccessController \
 -	Policy \
 -))
+ $(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/util,\
 -$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/uno,\
 -	NamingService \
 -))
+ $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util,\
  	BootstrapMacroExpander \
  	MacroExpander \
  	theMacroExpander \
@@@ -125,13 -137,10 +125,13 @@@ $(eval $(call gb_UnoApi_add_idlfiles_no
  ))
  
  
- $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/beans,\
++$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/beans,\
 +	Introspection \
 +))
- $(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 \
  ))
@@@ -143,23 -152,10 +143,23 @@@ $(eval $(call gb_UnoApi_add_idlfiles_no
  	SequenceOutputStream \
  	TempFile \
  ))
- $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/registry,\
++$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/registry,\
 +	ImplementationRegistration \
 +	SimpleRegistry \
 +))
- $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/security,\
++$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/security,\
 +	AccessController \
 +	Policy \
 +))
- $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/script,\
+ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/script,\
 +	AllListenerAdapter \
  	Converter \
 +	Invocation \
 +))
- $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uno,\
++$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/uno,\
 +	NamingService \
  ))
- $(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 \
commit 7e94a37403aa4470bd7dad7c549ba8bc7485620a
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 1 17:11:57 2012 +0200

    add_internal_*_api for Executable too

diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 8a7fc26..174ddb6 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -105,6 +105,9 @@ $(eval $(foreach method,\
 	add_libs \
 	set_library_path_flags \
 	add_api \
+	add_internal_api \
+	add_internal_bootstrap_api \
+	add_internal_comprehensive_api \
 	add_linked_libs \
 	add_linked_static_libs \
 	use_external \
commit 18c661f715a0b6850d30b374e5556dc14a377d2b
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 1 16:43:34 2012 +0200

    move from dmake to gbuild list

diff --git a/Makefile b/Makefile
index d29f244..d412f16 100644
--- a/Makefile
+++ b/Makefile
@@ -65,6 +65,7 @@ hwpfilter\
 i18npool\
 i18nutil\
 idl\
+io\
 javaunohelper\
 jurt\
 jvmaccess\
@@ -103,6 +104,7 @@ slideshow\
 smoketest\
 sot\
 starmath\
+stoc\
 svl\
 svtools\
 svx\
@@ -174,7 +176,6 @@ icc\
 icu\
 idlc\
 instsetoo_native\
-io\
 jfreereport\
 jpeg\
 l10ntools\
@@ -227,7 +228,6 @@ solenv\
 soltools\
 stax\
 stlport\
-stoc\
 store\
 sysui\
 testtools\
commit 59c0f8f452a538308a9d4098cdc8319b884c3c81
Merge: b3b76d1... 464a3a2...
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 1 11:55:47 2012 +0200

    merge origin/master

diff --cc Repository.mk
index 96cdd80,74452fd..b69870c
--- a/Repository.mk
+++ b/Repository.mk
@@@ -473,21 -511,10 +511,22 @@@ $(eval $(call gb_Helper_register_librar
  endif
  
  $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
 +    acceptor \
      binaryurp \
+     bootstrap \
 +    connector \
 +    introspection \
 +    invocadapt \
 +    invocation \
 +    javaloader \
 +    javavm \
 +    namingservice \
 +    proxyfac \
      reflection \
      stocservices \
 +    streams \
 +    textinstream \
 +    textoutstream \
  ))
  
  $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
diff --cc RepositoryModule_ooo.mk
index 1eef547,ba71994..2ad7f41
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@@ -86,11 -99,12 +99,13 @@@ $(eval $(call gb_Module_add_moduledirs,
      sccomp \
      scripting \
      sd \
+     sdext \
      sfx2 \
      slideshow \
+     smoketest \
      sot \
      starmath \
 +    stoc \
      svl \
      svtools \
      svx \
diff --cc offapi/UnoApi_offapi.mk
index 4747164,f9aee07..989b516
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@@ -2860,7 -2864,7 +2860,10 @@@ $(eval $(call gb_UnoApi_add_idlfiles,of
  	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/qa,\
++    	XDumper \
++))
 +$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/rdf,\
  	FileFormat \
  	ParseException \
  	QueryException \
diff --cc scaddins/Library_analysis.mk
index 42038e7,735709e..3401adb
--- a/scaddins/Library_analysis.mk
+++ b/scaddins/Library_analysis.mk
@@@ -32,12 -32,11 +32,12 @@@ $(eval $(call gb_Library_set_componentf
  
  $(eval $(call gb_Library_set_include,analysis,\
      $$(INCLUDE) \
-     -I$(realpath $(SRCDIR)/scaddins/source/analysis) \
+ 	-I$(WORKDIR)/UnoApiHeaders/offapi \
  ))
  
 -$(eval $(call gb_Library_add_api,analysis,\
 -    offapi \
 +$(eval $(call gb_Library_add_internal_comprehensive_api,analysis,\
 +	offapi \
 +	scaddins \
      udkapi \
  ))
  
diff --cc scaddins/Library_date.mk
index ca3fad8,3552ca7..72577fe
--- a/scaddins/Library_date.mk
+++ b/scaddins/Library_date.mk
@@@ -32,12 -32,11 +32,12 @@@ $(eval $(call gb_Library_set_componentf
  
  $(eval $(call gb_Library_set_include,date,\
      $$(INCLUDE) \
-     -I$(realpath $(SRCDIR)/scaddins/source/datefunc) \
+ 	-I$(WORKDIR)/UnoApiHeaders/offapi \
  ))
  
 -$(eval $(call gb_Library_add_api,date,\
 -    offapi \
 +$(eval $(call gb_Library_add_internal_comprehensive_api,date,\
 +	offapi \
 +	scaddins \
      udkapi \
  ))
  
diff --cc solenv/gbuild/InternalUnoApi.mk
index 1011d9c,0000000..163e7a0
mode 100644,000000..100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@@ -1,111 -1,0 +1,112 @@@
 +# -*- 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 at 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.
 +
 +.PHONY : $(call gb_InternalUnoApi_get_clean_target,%)
 +$(call gb_InternalUnoApi_get_clean_target,%) :
 +	$(call gb_Helper_abbreviate_dirs_native,\
 +		rm -f $(call gb_InternalUnoApi_get_target,$*))
 +
 +# Note: The rdb root for the internal rdbs should be / . On the other
 +# side, UnoApiHeadersTarget expects UCR and it is really not easy to
 +# change, because the information would have to be duplicated at the
 +# calling side. So we simply do both .-)
 +# TODO: Should it come clear that these rdbs (installed into
 +# solver/$INPATH/rdb) are actually not needed for anything, this could
 +# be simplified.
 +
 +define gb_InternalUnoApi_InternalUnoApi
 +$(call gb_UnoApiTarget_UnoApiTarget,$(1)_out)
 +$(call gb_UnoApiTarget_UnoApiTarget,$(1))
 +$(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1))
 +
 +$(call gb_UnoApiTarget_set_root,$(1)_out,/)
 +$(call gb_UnoApiTarget_set_root,$(1),UCR)
 +$(call gb_UnoApiTarget_merge_rdbfile,$(1),$(1)_out)
 +
++$(call gb_InternalUnoApi_get_target,$(1)) :| $(dir $(call gb_InternalUnoApi_get_target,$(1))).dir
 +$(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)_out)
 +$(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)_out)
 +$(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1))
 +
 +$(call gb_Deliver_add_deliverable,$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)_out),$(1))
 +
 +$$(eval $$(call gb_Module_register_target,$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_InternalUnoApi_get_clean_target,$(1))))
 +
 +endef
 +
 +define gb_InternalUnoApi_add_idlfile
 +$(call gb_UnoApiTarget_add_idlfile,$(1)_out,$(2),$(3))
 +
 +endef
 +
 +define gb_InternalUnoApi_add_idlfiles
 +$(call gb_UnoApiTarget_add_idlfiles,$(1)_out,$(2),$(3))
 +
 +endef
 +
 +define gb_InternalUnoApi__add_api
 +$(call gb_UnoApiHeadersTarget_add_rdbfile,$(1),$(2))
 +$(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2))
 +
 +endef
 +
 +define gb_InternalUnoApi_add_api
 +$(foreach rdb,$(2),$(call gb_InternalUnoApi__add_api,$(1),$(rdb)))
 +
 +endef
 +
 +# Express that the rdb $(2) depends on rdb $(3).
 +#
 +# This information is already available in the UnoApiTarget definition
 +# for $(2), but this may not be loaded if we are building from a
 +# different module. Thus, this is a necessary hack to make generation of
 +# headers on demand work.
 +#
 +# I suppose it would be possible to store the list of required rdbs for
 +# a rdb to a file and then load it when headers' generation is requested,
 +# but it feels like overkill...
 +define gb_InternalUnoApi_add_api_dependency
 +$(call gb_UnoApiHeadersTarget_add_rdbfile,$(2),$(3))
 +
 +endef
 +
 +define gb_InternalUnoApi_add_api_dependencies
 +$(foreach dep,$(3),$(call gb_InternalUnoApi_add_api_dependency,$(1),$(2),$(dep)))
 +
 +endef
 +
 +define gb_InternalUnoApi_set_xmlfile
 +$(call gb_UnoApiTarget_set_xmlfile,$(1)_out,$(2))
 +
 +endef
 +
 +define gb_InternalUnoApi_set_include
 +$(call gb_UnoApiTarget_set_include,$(1)_out,$(2))
 +
 +endef
 +
 +# vim: set noet sw=4 ts=4:
diff --cc solenv/gbuild/UnoApi.mk
index bb82ddb,0000000..fba9b1f
mode 100644,000000..100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@@ -1,153 -1,0 +1,154 @@@
 +# -*- 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 at 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.
 +
 +.PHONY : $(call gb_UnoApi_get_clean_target,%)
 +$(call gb_UnoApi_get_clean_target,%) :
 +	$(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_dir,$(1)))
 +
 +$(call gb_UnoApiTarget_set_root,$(1),UCR)
 +
++$(call gb_UnoApi_get_target,$(1)) :| $(dir $(call gb_UnoApi_get_target,$(1))).dir
 +$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
 +$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_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_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 --cc solenv/gbuild/UnoApiMerge.mk
index 067a4c1,0000000..5b4fafb
mode 100644,000000..100644
--- a/solenv/gbuild/UnoApiMerge.mk
+++ b/solenv/gbuild/UnoApiMerge.mk
@@@ -1,61 -1,0 +1,62 @@@
 +# -*- 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 at 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_UnoApiTarget_set_root,$(1),/)
 +
++$(call gb_UnoApiMerge_get_target,$(1)) :| $(dir $(call gb_UnoApiMerge_get_target,$(1))).dir
 +$(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 --cc solenv/gbuild/UnoApiTarget.mk
index 388fe3c,8d851ef..d2adfe9
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@@ -26,151 -26,45 +26,155 @@@
  #
  #*************************************************************************
  
 -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_REGMERGETARGET := $(OUTDIR_FOR_BUILD)/bin/regmerge$(gb_Executable_EXT_for_build)
 -gb_UnoApiTarget_REGMERGECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGMERGETARGET)
 -gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR_FOR_BUILD)/bin/regcompare$(gb_Executable_EXT_for_build)
 +# 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)
 +
 +# 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.
++# the .dir is for make 3.81, which ignores trailing /
++$(dir $(call gb_UnoApiPartTarget_get_target,))%/.dir :
++	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
++
 +$(call gb_UnoApiPartTarget_get_target,%.urd) :
- 	mkdir -p $(dir $@) && touch $@
++	touch $@
 +
 +# TODO:
 +# - get idlc switch "-P" (generate .urd into package dir)
 +# - empty $? in headertarget?
 +
 +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
 +
 +$(call gb_UnoApiPartTarget_get_target,%.done) :
 +	$(call gb_UnoApiPartTarget__command,$@,$*,$?)
 +
 +ifeq ($(gb_FULLDEPS),$(true))
 +
 +$(call gb_UnoApiPartTarget_get_dep_target,%) :
- 	$(if $(realpath $@),touch $@,\
++	$(if $(wildcard $@),touch $@,\
 +	  $(call gb_Object__command_dep,$@,$(call gb_UnoApiPartTarget_get_target,$*.urd)))
 +
 +endif
 +
 +# UnoApiTarget
 +
 +gb_UnoApiTarget_RDBMAKERTARGET := $(call gb_Executable_get_target_for_build,rdbmaker)
 +gb_UnoApiTarget_RDBMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_RDBMAKERTARGET)
 +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_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)
 +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)
 +gb_UnoApiTarget_XML2CMPTARGET := $(call gb_Executable_get_target_for_build,xml2cmp)
 +gb_UnoApiTarget_XML2CMPCOMMAND := $(gb_Helper_set_ld_path) $(gb_UnoApiTarget_XML2CMPTARGET)
  
 -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))))
 +gb_UnoApiTarget_XMLRDB := $(call gb_UnoApiTarget_get_target,types)
  
 -$(call gb_Package_get_target,$(1)_inc) : $(call gb_UnoApiTarget_get_target,$(1))
 +define gb_UnoApiTarget__get_types
 +$(if $(1),$(foreach type,$(shell $(gb_UnoApiTarget_XML2CMPCOMMAND) -types stdout $(1)),$(addprefix -T,$(type))))
 +endef
 +
 +define gb_UnoApiTarget__command_impl
 +RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(call gb_Helper_convert_native,$(2))) && \
 +$(1) @$${RESPONSEFILE} && \
 +rm -f $${RESPONSEFILE}
 +endef
 +
 +define gb_UnoApiTarget__regmerge_command_impl
 +$(call gb_UnoApiTarget__command_impl,$(gb_UnoApiTarget_REGMERGECOMMAND),$(1) $(2) $(3))
 +endef
  
 +define gb_UnoApiTarget__rdbmaker_command_impl
 +$(call gb_UnoApiTarget__command_impl,$(gb_UnoApiTarget_RDBMAKERCOMMAND),-O$(1) -B$(2) -b$(3) $(4) $(5))
  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))))
 +define gb_UnoApiTarget__command
 +$(call gb_Output_announce,$*,$(true),RDB,3)
 +mkdir -p $(dir $(1)) && \
 +$(if $(UNOAPI_FILES),\
 +	$(call gb_UnoApiTarget__regmerge_command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_FILES)),\
 +	$(if $(UNOAPI_MERGE),\
 +		$(call gb_UnoApiTarget__regmerge_command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_MERGE)),\
 +		$(call gb_UnoApiTarget__rdbmaker_command_impl,$(1),UCR,$(UNOAPI_ROOT),\
 +			$(call gb_UnoApiTarget__get_types,$(UNOAPI_XML)),$(gb_UnoApiTarget_XMLRDB)))) \
 +$(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
  
 +define gb_UnoApiTarget__check_mode
 +$(if $(or $(and $(1),$(2),$(3)),$(and $(1),$(2)),$(and $(2),$(3)),$(and $(1),$(3))),\
 +	$(error More than one mode of function of UnoApiTarget used: this is not supported),\
 +	$(if $(or $(1),$(2),$(3)),,\
 +		$(error Neither IDL files nor merged RDBs nor XML desc. were used: nothing will be produced)))
 +$(if $(4),,$(error No root has been set for the rdb file))
  endef
  
 +$(call gb_UnoApiTarget_get_target,%):
 +	$(call gb_UnoApiTarget__check_mode,$(UNOAPI_FILES),$(UNOAPI_MERGE),$(UNOAPI_XML),$(UNOAPI_ROOT))
 +	$(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
 -$$(eval $$(call gb_Module_register_target,$(call gb_UnoApiOutTarget_get_target,$(1)),$(call gb_UnoApiOutTarget_get_clean_target,$(1))))
 -$(call gb_UnoApiOutTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) \
 -	| $(dir $(call gb_UnoApiOutTarget_get_target,$(1))).dir
 -$(call gb_UnoApiOutTarget_get_clean_target,$(1)) : $(call gb_UnoApiTarget_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_XML :=
  $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE :=
 -gb_UnoApiTarget_HPPFILES_$(1) :=
 -gb_UnoApiTarget_IDLFILES_$(1) :=
 +$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_ROOT :=
 +
  ifeq ($(gb_FULLDEPS),$(true))
 +$(call gb_UnoApiTarget_get_dep_target,$(1)) : UNOAPI_IDLFILES :=
  -include $(call gb_UnoApiTarget_get_dep_target,$(1))
  endif
  
@@@ -185,10 -73,11 +189,12 @@@ ende
  define gb_UnoApiTarget__add_idlfile
  $(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : \
  	$(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd)
 +$(call gb_UnoApiTarget__add_urdfile,$(1),$(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd))
+ $(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd) :| \
+ 	$(call gb_UnoApiPartTarget_get_target,$(2)/.dir)
 -gb_UnoApiTarget_IDLFILES_$(1) += $(2)/$(3).idl
  
  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)) : \
diff --cc udkapi/UnoApi_udkapi.mk
index 9bef9ca,6ba7803..17e37b6
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@@ -109,9 -109,8 +109,8 @@@ $(eval $(call gb_UnoApi_add_idlfiles_no
  	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 \
  	Invocation \
  	InvocationAdapterFactory \
@@@ -153,7 -152,10 +152,10 @@@ $(eval $(call gb_UnoApi_add_idlfiles_no
  	SequenceOutputStream \
  	TempFile \
  ))
 -$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/script,\
++$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/script,\
+ 	Converter \
+ ))
 -$(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 \
diff --cc ure/Rdb_ure.mk
index 5566d4a,464c747..3b95231
--- a/ure/Rdb_ure.mk
+++ b/ure/Rdb_ure.mk
@@@ -28,28 -28,29 +28,29 @@@
  $(eval $(call gb_Rdb_Rdb,ure/services))
  
  $(eval $(call gb_Rdb_add_components,ure/services,\
-     io/source/acceptor/acceptor \
+ 	$(if $(filter IOS,$(OS)),, \
 -	    acceptor \
 -	    connector) \
++        io/source/acceptor/acceptor \
++        io/source/connector/connector) \
      binaryurp/source/binaryurp \
 -    bootstrap \
 -    introspection \
 -    invocadapt \
 -    invocation \
 -    namingservice \
 -    proxyfac \
 -    reflection \
 -    stocservices \
 -    streams \
 -    textinstream \
 -    textoutstream \
 +    stoc/util/bootstrap \
-     io/source/connector/connector \
 +    stoc/source/inspect/introspection \
 +    stoc/source/invocation_adapterfactory/invocadapt \
 +    stoc/source/invocation/invocation \
 +    stoc/source/namingservice/namingservice \
 +    stoc/source/proxy_factory/proxyfac \
 +    stoc/source/corereflection/reflection \
 +    stoc/util/stocservices \
 +    io/source/stm/streams \
 +    io/source/TextInputStream/textinstream \
 +    io/source/TextOutputStream/textoutstream \
      uuresolver \
  ))
  
  ifneq ($(SOLAR_JAVA),)
  $(eval $(call gb_Rdb_add_components,ure/services,\
 -    javaloader \
 -    javavm \
+     javaunohelper/util/juh \
 +    stoc/source/javaloader/javaloader \
 +    stoc/source/javavm/javavm \
-     juh \
  ))
  endif
  
commit b3b76d1abb5ab9af33ce559872c2e1c45ecdbbd0
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Mar 13 11:54:07 2012 +0100

    add $(gb_STDLIBS) to linked libs

diff --git a/io/Library_acceptor.mk b/io/Library_acceptor.mk
index 9c558bb..12639b9 100644
--- a/io/Library_acceptor.mk
+++ b/io/Library_acceptor.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_add_linked_libs,acceptor,\
     cppu \
     cppuhelper \
     sal \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,acceptor,io/source/acceptor/acceptor))
diff --git a/io/Library_connector.mk b/io/Library_connector.mk
index 1111aa6..07ddfb9 100644
--- a/io/Library_connector.mk
+++ b/io/Library_connector.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_add_linked_libs,connector,\
     cppu \
     cppuhelper \
     sal \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,connector,io/source/connector/connector))
diff --git a/io/Library_streams.mk b/io/Library_streams.mk
index 8c9a889..66d8663 100644
--- a/io/Library_streams.mk
+++ b/io/Library_streams.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_add_linked_libs,streams,\
     cppu \
     cppuhelper \
     sal \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,streams,io/source/stm/streams))
diff --git a/io/Library_textinstream.mk b/io/Library_textinstream.mk
index 2a25262..b6d0f82 100644
--- a/io/Library_textinstream.mk
+++ b/io/Library_textinstream.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_add_linked_libs,textinstream,\
     cppu \
     cppuhelper \
     sal \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,textinstream,io/source/TextInputStream/textinstream))
diff --git a/io/Library_textoutstream.mk b/io/Library_textoutstream.mk
index 0034208..6de9050 100644
--- a/io/Library_textoutstream.mk
+++ b/io/Library_textoutstream.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_add_linked_libs,textoutstream,\
     cppu \
     cppuhelper \
     sal \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,textoutstream,io/source/TextOutputStream/textoutstream))
diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk
index 12a8678..490139b 100644
--- a/stoc/Library_bootstrap.mk
+++ b/stoc/Library_bootstrap.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Library_add_linked_libs,bootstrap,\
     sal \
     salhelper \
     xmlreader \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,bootstrap,stoc/util/bootstrap))
diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk
index 5766c01..1e9c97b 100644
--- a/stoc/Library_introspection.mk
+++ b/stoc/Library_introspection.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,introspection,\
     cppuhelper \
     sal \
     salhelper \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,introspection,stoc/source/inspect/introspection))
diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk
index 2da8cf5..1c59050 100644
--- a/stoc/Library_invocadapt.mk
+++ b/stoc/Library_invocadapt.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,invocadapt,\
     cppu \
     cppuhelper \
     sal \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,invocadapt,stoc/source/invocation_adapterfactory/invocadapt))
diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk
index 4ac1f2e..92ac438 100644
--- a/stoc/Library_invocation.mk
+++ b/stoc/Library_invocation.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,invocation,\
     cppu \
     cppuhelper \
     sal \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,invocation,stoc/source/invocation/invocation))
diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk
index 60f7ae6..e0f1a13 100644
--- a/stoc/Library_javaloader.mk
+++ b/stoc/Library_javaloader.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,javaloader,\
     cppuhelper \
     jvmaccess \
     sal \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,javaloader,stoc/source/javaloader/javaloader))
diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk
index c28e10d..2095def 100644
--- a/stoc/Library_javavm.mk
+++ b/stoc/Library_javavm.mk
@@ -48,16 +48,9 @@ $(eval $(call gb_Library_add_linked_libs,javavm,\
     jvmfwk \
     sal \
     salhelper \
+    $(gb_STDLIBS) \
 ))
 
-ifeq ($(GUI),WNT)
-
-$(eval $(call gb_Library_add_linked_libs,javavm,\
-    advapi32 \
-))
-
-endif
-
 $(eval $(call gb_Library_set_componentfile,javavm,stoc/source/javavm/javavm))
 
 $(eval $(call gb_Library_add_exception_objects,javavm,\
diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk
index 33181db..eaa4d70 100644
--- a/stoc/Library_namingservice.mk
+++ b/stoc/Library_namingservice.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,namingservice,\
     cppu \
     cppuhelper \
     sal \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,namingservice,stoc/source/namingservice/namingservice))
diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk
index 156d70c..fe1293b 100644
--- a/stoc/Library_proxyfac.mk
+++ b/stoc/Library_proxyfac.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,proxyfac,\
     cppu \
     cppuhelper \
     sal \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,proxyfac,stoc/source/proxy_factory/proxyfac))
diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk
index 1d90ea7..c56bf0a 100644
--- a/stoc/Library_reflection.mk
+++ b/stoc/Library_reflection.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,reflection,\
     cppu \
     cppuhelper \
     sal \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_set_componentfile,reflection,stoc/source/corereflection/reflection))
commit c6fc60d0739e1539e2efae23461f970eda7cf0f4
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Mar 24 15:20:14 2012 +0100

    rename targets to match LinkTarget's functions

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index a0a63e3..ec141c0 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -650,12 +650,12 @@ $(foreach api,$(2),$(call gb_LinkTarget__add_internal_api_one,$(1),$(api),$(3)))
 endef
 
 define gb_LinkTarget_add_internal_api
-$(call gb_LinkTarget__add_internal_api,$(1),$(2),lightweight_)
+$(call gb_LinkTarget__add_internal_api,$(1),$(2))
 
 endef
 
 define gb_LinkTarget_add_internal_bootstrap_api
-$(call gb_LinkTarget__add_internal_api,$(1),$(2))
+$(call gb_LinkTarget__add_internal_api,$(1),$(2),bootstrap_)
 
 endef
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index b229310..2176746 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -121,11 +121,11 @@ 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_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb
+gb_UnoApiHeadersTarget_get_bootstrap_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap
 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_bootstrap_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap.done
 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_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 95b2766..bb82ddb 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -34,12 +34,12 @@ 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_Package_Package,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_dir,$(1)))
 
 $(call gb_UnoApiTarget_set_root,$(1),UCR)
 
 $(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_UnoApiHeadersTarget_get_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))
@@ -47,7 +47,7 @@ $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clea
 $(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_Package_get_preparation_target,$(1)_inc) : $(call gb_UnoApiHeadersTarget_get_target,$(1))
 
 $(call gb_Deliver_add_deliverable,$(call gb_UnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1))
 
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 893e416..388fe3c 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -265,39 +265,39 @@ touch $(1)
 
 endef
 
-$(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_bootstrap_target,%) :
+	$(call gb_Output_announce,$*,$(true),HPB,3)
+	$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_bootstrap_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)
+$(call gb_UnoApiHeadersTarget_get_target,%) :
+	$(call gb_Output_announce,$*,$(true),HPP,3)
+	$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_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_dir,$*) \
+		   	$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*) \
 			$(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,$*))
+			$(call gb_UnoApiHeadersTarget_get_target,$*) \
+		   	$(call gb_UnoApiHeadersTarget_get_bootstrap_target,$*)) \
+			$(call gb_UnoApiHeadersTarget_get_comprehensive_target,$*)
 
 define gb_UnoApiHeadersTarget_UnoApiHeadersTarget
 $(call gb_UnoApiHeadersTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
+$(call gb_UnoApiHeadersTarget_get_bootstrap_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_bootstrap_target,$(1)) : UNOAPI_DEPS :=
 $(call gb_UnoApiHeadersTarget_get_comprehensive_target,$(1)) : UNOAPI_DEPS :=
-$(call gb_UnoApiHeadersTarget_get_lightweight_target,$(1)) : UNOAPI_DEPS :=
 
 endef
 
@@ -313,8 +313,8 @@ endef
 
 define gb_UnoApiHeadersTarget_add_rdbfile
 $(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),target)
+$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),bootstrap_target)
 $(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),comprehensive_target)
-$(call gb_UnoApiHeadersTarget__add_rdbfile,$(1),$(2),lightweight_target)
 
 endef
 
commit ac6e856a00f1546b00e612512cac7a8fad9d694a
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Mar 24 15:11:56 2012 +0100

    use correct rdb root dirs

diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk
index 5cfc0b5..1011d9c 100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@ -30,27 +30,40 @@ $(call gb_InternalUnoApi_get_clean_target,%) :
 	$(call gb_Helper_abbreviate_dirs_native,\
 		rm -f $(call gb_InternalUnoApi_get_target,$*))
 
+# Note: The rdb root for the internal rdbs should be / . On the other
+# side, UnoApiHeadersTarget expects UCR and it is really not easy to
+# change, because the information would have to be duplicated at the
+# calling side. So we simply do both .-)
+# TODO: Should it come clear that these rdbs (installed into
+# solver/$INPATH/rdb) are actually not needed for anything, this could
+# be simplified.
+
 define gb_InternalUnoApi_InternalUnoApi
+$(call gb_UnoApiTarget_UnoApiTarget,$(1)_out)
 $(call gb_UnoApiTarget_UnoApiTarget,$(1))
 $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1))
 
-$(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
-$(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1))
+$(call gb_UnoApiTarget_set_root,$(1)_out,/)
+$(call gb_UnoApiTarget_set_root,$(1),UCR)
+$(call gb_UnoApiTarget_merge_rdbfile,$(1),$(1)_out)
+
+$(call gb_InternalUnoApi_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)_out)
+$(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)_out)
 $(call gb_InternalUnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1))
 
-$(call gb_Deliver_add_deliverable,$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)),$(1))
+$(call gb_Deliver_add_deliverable,$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_UnoApiTarget_get_target,$(1)_out),$(1))
 
 $$(eval $$(call gb_Module_register_target,$(call gb_InternalUnoApi_get_target,$(1)),$(call gb_InternalUnoApi_get_clean_target,$(1))))
 
 endef
 
 define gb_InternalUnoApi_add_idlfile
-$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(3))
+$(call gb_UnoApiTarget_add_idlfile,$(1)_out,$(2),$(3))
 
 endef
 
 define gb_InternalUnoApi_add_idlfiles
-$(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3))
+$(call gb_UnoApiTarget_add_idlfiles,$(1)_out,$(2),$(3))
 
 endef
 
@@ -86,12 +99,12 @@ $(foreach dep,$(3),$(call gb_InternalUnoApi_add_api_dependency,$(1),$(2),$(dep))
 endef
 
 define gb_InternalUnoApi_set_xmlfile
-$(call gb_UnoApiTarget_set_xmlfile,$(1),$(2))
+$(call gb_UnoApiTarget_set_xmlfile,$(1)_out,$(2))
 
 endef
 
 define gb_InternalUnoApi_set_include
-$(call gb_UnoApiTarget_set_include,$(1),$(2))
+$(call gb_UnoApiTarget_set_include,$(1)_out,$(2))
 
 endef
 
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 579d2fb..95b2766 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -36,6 +36,8 @@ $(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_UnoApiTarget_set_root,$(1),UCR)
+
 $(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)
diff --git a/solenv/gbuild/UnoApiMerge.mk b/solenv/gbuild/UnoApiMerge.mk
index d23ce75..067a4c1 100644
--- a/solenv/gbuild/UnoApiMerge.mk
+++ b/solenv/gbuild/UnoApiMerge.mk
@@ -32,6 +32,8 @@
 define gb_UnoApiMerge_UnoApiMerge
 $(call gb_UnoApiTarget_UnoApiTarget,$(1))
 
+$(call gb_UnoApiTarget_set_root,$(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))
 
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 0fa2857..893e416 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -100,20 +100,18 @@ define gb_UnoApiTarget__regmerge_command_impl
 $(call gb_UnoApiTarget__command_impl,$(gb_UnoApiTarget_REGMERGECOMMAND),$(1) $(2) $(3))
 endef
 
-# TODO: -bUCR changes content of the RDB files; the old build system
-# uses -b/ (by default)
 define gb_UnoApiTarget__rdbmaker_command_impl
-$(call gb_UnoApiTarget__command_impl,$(gb_UnoApiTarget_RDBMAKERCOMMAND),-O$(1) -B$(2) -b$(2) $(3) $(4))
+$(call gb_UnoApiTarget__command_impl,$(gb_UnoApiTarget_RDBMAKERCOMMAND),-O$(1) -B$(2) -b$(3) $(4) $(5))
 endef
 
 define gb_UnoApiTarget__command
 $(call gb_Output_announce,$*,$(true),RDB,3)
 mkdir -p $(dir $(1)) && \
 $(if $(UNOAPI_FILES),\
-	$(call gb_UnoApiTarget__regmerge_command_impl,$(1),UCR,$(UNOAPI_FILES)),\
+	$(call gb_UnoApiTarget__regmerge_command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_FILES)),\
 	$(if $(UNOAPI_MERGE),\
-		$(call gb_UnoApiTarget__regmerge_command_impl,$(1),/,$(UNOAPI_MERGE)),\
-		$(call gb_UnoApiTarget__rdbmaker_command_impl,$(1),UCR,\
+		$(call gb_UnoApiTarget__regmerge_command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_MERGE)),\
+		$(call gb_UnoApiTarget__rdbmaker_command_impl,$(1),UCR,$(UNOAPI_ROOT),\
 			$(call gb_UnoApiTarget__get_types,$(UNOAPI_XML)),$(gb_UnoApiTarget_XMLRDB)))) \
 $(if $(UNOAPI_REFERENCE), \
 	$(call gb_Output_announce,$*,$(true),DBc,3) \
@@ -128,10 +126,11 @@ $(if $(or $(and $(1),$(2),$(3)),$(and $(1),$(2)),$(and $(2),$(3)),$(and $(1),$(3
 	$(error More than one mode of function of UnoApiTarget used: this is not supported),\
 	$(if $(or $(1),$(2),$(3)),,\
 		$(error Neither IDL files nor merged RDBs nor XML desc. were used: nothing will be produced)))
+$(if $(4),,$(error No root has been set for the rdb file))
 endef
 
 $(call gb_UnoApiTarget_get_target,%):
-	$(call gb_UnoApiTarget__check_mode,$(UNOAPI_FILES),$(UNOAPI_MERGE),$(UNOAPI_XML))
+	$(call gb_UnoApiTarget__check_mode,$(UNOAPI_FILES),$(UNOAPI_MERGE),$(UNOAPI_XML),$(UNOAPI_ROOT))
 	$(call gb_UnoApiTarget__command,$@,$*,$<,$?)
 
 .PHONY : $(call gb_UnoApiTarget_get_clean_target,%)
@@ -168,6 +167,7 @@ $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_FILES :=
 $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE :=
 $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_XML :=
 $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE :=
+$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_ROOT :=
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_UnoApiTarget_get_dep_target,$(1)) : UNOAPI_IDLFILES :=
@@ -245,6 +245,11 @@ $(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE := $(2)
 
 endef
 
+define gb_UnoApiTarget_set_root
+$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_ROOT := $(2)
+
+endef
+
 # UnoApiHeadersTarget
 
 gb_UnoApiHeadersTarget_CPPUMAKERTARGET := $(call gb_Executable_get_target_for_build,cppumaker)
@@ -284,7 +289,6 @@ $(call gb_UnoApiHeadersTarget_get_clean_target,%) :
 			$(call gb_UnoApiHeadersTarget_get_lightweight_target,$*) \
 		   	$(call gb_UnoApiHeadersTarget_get_target,$*))
 
-# TODO: add second parameter: root of rdb file (UCR vs. /)
 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))
commit 1a00658cd3867fe1a7a306aa309850796ca7a7a4
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Mar 24 13:36:46 2012 +0100

    use the default deliver rule

diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk
index 68e29ba..5cfc0b5 100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@ -25,13 +25,8 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(call gb_InternalUnoApi_get_target,%) :
-	$(call gb_Output_announce,$*,$(true),UNI,4)
-	$(call gb_Deliver_deliver,$(call gb_UnoApiTarget_get_target,$*),$@)
-
 .PHONY : $(call gb_InternalUnoApi_get_clean_target,%)
 $(call gb_InternalUnoApi_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),UNI,4)
 	$(call gb_Helper_abbreviate_dirs_native,\
 		rm -f $(call gb_InternalUnoApi_get_target,$*))
 
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 8348826..579d2fb 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -25,13 +25,8 @@
 # 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,$*))
 
commit 15396990cf0aa73bc8afd592bb338c9af2604609
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Mar 24 07:22:39 2012 +0100

    update copyright date

diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk
index efffa9f..68e29ba 100644
--- a/solenv/gbuild/InternalUnoApi.mk
+++ b/solenv/gbuild/InternalUnoApi.mk
@@ -12,7 +12,7 @@
 # License.
 #
 # Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
 #  (initial developer)
 #
 # All Rights Reserved.
commit f361c71992f0458866229af84275c0e799776930
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Mar 18 19:45:36 2012 +0100

    move addins out of offapi again

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 11c0d37..4747164 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1131,16 +1131,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sheet,\
 	UniqueCellFormatRangesEnumeration \
 	VolatileResult \
 ))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sheet/addin,\
-	XAnalysis \
-	XCompatibilityNames \
-	XDateFunctions \
-	XMiscFunctions \
-))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sheet/addin,\
-	Analysis \
-	DateFunctions \
-))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/style,\
 	CellStyle \
 	CharacterProperties \
diff --git a/offapi/com/sun/star/sheet/addin/Analysis.idl b/offapi/com/sun/star/sheet/addin/Analysis.idl
deleted file mode 100644
index 2e1ad52..0000000
--- a/offapi/com/sun/star/sheet/addin/Analysis.idl
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-#ifndef com_sun_star_sheet_addin_Analysis_idl
-#define com_sun_star_sheet_addin_Analysis_idl
-
-#include <com/sun/star/sheet/addin/XAnalysis.idl>
-#include <com/sun/star/sheet/addin/XCompatibilityNames.idl>
-
-module com
-{
-module sun
-{
-module star
-{
-module sheet
-{
-module addin
-{
-    service Analysis
-    {
-        // exported interfaces:
-        interface XCompatibilityNames;
-        interface XAnalysis;
-    };
-};
-};
-};
-};
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sheet/addin/DateFunctions.idl b/offapi/com/sun/star/sheet/addin/DateFunctions.idl
deleted file mode 100644
index 5411284..0000000
--- a/offapi/com/sun/star/sheet/addin/DateFunctions.idl
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
-*
- * 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.
- *
-************************************************************************/
-
-#ifndef com_sun_star_sheet_addin_DateFunctions_idl
-#define com_sun_star_sheet_addin_DateFunctions_idl
-
-#include <com/sun/star/sheet/addin/XDateFunctions.idl>
-#include <com/sun/star/sheet/addin/XMiscFunctions.idl>
-
-module com
-{
-module sun
-{
-module star
-{
-module sheet
-{
-module addin
-{
-    service DateFunctions
-    {
-        // exported interfaces:
-        interface XDateFunctions;
-        interface XMiscFunctions;
-    };
-};
-};
-};
-};
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sheet/addin/XAnalysis.idl b/offapi/com/sun/star/sheet/addin/XAnalysis.idl
deleted file mode 100644
index 1cb0018..0000000
--- a/offapi/com/sun/star/sheet/addin/XAnalysis.idl
+++ /dev/null
@@ -1,584 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-#ifndef com_sun_star_sheet_addin_XAnalysis_idl
-#define com_sun_star_sheet_addin_XAnalysis_idl
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/beans/XPropertySet.idl>
-#include <com/sun/star/sheet/NoConvergenceException.idl>
-
-module com
-{
-module sun
-{
-module star
-{
-module sheet
-{
-module addin
-{
-    /**
-    * Interface with analysis functions.
-    */
-    interface XAnalysis : com::sun::star::uno::XInterface
-    {
-        /// workday.
-        long getWorkday(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long nStartDate, [in] long nDays, [in] any aHolidays )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// yearfrac.
-        double getYearfrac(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long StartDate, [in] long EndDate, [in] any Mode )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// edate.
-        long getEdate(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long nStartDate, [in] long nNumOfMonths )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// weeknum.
-        long getWeeknum(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long nStartDate, [in] long nMode )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// eomonth.
-        long getEomonth(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long nStartDate, [in] long nMonths )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// networkdays.
-        long getNetworkdays(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long StartDate, [in] long EndDate, [in] any Holidays )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// iseven.
-        long getIseven( [in] long nValue )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// isodd.
-        long getIsodd( [in] long nValue )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// multinomial.
-        double getMultinomial(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] sequence< sequence< long > > aValList,
-                    [in] sequence< any > aOptVLst )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// seriessum.
-        double getSeriessum(
-                    [in] double X, [in] double N, [in] double M,
-                    [in] sequence< sequence< double > > CoeffList )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        // quotient.
-        double getQuotient( [in] double Num, [in] double Denum )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        // mround.
-        double getMround( [in] double Number, [in] double Multiple )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        // sqrtpi.
-        double getSqrtpi( [in] double Number )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        // randbetween.
-        double getRandbetween( [in] double Min, [in] double Max )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// gcd.
-        double getGcd(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] sequence< sequence< double > > FirstValList,
-                    [in] sequence< any > OptionalValList )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// lcm.
-        double getLcm(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] sequence< sequence< double > > FirstValList,
-                    [in] sequence< any > OptionalValList )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// besseli.
-        double getBesseli( [in] double Num, [in] long Order )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::sheet::NoConvergenceException );
-
-        /// besselj.
-        double getBesselj( [in] double Num, [in] long Order )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::sheet::NoConvergenceException );
-
-        /// besselk.
-        double getBesselk( [in] double Num, [in] long Order )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::sheet::NoConvergenceException );
-
-        /// bessely.
-        double getBessely( [in] double Num, [in] long Order )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::sheet::NoConvergenceException );
-
-        /// bin2oct.
-        string getBin2Oct(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] string BinaryNum, [in] any Places )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// bin2dec.
-        double getBin2Dec( [in] string BinaryNum )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// bin2hex.
-        string getBin2Hex(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] string BinaryNum, [in] any Places )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// oct2bin.
-        string getOct2Bin(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] string OctalNum, [in] any Places )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// oct2dec.
-        double getOct2Dec( [in] string OctalNum )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// oct2hex.
-        string getOct2Hex(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] string OctalNum, [in] any Places )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// dec2bin.
-        string getDec2Bin(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Value, [in] any Places )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// dec2oct.
-        string getDec2Oct(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Value, [in] any Places )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// dec2hex.
-        string getDec2Hex(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] double Value, [in] any Places )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// hex2bin.
-        string getHex2Bin(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] string HexadecimalValue, [in] any Places )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// hex2dec.
-        double getHex2Dec( [in] string HexadecimalValue )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// hex2oct.
-        string getHex2Oct(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] string HexadecimalValue, [in] any Places )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// delta.
-        long getDelta(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] double Num1, [in] any Num2 )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// erf.
-        double getErf(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] double LowerLimit, [in] any UpperLimit )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// erfc.
-        double getErfc( [in] double LowerLimit )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// gestep.
-        long getGestep(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] double Num, [in] any Step )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// factdouble.
-        double getFactdouble( [in] long Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imabs.
-        double getImabs( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imaginary.
-        double getImaginary( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// impower.
-        string getImpower( [in] string Num, [in] double Power )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imargument.
-        double getImargument( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imcos.
-        string getImcos( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imdiv.
-        string getImdiv( [in] string Num1, [in] string Num2 )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imexp.
-        string getImexp( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imconjugate.
-        string getImconjugate( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imln.
-        string getImln( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imlog10.
-        string getImlog10( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imlog2.
-        string getImlog2( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// improduct.
-        string getImproduct(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] sequence< sequence< string > > Num1,
-                    [in] sequence< any > NumberList )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imreal.
-        double getImreal( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imsin.
-        string getImsin( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imsub.
-        string getImsub( [in] string Num1, [in] string Num2 )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imsum.
-        string getImsum(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] sequence< sequence< string > > Num1,
-                    [in] sequence< any > OptNums )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imsqrt.
-        string getImsqrt( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// complex.
-        string getComplex( [in] double Real, [in] double Imaginary, [in] any Suffix )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// convert.
-        double getConvert( [in] double Value, [in] string FromUnit, [in] string ToUnit )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-
-        /// amordegrc.
-        double getAmordegrc(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] double Cost, [in] long Date, [in] long FirstPer, [in] double RestVal,
-                    [in] double Periode, [in] double Rate, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// amorlinc.
-        double getAmorlinc(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] double Cost, [in] long Date, [in] long FirstPer, [in] double RestVal,
-                    [in] double Periode, [in] double Rate, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// accrint.
-        double getAccrint(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Issue, [in] long FirstInterest, [in] long Settlement, [in] double Rate,
-                    [in] any Value, [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// accrintm.
-        double getAccrintm(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Issue, [in] long Settlement, [in] double Rate, [in] any Value, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// received.
-        double getReceived(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Investment, [in] double Discount,
-                    [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// disc.
-        double getDisc(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Price, [in] double Redemption,
-                    [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// duration.
-        double getDuration(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Coupon, [in] double Yield,
-                    [in] long Frequncy, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// effect.
-        double getEffect( [in] double Nomial, [in] long NumOfPeriods )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// cumprinc.
-        double getCumprinc(
-                    [in] double Rate, [in] long NumOfPeriods, [in] double Val, [in] long StartPeriode,
-                    [in] long EndPeriode, [in] long PayType )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// cumipmt.
-        double getCumipmt(
-                    [in] double Rate, [in] long NumOfPeriods, [in] double Val, [in] long StartPeriode,
-                    [in] long EndPeriode, [in] long PayType )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// price.
-        double getPrice(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Rate, [in] double Yield,
-                    [in] double Redemption, [in] long Frequncy, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// pricedisc.
-        double getPricedisc(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Discont, [in] double Redemption,
-                    [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// pricemat.
-        double getPricemat(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] long Issue, [in] double Rate, [in] double Yield,
-                    [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// mduration.
-        double getMduration(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Coupon, [in] double Yield,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// nominal.
-        double getNominal( [in] double Rate, [in] long NumOfPeriods )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// dollarfr.
-        double getDollarfr( [in] double DollarDecimal, [in] long Fraction )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// dollarde.
-        double getDollarde( [in] double DollarFractional, [in] long Fraction )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// yield.
-        double getYield(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Coupon, [in] double Price,
-                    [in] double Redemption, [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// yielddisc.
-        double getYielddisc(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Price,
-                    [in] double Redemption, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// yieldmat.
-        double getYieldmat(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] long Issue, [in] double Rate,
-                    [in] double Price, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// tbilleq.
-        double getTbilleq(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Discont )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// tbillprice.
-        double getTbillprice(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Discont )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// tbillyield.
-        double getTbillyield(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Price )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// oddfprice.
-        double getOddfprice(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] long Issue, [in] long FirstCouponDate,
-                    [in] double Rate, [in] double Yield, [in] double Redemption,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// oddfyield.
-        double getOddfyield(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] long Issue, [in] long FirstCouponDate,
-                    [in] double Rate, [in] double Price, [in] double Redemption,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// oddlprice.
-        double getOddlprice(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] long LastInterest,
-                    [in] double Rate, [in] double Yield, [in] double Redemption,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// oddlyield.
-        double getOddlyield(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] long LastInterest,
-                    [in] double Rate, [in] double Price, [in] double Redemption,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// xirr.
-        double getXirr(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] sequence< sequence< double > > Values,
-                    [in] sequence< sequence< long > > Dates, [in] any Guess )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// xnpv.
-        double getXnpv(
-                    [in] double Rate,
-                    [in] sequence< sequence< double > > Values,
-                    [in] sequence< sequence< long > > Dates )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// intrate.
-        double getIntrate(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity,
-                    [in] double Investment, [in] double Redemption, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// coupncd.
-        double getCoupncd(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// coupdays.
-        double getCoupdays(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-
-        /// coupdaysnc.
-        double getCoupdaysnc(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// coupdaybs.
-        double getCoupdaybs(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// couppcd.
-        double getCouppcd(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// coupnum.
-        double getCoupnum(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// fvschedule.
-        double getFvschedule( [in] double Principal, [in] sequence< sequence< double > > Schedule )
-            raises( com::sun::star::lang::IllegalArgumentException );
-    };
-};
-};
-};
-};
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sheet/addin/XCompatibilityNames.idl b/offapi/com/sun/star/sheet/addin/XCompatibilityNames.idl
deleted file mode 100644
index fade59e..0000000
--- a/offapi/com/sun/star/sheet/addin/XCompatibilityNames.idl
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
-*
- * 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.
- *
-************************************************************************/
-
-#ifndef com_sun_star_sheet_addin_XCompatibilityNames_idl
-#define com_sun_star_sheet_addin_XCompatibilityNames_idl
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/sheet/LocalizedName.idl>
-
-module com
-{
-module sun
-{
-module star
-{
-module sheet
-{
-module addin
-{
-    interface XCompatibilityNames  : com::sun::star::uno::XInterface
-    {
-        /// @return a sequence with all localized names for a programmatic name
-        sequence< com::sun::star::sheet::LocalizedName > getCompatibilityNames ( [in] string aProgrammaticName );
-    };
-};
-};
-};
-};
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sheet/addin/XDateFunctions.idl b/offapi/com/sun/star/sheet/addin/XDateFunctions.idl
deleted file mode 100644
index 773a1ff..0000000
--- a/offapi/com/sun/star/sheet/addin/XDateFunctions.idl
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list