merge feature/gbuild_components

author: David Tardon <dtardon@redhat.com> 2012-04-06 14:24:47 +0200
committer: David Tardon <dtardon@redhat.com> 2012-04-06 14:31:05 +0200
commit: 7545dbbf64e959cfb166556935946f442199e92b (patch)
tree: 8ffd1c318cd4c3ff1efc54b0683660033c6d0002 /stoc
parent: 7d82fb18fe6ae68f6eb6a33c6030105f9e2fe232 (diff)
parent: 7e94a37403aa4470bd7dad7c549ba8bc7485620a (diff)
49 files changed, 1100 insertions, 1432 deletions
diff --git a/stoc/InternalUnoApi_bootstrap.mk b/stoc/InternalUnoApi_bootstrap.mk
new file mode 100644
index 000000000000..ff7f7e0f2a7e
--- /dev/null
+++ b/stoc/InternalUnoApi_bootstrap.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,bootstrap))
+
+$(eval $(call gb_InternalUnoApi_set_xmlfile,bootstrap,stoc/source/bootstrap/bootstrap.xml))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_corefl.mk b/stoc/InternalUnoApi_corefl.mk
new file mode 100644
index 000000000000..aee2d2807fcc
--- /dev/null
+++ b/stoc/InternalUnoApi_corefl.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,corefl))
+
+$(eval $(call gb_InternalUnoApi_set_xmlfile,corefl,stoc/source/corereflection/corefl.xml))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_insp.mk b/stoc/InternalUnoApi_insp.mk
new file mode 100644
index 000000000000..c22eb1dd3507
--- /dev/null
+++ b/stoc/InternalUnoApi_insp.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,insp))
+
+$(eval $(call gb_InternalUnoApi_set_xmlfile,insp,stoc/source/inspect/insp.xml))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_inv.mk b/stoc/InternalUnoApi_inv.mk
new file mode 100644
index 000000000000..169bac64fff5
--- /dev/null
+++ b/stoc/InternalUnoApi_inv.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,inv))
+
+$(eval $(call gb_InternalUnoApi_set_xmlfile,inv,stoc/source/invocation/inv.xml))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_invadp.mk b/stoc/InternalUnoApi_invadp.mk
new file mode 100644
index 000000000000..ddc3fdddeb9c
--- /dev/null
+++ b/stoc/InternalUnoApi_invadp.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,invadp))
+
+$(eval $(call gb_InternalUnoApi_set_xmlfile,invadp,stoc/source/invocation_adapterfactory/invadp.xml))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_javaloader.mk b/stoc/InternalUnoApi_javaloader.mk
new file mode 100644
index 000000000000..41e1bb21a59c
--- /dev/null
+++ b/stoc/InternalUnoApi_javaloader.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,javaloader))
+
+$(eval $(call gb_InternalUnoApi_set_xmlfile,javaloader,stoc/source/javaloader/javaloader.xml))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_jen.mk b/stoc/InternalUnoApi_jen.mk
new file mode 100644
index 000000000000..13767de69494
--- /dev/null
+++ b/stoc/InternalUnoApi_jen.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,jen))
+
+$(eval $(call gb_InternalUnoApi_set_xmlfile,jen,stoc/source/javavm/jen.xml))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_namingservice.mk b/stoc/InternalUnoApi_namingservice.mk
new file mode 100644
index 000000000000..16e18c13a296
--- /dev/null
+++ b/stoc/InternalUnoApi_namingservice.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,namingservice))
+
+$(eval $(call gb_InternalUnoApi_set_xmlfile,namingservice,stoc/source/namingservice/namingservice.xml))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_proxyfac.mk b/stoc/InternalUnoApi_proxyfac.mk
new file mode 100644
index 000000000000..c5b5d744051d
--- /dev/null
+++ b/stoc/InternalUnoApi_proxyfac.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,proxyfac))
+
+$(eval $(call gb_InternalUnoApi_set_xmlfile,proxyfac,stoc/source/proxy_factory/proxyfac.xml))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/InternalUnoApi_stocserv.mk b/stoc/InternalUnoApi_stocserv.mk
new file mode 100644
index 000000000000..00dbbe986978
--- /dev/null
+++ b/stoc/InternalUnoApi_stocserv.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,stocserv))
+
+$(eval $(call gb_InternalUnoApi_set_xmlfile,stocserv,stoc/source/stocservices/stocserv.xml))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk
new file mode 100644
index 000000000000..490139bfa421
--- /dev/null
+++ b/stoc/Library_bootstrap.mk
@@ -0,0 +1,99 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,bootstrap))
+
+ifneq ($(debug),)
+
+$(eval $(call gb_Library_add_defs,bootstrap,\
+    $(if $(diag),\
+        $(if $(filter $(diag),cache full),-D__CACHE_DIAGNOSE) \
+        $(if $(filter-out $(diag),cache),-D__DIAGNOSE)) \
+))
+
+ifeq ($(COM),MSC)
+$(eval $(call gb_Library_add_defs,bootstrap,\
+    -0b0 \
+))
+endif
+
+endif
+
+$(eval $(call gb_Library_set_include,bootstrap,\
+    -I$(SRCDIR)/stoc/inc \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_internal_bootstrap_api,bootstrap,\
+    bootstrap \
+))
+
+$(eval $(call gb_Library_add_linked_libs,bootstrap,\
+    cppu \
+    cppuhelper \
+    reg \
+    sal \
+    salhelper \
+    xmlreader \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,bootstrap,stoc/util/bootstrap))
+
+$(eval $(call gb_Library_add_exception_objects,bootstrap,\
+    stoc/source/bootstrap/services \
+    stoc/source/defaultregistry/defaultregistry \
+    stoc/source/implementationregistration/implreg \
+    stoc/source/implementationregistration/mergekeys \
+    stoc/source/loader/dllcomponentloader \
+    stoc/source/registry_tdprovider/functiondescription \
+    stoc/source/registry_tdprovider/methoddescription \
+    stoc/source/registry_tdprovider/rdbtdp_tdenumeration \
+    stoc/source/registry_tdprovider/structtypedescription \
+    stoc/source/registry_tdprovider/td \
+    stoc/source/registry_tdprovider/tdcomp \
+    stoc/source/registry_tdprovider/tdconsts \
+    stoc/source/registry_tdprovider/tdef \
+    stoc/source/registry_tdprovider/tdenum \
+    stoc/source/registry_tdprovider/tdiface \
+    stoc/source/registry_tdprovider/tdmodule \
+    stoc/source/registry_tdprovider/tdprop \
+    stoc/source/registry_tdprovider/tdprovider \
+    stoc/source/registry_tdprovider/tdservice \
+    stoc/source/registry_tdprovider/tdsingleton \
+    stoc/source/security/access_controller \
+    stoc/source/security/file_policy \
+    stoc/source/security/permissions \
+    stoc/source/servicemanager/servicemanager \
+    stoc/source/simpleregistry/simpleregistry \
+    stoc/source/simpleregistry/textualservices \
+    stoc/source/tdmanager/tdmgr \
+    stoc/source/tdmanager/tdmgr_check \
+    stoc/source/tdmanager/tdmgr_tdenumeration \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk
new file mode 100644
index 000000000000..1e9c97b42a01
--- /dev/null
+++ b/stoc/Library_introspection.mk
@@ -0,0 +1,58 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,introspection))
+
+ifneq ($(debug),)
+
+ifeq ($(COM),MSC)
+$(eval $(call gb_Library_add_defs,introspection,\
+    -0b0 \
+))
+endif
+
+endif
+
+$(eval $(call gb_Library_add_internal_api,introspection,\
+    insp \
+))
+
+$(eval $(call gb_Library_add_linked_libs,introspection,\
+    cppu \
+    cppuhelper \
+    sal \
+    salhelper \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,introspection,stoc/source/inspect/introspection))
+
+$(eval $(call gb_Library_add_exception_objects,introspection,\
+    stoc/source/inspect/introspection \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk
new file mode 100644
index 000000000000..1c5905071bf7
--- /dev/null
+++ b/stoc/Library_invocadapt.mk
@@ -0,0 +1,57 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,invocadapt))
+
+ifneq ($(debug),)
+
+ifeq ($(COM),MSC)
+$(eval $(call gb_Library_add_defs,invocadapt,\
+    -0b0 \
+))
+endif
+
+endif
+
+$(eval $(call gb_Library_add_internal_api,invocadapt,\
+    invadp \
+))
+
+$(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))
+
+$(eval $(call gb_Library_add_exception_objects,invocadapt,\
+    stoc/source/invocation_adapterfactory/iafactory \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk
new file mode 100644
index 000000000000..92ac438477d2
--- /dev/null
+++ b/stoc/Library_invocation.mk
@@ -0,0 +1,57 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,invocation))
+
+ifneq ($(debug),)
+
+ifeq ($(COM),MSC)
+$(eval $(call gb_Library_add_defs,invocation,\
+    -0b0 \
+))
+endif
+
+endif
+
+$(eval $(call gb_Library_add_internal_api,invocation,\
+    inv \
+))
+
+$(eval $(call gb_Library_add_linked_libs,invocation,\
+    cppu \
+    cppuhelper \
+    sal \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,invocation,stoc/source/invocation/invocation))
+
+$(eval $(call gb_Library_add_exception_objects,invocation,\
+    stoc/source/invocation/invocation \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk
new file mode 100644
index 000000000000..e0f1a1391c3d
--- /dev/null
+++ b/stoc/Library_javaloader.mk
@@ -0,0 +1,58 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,javaloader))
+
+ifneq ($(debug),)
+
+ifeq ($(COM),MSC)
+$(eval $(call gb_Library_add_defs,javaloader,\
+    -0b0 \
+))
+endif
+
+endif
+
+$(eval $(call gb_Library_add_internal_api,javaloader,\
+    javaloader \
+))
+
+$(eval $(call gb_Library_add_linked_libs,javaloader,\
+    cppu \
+    cppuhelper \
+    jvmaccess \
+    sal \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,javaloader,stoc/source/javaloader/javaloader))
+
+$(eval $(call gb_Library_add_exception_objects,javaloader,\
+    stoc/source/javaloader/javaloader \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk
new file mode 100644
index 000000000000..2095def49dda
--- /dev/null
+++ b/stoc/Library_javavm.mk
@@ -0,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@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.
+
+$(eval $(call gb_Library_Library,javavm))
+
+ifneq ($(debug),)
+
+ifeq ($(COM),MSC)
+$(eval $(call gb_Library_add_defs,javavm,\
+    -0b0 \
+))
+endif
+
+endif
+
+$(eval $(call gb_Library_add_internal_api,javavm,\
+    jen \
+))
+
+$(eval $(call gb_Library_add_linked_libs,javavm,\
+    cppu \
+    cppuhelper \
+    jvmaccess \
+    jvmfwk \
+    sal \
+    salhelper \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,javavm,stoc/source/javavm/javavm))
+
+$(eval $(call gb_Library_add_exception_objects,javavm,\
+    stoc/source/javavm/interact \
+    stoc/source/javavm/javavm \
+    stoc/source/javavm/jvmargs \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk
new file mode 100644
index 000000000000..eaa4d7080c59
--- /dev/null
+++ b/stoc/Library_namingservice.mk
@@ -0,0 +1,57 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,namingservice))
+
+ifneq ($(debug),)
+
+ifeq ($(COM),MSC)
+$(eval $(call gb_Library_add_defs,namingservice,\
+    -0b0 \
+))
+endif
+
+endif
+
+$(eval $(call gb_Library_add_internal_api,namingservice,\
+    namingservice \
+))
+
+$(eval $(call gb_Library_add_linked_libs,namingservice,\
+    cppu \
+    cppuhelper \
+    sal \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,namingservice,stoc/source/namingservice/namingservice))
+
+$(eval $(call gb_Library_add_exception_objects,namingservice,\
+    stoc/source/namingservice/namingservice \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk
new file mode 100644
index 000000000000..fe1293beff29
--- /dev/null
+++ b/stoc/Library_proxyfac.mk
@@ -0,0 +1,57 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,proxyfac))
+
+ifneq ($(debug),)
+
+ifeq ($(COM),MSC)
+$(eval $(call gb_Library_add_defs,proxyfac,\
+    -0b0 \
+))
+endif
+
+endif
+
+$(eval $(call gb_Library_add_internal_api,proxyfac,\
+    proxyfac \
+))
+
+$(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))
+
+$(eval $(call gb_Library_add_exception_objects,proxyfac,\
+    stoc/source/proxy_factory/proxyfac \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk
new file mode 100644
index 000000000000..c56bf0a88a2b
--- /dev/null
+++ b/stoc/Library_reflection.mk
@@ -0,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@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.
+
+$(eval $(call gb_Library_Library,reflection))
+
+ifneq ($(debug),)
+
+ifeq ($(COM),MSC)
+$(eval $(call gb_Library_add_defs,reflection,\
+    -0b0 \
+))
+endif
+
+endif
+
+$(eval $(call gb_Library_add_internal_api,reflection,\
+    corefl \
+))
+
+$(eval $(call gb_Library_add_linked_libs,reflection,\
+    cppu \
+    cppuhelper \
+    sal \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,reflection,stoc/source/corereflection/reflection))
+
+$(eval $(call gb_Library_add_exception_objects,reflection,\
+    stoc/source/corereflection/crarray \
+    stoc/source/corereflection/crbase \
+    stoc/source/corereflection/crcomp \
+    stoc/source/corereflection/crefl \
+    stoc/source/corereflection/crenum \
+    stoc/source/corereflection/criface \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk
new file mode 100644
index 000000000000..6fb777ee65fd
--- /dev/null
+++ b/stoc/Library_stocservices.mk
@@ -0,0 +1,70 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,stocservices))
+
+ifneq ($(debug),)
+
+ifeq ($(COM),MSC)
+$(eval $(call gb_Library_add_defs,stocservices,\
+    -0b0 \
+))
+endif
+
+endif
+
+$(eval $(call gb_Library_set_include,stocservices,\
+    -I$(SRCDIR)/stoc/inc \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_internal_api,stocservices,\
+    stocserv \
+))
+
+$(eval $(call gb_Library_add_linked_libs,stocservices,\
+    cppu \
+    cppuhelper \
+    sal \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,stocservices,stoc/util/stocservices))
+
+$(eval $(call gb_Library_add_exception_objects,stocservices,\
+    stoc/source/stocservices/stocservices \
+    stoc/source/typeconv/convert \
+    stoc/source/uriproc/ExternalUriReferenceTranslator \
+    stoc/source/uriproc/UriReference \
+    stoc/source/uriproc/UriReferenceFactory \
+    stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand \
+    stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript \
+    stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory \
+    stoc/source/uriproc/supportsService \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/inc/makefile.mk b/stoc/Makefile
index 1fb6092e8286..7bbbe6c703e6 100644
--- a/stoc/inc/makefile.mk
+++ b/stoc/Makefile
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,16 +25,16 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..
 
-PRJNAME=stoc
-TARGET=inc
+gb_PARTIALBUILD := T
+ifeq ($(strip $(SOLARENV)),)
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
+else
 
-# --- Settings -----------------------------------------------------
+gb_SourceEnvAndRecurse_STAGE=gbuild
+include $(SOLARENV)/gbuild/gbuild.mk
 
-.INCLUDE :  settings.mk
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/stoc/Module_stoc.mk b/stoc/Module_stoc.mk
new file mode 100644
index 000000000000..7169d456ba0a
--- /dev/null
+++ b/stoc/Module_stoc.mk
@@ -0,0 +1,61 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,stoc))
+
+$(eval $(call gb_Module_add_targets,stoc,\
+    InternalUnoApi_bootstrap \
+    InternalUnoApi_corefl \
+    InternalUnoApi_insp \
+    InternalUnoApi_inv \
+    InternalUnoApi_invadp \
+    InternalUnoApi_javaloader \
+    InternalUnoApi_jen \
+    InternalUnoApi_namingservice \
+    InternalUnoApi_proxyfac \
+    InternalUnoApi_stocserv \
+    Library_bootstrap \
+    Library_introspection \
+    Library_invocadapt \
+    Library_invocation \
+    Library_namingservice \
+    Library_proxyfac \
+    Library_reflection \
+    Library_stocservices \
+    Package_xml \
+))
+
+ifeq ($(SOLAR_JAVA),TRUE)
+
+$(eval $(call gb_Module_add_targets,stoc,\
+    Library_javaloader \
+    Library_javavm \
+))
+
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/Package_xml.mk b/stoc/Package_xml.mk
new file mode 100644
index 000000000000..73dfcb4dc674
--- /dev/null
+++ b/stoc/Package_xml.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,stoc_xml,$(SRCDIR)/stoc/source))
+
+$(eval $(call gb_Package_add_file,stoc_xml,xml/module-description.dtd,module-description.dtd))
+
+$(eval $(call gb_Package_add_file,stoc_xml,xml/reflection.uno.xml,corereflection/corefl.xml))
+$(eval $(call gb_Package_add_file,stoc_xml,xml/introspection.uno.xml,inspect/insp.xml))
+$(eval $(call gb_Package_add_file,stoc_xml,xml/invocation.uno.xml,invocation/inv.xml))
+$(eval $(call gb_Package_add_file,stoc_xml,xml/invocadapt.uno.xml,invocation_adapterfactory/invadp.xml))
+$(eval $(call gb_Package_add_file,stoc_xml,xml/javavm.uno.xml,javavm/jen.xml))
+$(eval $(call gb_Package_add_file,stoc_xml,xml/javaloader.uno.xml,javaloader/javaloader.xml))
+$(eval $(call gb_Package_add_file,stoc_xml,xml/namingservice.uno.xml,namingservice/namingservice.xml))
+$(eval $(call gb_Package_add_file,stoc_xml,xml/proxyfac.uno.xml,proxy_factory/proxyfac.xml))
+$(eval $(call gb_Package_add_file,stoc_xml,xml/bootstrap.uno.xml,bootstrap/bootstrap.xml))
+$(eval $(call gb_Package_add_file,stoc_xml,xml/stocserv.uno.xml,stocservices/stocserv.xml))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/stoc/prj/build.lst b/stoc/prj/build.lst
index c7a1fe693919..a8e1a73033dc 100644
--- a/stoc/prj/build.lst
+++ b/stoc/prj/build.lst
@@ -1,25 +1,3 @@
 tc	stoc	:	DESKTOP:rdbmaker cppuhelper cppu jvmaccess sal salhelper jvmfwk xmlreader LIBXSTL:libxslt registry NULL
 tc	stoc									usr1	-	all	tc_mkout NULL
-tc	stoc\inc								nmake	-	all	tc_inc NULL
-tc	stoc\source\defaultregistry				nmake	-	all	tc_defr tc_boot tc_inc NULL
-tc	stoc\source\implementationregistration	nmake	-	all	tc_ireg tc_boot tc_defr tc_inc NULL
-tc	stoc\source\loader						nmake	-	all	tc_loa tc_boot tc_ireg tc_inc NULL
-tc	stoc\source\bootstrap					nmake	-	all	tc_boot tc_inc NULL
-tc	stoc\source\stocservices				nmake	-	all	tc_stserv tc_inc NULL
-tc	stoc\source\servicemanager				nmake	-	all	tc_smgr tc_boot tc_loa tc_inc NULL
-tc	stoc\source\security					nmake	-	all	tc_sec tc_boot tc_loa tc_inc NULL
-tc	stoc\source\simpleregistry				nmake	-	all	tc_sreg tc_boot tc_smgr tc_inc NULL
-tc	stoc\source\registry_tdprovider			nmake	-	all	tc_regtd tc_boot tc_sreg tc_inc NULL
-tc	stoc\source\tdmanager					nmake	-	all	tc_tdmng tc_boot tc_regtd tc_inc NULL
-tc	stoc\source\corereflection				nmake	-	all	tc_corerefl tc_tdmng tc_inc NULL
-tc	stoc\source\inspect						nmake	-	all	tc_inspect tc_corerefl tc_inc NULL
-tc	stoc\source\invocation					nmake	-	all	tc_invocation tc_inspect tc_inc NULL
-tc	stoc\source\invocation_adapterfactory	nmake	-	all	tc_iadapter tc_invocation tc_inc NULL
-tc	stoc\source\namingservice				nmake	-	all	tc_nservice tc_iadapter tc_inc NULL
-tc	stoc\source\proxy_factory				nmake	-	all	tc_proxyfact tc_inc NULL
-tc	stoc\source\typeconv					nmake	-	all	tc_tcv tc_stserv tc_nservice tc_inc NULL
-tc	stoc\source\javavm						nmake	-	all	tc_jvm tc_inc NULL
-tc	stoc\source\javaloader					nmake	-	all	tc_jvload tc_inc NULL
-tc  	stoc\source\uriproc                     		nmake   -   	all 	tc_uriproc tc_stserv tc_inc NULL
-tc  	stoc\util						nmake   -   	all 	tc_util tc_boot tc_stserv tc_tcv tc_uriproc tc_smgr tc_inc tc_sreg tc_defr tc_ireg tc_regtd tc_tdmng tc_sec NULL
-tc stoc\test\uriproc nmake - all tc_test_uriproc tc_util NULL
+tc	stoc\prj								nmake	-	all	tc_prj NULL
diff --git a/stoc/prj/d.lst b/stoc/prj/d.lst
index 7490b0229781..e69de29bb2d1 100644
--- a/stoc/prj/d.lst
+++ b/stoc/prj/d.lst
@@ -1,29 +0,0 @@
-mkdir: %_DEST%\inc\stoc
-
-..\%__SRC%\bin\*.dll %_DEST%\bin\*
-..\%__SRC%\lib\*.so %_DEST%\lib\*
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-..\%__SRC%\lib\*.uno.a %_DEST%\lib\*.uno.a
-..\%__SRC%\bin\*.rdb %_DEST%\rdb\*
-..\%__SRC%\misc\bootstrap.component %_DEST%\xml\bootstrap.component
-..\%__SRC%\misc\introspection.component %_DEST%\xml\introspection.component
-..\%__SRC%\misc\invocadapt.component %_DEST%\xml\invocadapt.component
-..\%__SRC%\misc\invocation.component %_DEST%\xml\invocation.component
-..\%__SRC%\misc\javaloader.component %_DEST%\xml\javaloader.component
-..\%__SRC%\misc\javavm.component %_DEST%\xml\javavm.component
-..\%__SRC%\misc\namingservice.component %_DEST%\xml\namingservice.component
-..\%__SRC%\misc\proxyfac.component %_DEST%\xml\proxyfac.component
-..\%__SRC%\misc\reflection.component %_DEST%\xml\reflection.component
-..\%__SRC%\misc\stocservices.component %_DEST%\xml\stocservices.component
-
-..\source\module-description.dtd %_DEST%\xml\module-description.dtd
-..\source\corereflection\corefl.xml %_DEST%\xml\reflection.uno.xml
-..\source\inspect\insp.xml %_DEST%\xml\introspection.uno.xml
-..\source\invocation\inv.xml %_DEST%\xml\invocation.uno.xml
-..\source\invocation_adapterfactory\invadp.xml %_DEST%\xml\invocadapt.uno.xml
-..\source\javavm\jen.xml %_DEST%\xml\javavm.uno.xml
-..\source\javaloader\javaloader.xml %_DEST%\xml\javaloader.uno.xml
-..\source\namingservice\namingservice.xml %_DEST%\xml\namingservice.uno.xml
-..\source\proxy_factory\proxyfac.xml %_DEST%\xml\proxyfac.uno.xml
-..\source\bootstrap\bootstrap.xml %_DEST%\xml\bootstrap.uno.xml
-..\source\typeconv\stocserv.xml %_DEST%\xml\stocserv.uno.xml
diff --git a/stoc/prj/makefile.mk b/stoc/prj/makefile.mk
new file mode 100755
index 000000000000..0997622e00f6
--- /dev/null
+++ b/stoc/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/stoc/source/bootstrap/makefile.mk b/stoc/source/bootstrap/makefile.mk
deleted file mode 100644
index 9eb1a11cbad9..000000000000
--- a/stoc/source/bootstrap/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME= stoc
-TARGET = bootstrap
-ENABLE_EXCEPTIONS=TRUE
-BOOTSTRAP_SERVICE=TRUE
-COMP1TYPELIST = bootstrap
-
-# --- openoffice.org.orig/Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  ..$/cppumaker.mk
-
-# --- openoffice.org.orig/Files ------------------------------------------------------
-
-SLOFILES= \
-                $(SLO)$/services.obj
-
-# --- openoffice.org.orig/Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/stoc/source/corereflection/makefile.mk b/stoc/source/corereflection/makefile.mk
deleted file mode 100644
index 1f4b4a5694c1..000000000000
--- a/stoc/source/corereflection/makefile.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=	stoc
-TARGET = $(ENFORCEDSHLPREFIX)reflection.uno
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST = corefl
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-DLLPRE =
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  ..$/cppumaker.mk
-
-SLOFILES=	\
-        $(SLO)$/crefl.obj	\
-        $(SLO)$/crbase.obj	\
-        $(SLO)$/crarray.obj	\
-        $(SLO)$/crcomp.obj	\
-        $(SLO)$/criface.obj	\
-        $(SLO)$/crenum.obj
-
-SHL1TARGET=	$(TARGET)
-SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
-SHL1STDLIBS= \
-        $(CPPULIB)		\
-        $(CPPUHELPERLIB)	\
-        $(SALLIB)
-
-SHL1DEPN=
-SHL1IMPLIB=	i$(TARGET)
-SHL1LIBS=	$(SLB)$/$(TARGET).lib
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-SHL1RPATH=  URELIB
-
-DEF1NAME=	$(SHL1TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/reflection.component
-
-$(MISC)/reflection.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        reflection.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt reflection.component
diff --git a/stoc/source/cppumaker.mk b/stoc/source/cppumaker.mk
deleted file mode 100644
index 899c43292834..000000000000
--- a/stoc/source/cppumaker.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-.IF "$(BOOTSTRAP_SERVICE)" != ""
-# fully functional C++-UNO (no bridging); no types.rdb needed at runtime
-CPPUMAKERFLAGS =
-.ENDIF
-
-.IF "$(debug)" != ""
-
-# MSVC++: no inlining
-.IF "$(COM)" == "MSC"
-CFLAGS += -Ob0
-.ENDIF
-
-.ENDIF
-
diff --git a/stoc/source/defaultregistry/makefile.mk b/stoc/source/defaultregistry/makefile.mk
deleted file mode 100644
index 17f25999d169..000000000000
--- a/stoc/source/defaultregistry/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME= stoc
-TARGET = nestedreg
-ENABLE_EXCEPTIONS=TRUE
-UNOUCROUT= $(OUT)$/inc$/bootstrap
-BOOTSTRAP_SERVICE=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-SLOFILES= \
-        $(SLO)$/defaultregistry.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/stoc/source/implementationregistration/makefile.mk b/stoc/source/implementationregistration/makefile.mk
deleted file mode 100644
index 2de7fe91cb21..000000000000
--- a/stoc/source/implementationregistration/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME= stoc
-TARGET = implreg
-ENABLE_EXCEPTIONS=TRUE
-BOOTSTRAP_SERVICE=TRUE
-UNOUCROUT= $(OUT)$/inc$/bootstrap
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-SLOFILES= \
-        $(SLO)$/mergekeys.obj	\
-        $(SLO)$/implreg.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/stoc/source/inspect/makefile.mk b/stoc/source/inspect/makefile.mk
deleted file mode 100644
index 37b8ec682276..000000000000
--- a/stoc/source/inspect/makefile.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=	stoc
-TARGET = $(ENFORCEDSHLPREFIX)introspection.uno
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST = insp
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-DLLPRE =
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  ..$/cppumaker.mk
-
-SLOFILES= \
-        $(SLO)$/introspection.obj
-
-SHL1TARGET=	$(TARGET)
-
-SHL1STDLIBS= \
-        $(CPPULIB)		\
-        $(CPPUHELPERLIB)	\
-        $(SALLIB)               \
-        $(SALHELPERLIB)
-
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
-SHL1RPATH=URELIB
-
-SHL1DEPN=
-SHL1IMPLIB=	i$(TARGET)
-SHL1LIBS=	$(SLB)$/$(TARGET).lib
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=	$(SHL1TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/introspection.component
-
-$(MISC)/introspection.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt introspection.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt introspection.component
diff --git a/stoc/source/invocation/makefile.mk b/stoc/source/invocation/makefile.mk
deleted file mode 100644
index 214873d2c7c3..000000000000
--- a/stoc/source/invocation/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=	stoc
-TARGET = $(ENFORCEDSHLPREFIX)invocation.uno
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST = inv
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-DLLPRE =
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  ..$/cppumaker.mk
-
-SLOFILES= \
-        $(SLO)$/invocation.obj
-
-SHL1TARGET=	$(TARGET)
-
-SHL1STDLIBS= \
-        $(CPPULIB)		\
-        $(CPPUHELPERLIB)	\
-        $(SALLIB)
-
-SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
-SHL1DEPN=
-SHL1IMPLIB=	i$(TARGET)
-SHL1LIBS=	$(SLB)$/$(TARGET).lib
-SHL1RPATH=URELIB
-
-DEF1NAME=	$(SHL1TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/invocation.component
-
-$(MISC)/invocation.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        invocation.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt invocation.component
diff --git a/stoc/source/invocation_adapterfactory/makefile.mk b/stoc/source/invocation_adapterfactory/makefile.mk
deleted file mode 100644
index 49bbc1a76ac2..000000000000
--- a/stoc/source/invocation_adapterfactory/makefile.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=stoc
-TARGET = $(ENFORCEDSHLPREFIX)invocadapt.uno
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST = invadp
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-DLLPRE =
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  ..$/cppumaker.mk
-
-SLOFILES=	\
-        $(SLO)$/iafactory.obj
-
-SHL1TARGET=	$(TARGET)
-
-SHL1STDLIBS=	\
-        $(CPPULIB)		\
-        $(CPPUHELPERLIB)	\
-        $(SALLIB)
-
-SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
-SHL1RPATH=URELIB
-
-SHL1DEPN=
-SHL1IMPLIB=	i$(TARGET)
-SHL1LIBS=	$(SLB)$/$(TARGET).lib
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=	$(SHL1TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/invocadapt.component
-
-$(MISC)/invocadapt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        invocadapt.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt invocadapt.component
diff --git a/stoc/source/javaloader/makefile.mk b/stoc/source/javaloader/makefile.mk
deleted file mode 100644
index 66baaa286b82..000000000000
--- a/stoc/source/javaloader/makefile.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=stoc
-TARGET = $(ENFORCEDSHLPREFIX)javaloader.uno
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST = javaloader
-
-.IF "$(SOLAR_JAVA)" == "TRUE"
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-DLLPRE =
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  ..$/cppumaker.mk
-
-SLOFILES= 	$(SLO)$/javaloader.obj
-
-SHL1TARGET= $(TARGET)
-
-SHL1STDLIBS=\
-        $(CPPUHELPERLIB) 	\
-        $(CPPULIB)			\
-        $(SALLIB) \
-        $(SALHELPERLIB) \
-        $(JVMACCESSLIB)
-
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
-SHL1DEPN=		
-SHL1IMPLIB=		i$(TARGET)
-SHL1LIBS= 		$(SLB)$/$(TARGET).lib 
-SHL1DEF= 		$(MISC)$/$(SHL1TARGET).def
-SHL1RPATH=      URELIB
-
-DEF1NAME=		$(SHL1TARGET)
-
-.ELSE	# SOLAR_JAVA
-all:
-    @echo Nothing to do: SOLAR_JAVA not set
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/javaloader.component
-
-$(MISC)/javaloader.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        javaloader.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt javaloader.component
diff --git a/stoc/source/javavm/makefile.mk b/stoc/source/javavm/makefile.mk
deleted file mode 100644
index 6c38f601cf58..000000000000
--- a/stoc/source/javavm/makefile.mk
+++ /dev/null
@@ -1,94 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=stoc
-TARGET = $(ENFORCEDSHLPREFIX)javavm.uno
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST = jen
-
-.IF "$(SOLAR_JAVA)" == "TRUE"
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-DLLPRE =
-
-# --- Files --------------------------------------------------------
-
-# Kollision zwischen bool.h aus Java und bool.h aus der STL.
-# Das Problem tritt fuer alle Plattformen auf, aber anscheinend stolpert nur der
-# GCC darueber
-.IF "$(COM)" == "GCC"
-CDEFS += -D__SGI_STL_BOOL_H
-.ENDIF
-
-.INCLUDE :  ..$/cppumaker.mk
-
-SLOFILES= \
-        $(SLO)$/javavm.obj		\
-        $(SLO)$/jvmargs.obj	\
-        $(SLO)$/interact.obj 
-
-SHL1TARGET= $(TARGET)
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
-SHL1STDLIBS= \
-        $(CPPUHELPERLIB) 	\
-        $(CPPULIB)	    	\
-        $(SALLIB) \
-        $(JVMACCESSLIB) \
-        $(SALHELPERLIB) \
-    $(JVMFWKLIB)
-
-.IF "$(GUI)"=="WNT"
-SHL1STDLIBS += $(ADVAPI32LIB)
-.ENDIF
-
-SHL1DEPN=		
-SHL1IMPLIB=		i$(TARGET)
-SHL1LIBS=		$(SLB)$/$(TARGET).lib
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-SHL1RPATH=      URELIB
-
-DEF1NAME=		$(SHL1TARGET)
-
-.ELSE		# SOLAR_JAVA
-all:
-    @echo Nothing to do: SOLAR_JAVA not set
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/javavm.component
-
-$(MISC)/javavm.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        javavm.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt javavm.component
diff --git a/stoc/source/loader/makefile.mk b/stoc/source/loader/makefile.mk
deleted file mode 100644
index 24a39597a8cd..000000000000
--- a/stoc/source/loader/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME= stoc
-TARGET = shlibloader
-ENABLE_EXCEPTIONS=TRUE
-BOOTSTRAP_SERVICE=TRUE
-UNOUCROUT= $(OUT)$/inc$/bootstrap
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-SLOFILES= \
-        $(SLO)$/dllcomponentloader.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/stoc/source/namingservice/makefile.mk b/stoc/source/namingservice/makefile.mk
deleted file mode 100644
index 149874cb3c82..000000000000
--- a/stoc/source/namingservice/makefile.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=	stoc
-TARGET = $(ENFORCEDSHLPREFIX)namingservice.uno
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST = namingservice
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-DLLPRE =
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  ..$/cppumaker.mk
-
-SLOFILES= \
-        $(SLO)$/namingservice.obj
-
-SHL1TARGET=	$(TARGET)
-
-SHL1STDLIBS= \
-        $(CPPULIB)		\
-        $(CPPUHELPERLIB)	\
-        $(SALLIB)
-
-SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
-
-SHL1DEPN=
-SHL1IMPLIB=	i$(TARGET)
-SHL1LIBS=	$(SLB)$/$(TARGET).lib
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-SHL1RPATH=  URELIB
-
-DEF1NAME=	$(SHL1TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/namingservice.component
-
-$(MISC)/namingservice.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt namingservice.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt namingservice.component
diff --git a/stoc/source/proxy_factory/makefile.mk b/stoc/source/proxy_factory/makefile.mk
deleted file mode 100644
index 0a8a92397e18..000000000000
--- a/stoc/source/proxy_factory/makefile.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=stoc
-TARGET = $(ENFORCEDSHLPREFIX)proxyfac.uno
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST = proxyfac
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-DLLPRE =
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  ..$/cppumaker.mk
-
-SLOFILES= \
-        $(SLO)$/proxyfac.obj
-
-SHL1TARGET=$(TARGET)
-SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
-
-SHL1STDLIBS= \
-    $(CPPULIB)		\
-    $(CPPUHELPERLIB)	\
-    $(SALLIB)
-
-SHL1DEPN=
-SHL1IMPLIB=i$(TARGET)
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1RPATH=URELIB
-
-DEF1NAME=$(SHL1TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/proxyfac.component
-
-$(MISC)/proxyfac.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        proxyfac.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt proxyfac.component
diff --git a/stoc/source/registry_tdprovider/makefile.mk b/stoc/source/registry_tdprovider/makefile.mk
deleted file mode 100644
index 6b59701541bb..000000000000
--- a/stoc/source/registry_tdprovider/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME= stoc
-TARGET = regtypeprov
-ENABLE_EXCEPTIONS=TRUE
-BOOTSTRAP_SERVICE=TRUE
-UNOUCROUT= $(OUT)$/inc$/bootstrap
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-SLOFILES=	\
-        $(SLO)$/tdprovider.obj	\
-        $(SLO)$/td.obj		\
-        $(SLO)$/tdef.obj	\
-        $(SLO)$/tdenum.obj	\
-        $(SLO)$/tdcomp.obj	\
-        $(SLO)$/tdconsts.obj	\
-        $(SLO)$/tdiface.obj \
-        $(SLO)$/tdmodule.obj \
-        $(SLO)$/tdprop.obj \
-        $(SLO)$/tdservice.obj \
-        $(SLO)$/tdsingleton.obj \
-        $(SLO)$/rdbtdp_tdenumeration.obj \
-        $(SLO)$/functiondescription.obj \
-        $(SLO)$/methoddescription.obj \
-        $(SLO)$/structtypedescription.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/stoc/source/security/makefile.mk b/stoc/source/security/makefile.mk
deleted file mode 100644
index 25cddaa22539..000000000000
--- a/stoc/source/security/makefile.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=stoc
-TARGET = security
-ENABLE_EXCEPTIONS=TRUE
-BOOTSTRAP_SERVICE=TRUE
-UNOUCROUT=$(OUT)$/inc$/bootstrap
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-SLOFILES= \
-        $(SLO)$/permissions.obj			\
-        $(SLO)$/access_controller.obj		\
-        $(SLO)$/file_policy.obj
-
-.IF "$(debug)" != ""
-
-# some diagnose
-.IF "$(diag)" == "full"
-CFLAGS += -D__DIAGNOSE -D__CACHE_DIAGNOSE
-.ELIF "$(diag)" == "cache"
-CFLAGS += -D__CACHE_DIAGNOSE
-.ELIF "$(diag)" != ""
-CFLAGS += -D__DIAGNOSE
-.ENDIF
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/stoc/source/servicemanager/makefile.mk b/stoc/source/servicemanager/makefile.mk
deleted file mode 100644
index f86c65d5f052..000000000000
--- a/stoc/source/servicemanager/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME= stoc
-TARGET = servicemgr
-ENABLE_EXCEPTIONS=TRUE
-BOOTSTRAP_SERVICE=TRUE
-UNOUCROUT=$(OUT)$/inc$/bootstrap
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-SLOFILES= \
-        $(SLO)$/servicemanager.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/stoc/source/simpleregistry/makefile.mk b/stoc/source/simpleregistry/makefile.mk
deleted file mode 100644
index bc0ddf7cc71a..000000000000
--- a/stoc/source/simpleregistry/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME= stoc
-TARGET = simplereg
-ENABLE_EXCEPTIONS=TRUE
-BOOTSTRAP_SERVICE=TRUE
-UNOUCROUT=$(OUT)$/inc$/bootstrap
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-SLOFILES= \
-    $(SLO)/simpleregistry.obj \
-    $(SLO)/textualservices.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/stoc/source/stocservices/makefile.mk b/stoc/source/stocservices/makefile.mk
deleted file mode 100644
index 2d2444f8a996..000000000000
--- a/stoc/source/stocservices/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME= stoc
-TARGET = stocservices
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST = stocserv
-
-# --- openoffice.org.orig/Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  ..$/cppumaker.mk
-
-# --- openoffice.org.orig/Files ------------------------------------------------------
-
-SLOFILES= \
-                $(SLO)$/stocservices.obj
-
-# --- openoffice.org.orig/Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/stoc/source/stocservices/stocserv.xml b/stoc/source/stocservices/stocserv.xml
index 73de7da1bd54..3e55c4163d29 100644
--- a/stoc/source/stocservices/stocserv.xml
+++ b/stoc/source/stocservices/stocserv.xml
@@ -45,6 +45,12 @@ from one type to another if possible.
         <supported-service>
             com.sun.star.uri.ExternalUriReferenceTranslator
         </supported-service>
+        <type>com.sun.star.lang.WrappedTargetRuntimeException</type>
+        <type>com.sun.star.uri.RelativeUriExcessParentSegments</type>
+        <type>com.sun.star.uri.XExternalUriReferenceTranslator</type>
+        <type>com.sun.star.uri.XUriReference</type>
+        <type>com.sun.star.uri.XUriReferenceFactory</type>
+        <type>com.sun.star.uri.XUriSchemeParser</type>
     </component-description>
     <component-description>
         <author>Stephan Bergmann</author>
@@ -74,6 +80,24 @@ from one type to another if possible.
         <supported-service>
             com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript
         </supported-service>
+        <type>com.sun.star.uri.XVndSunStarScriptUrlReference</type>
+    </component-description>
+    <component-description>
+        <author>Stephan Bergmann</author>
+        <name>
+            com.sun.star.comp.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand
+        </name>
+        <description>
+            Instances of this service parse textual representations of absolute
+            &#x201C;vnd.sun.star.expand&#x201D; URLs.
+        </description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>C++</language>
+        <status value="under_construction"/>
+        <supported-service>
+            com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTexpand
+        </supported-service>
+        <type>com.sun.star.uri.XVndSunStarExpandUrlReference</type>
     </component-description>
     <component-description>
         <author>Stephan Bergmann</author>
@@ -88,6 +112,9 @@ from one type to another if possible.
         <supported-service>
             com.sun.star.uri.VndSunStarPkgUrlReferenceFactory
         </supported-service>
+        <type>com.sun.star.uno.DeploymentException</type>
+        <type>com.sun.star.uri.UriReferenceFactory</type>
+        <type>com.sun.star.uri.XVndSunStarPkgUrlReferenceFactory</type>
     </component-description>
     <project-build-dependency>  cppuhelper  </project-build-dependency>
     <project-build-dependency>  cppu        </project-build-dependency>
diff --git a/stoc/source/tdmanager/makefile.mk b/stoc/source/tdmanager/makefile.mk
deleted file mode 100644
index dbc4e762afff..000000000000
--- a/stoc/source/tdmanager/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME= stoc
-TARGET = typemgr
-ENABLE_EXCEPTIONS=TRUE
-BOOTSTRAP_SERVICE=TRUE
-UNOUCROUT= $(OUT)$/inc$/bootstrap
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-SLOFILES= \
-        $(SLO)$/tdmgr.obj \
-        $(SLO)$/tdmgr_check.obj \
-        $(SLO)$/tdmgr_tdenumeration.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/stoc/source/typeconv/makefile.mk b/stoc/source/typeconv/makefile.mk
deleted file mode 100644
index e84f51889b98..000000000000
--- a/stoc/source/typeconv/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=stoc
-TARGET = typeconverter
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-DLLPRE =
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  ..$/cppumaker.mk
-
-SLOFILES= \
-        $(SLO)$/convert.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/stoc/source/uriproc/makefile.mk b/stoc/source/uriproc/makefile.mk
deleted file mode 100644
index 194da2219b6b..000000000000
--- a/stoc/source/uriproc/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=stoc
-TARGET=uriproc
-ENABLE_EXCEPTIONS := TRUE
-
-# --- openoffice.org.orig/Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-DLLPRE = 
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  ..$/cppumaker.mk
-
-SLOFILES = \
-    $(SLO)$/ExternalUriReferenceTranslator.obj \
-    $(SLO)$/UriReference.obj \
-    $(SLO)$/UriReferenceFactory.obj \
-    $(SLO)$/UriSchemeParser_vndDOTsunDOTstarDOTexpand.obj \
-    $(SLO)$/UriSchemeParser_vndDOTsunDOTstarDOTscript.obj \
-    $(SLO)$/VndSunStarPkgUrlReferenceFactory.obj \
-    $(SLO)$/supportsService.obj
-
-# ------------------------------------------------------------------
-
-.INCLUDE: target.mk
diff --git a/stoc/util/makefile.mk b/stoc/util/makefile.mk
deleted file mode 100644
index 8f58e0998bb2..000000000000
--- a/stoc/util/makefile.mk
+++ /dev/null
@@ -1,110 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME= bootstrap
-TARGET = bootstrap.uno
-ENABLE_EXCEPTIONS=TRUE
-
-# --- openoffice.org.orig/Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-DLLPRE =
-
-# ------------------------------------------------------------------
-
-SHL1TARGET=	$(ENFORCEDSHLPREFIX)$(TARGET)
-
-LIB1TARGET=	$(SLB)$/$(TARGET).lib
-LIB1FILES=	$(SLB)$/bootstrap.lib \
-        $(SLB)$/security.lib \
-        $(SLB)$/servicemgr.lib \
-        $(SLB)$/simplereg.lib \
-        $(SLB)$/nestedreg.lib \
-        $(SLB)$/implreg.lib \
-        $(SLB)$/shlibloader.lib \
-        $(SLB)$/regtypeprov.lib \
-        $(SLB)$/typemgr.lib
-
-SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
-
-SHL1STDLIBS= \
-        $(CPPULIB)		\
-                $(SALHELPERLIB)         \
-        $(CPPUHELPERLIB)	\
-                $(SALLIB)		\
-        $(REGLIB) \
-        $(XMLREADERLIB)
-
-SHL1DEPN=
-SHL1IMPLIB=	i$(TARGET)
-SHL1LIBS=	$(SLB)$/$(TARGET).lib
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-SHL1RPATH=  URELIB
-
-DEF1NAME=	$(SHL1TARGET)
-
-SHL2TARGET=	$(ENFORCEDSHLPREFIX)stocservices.uno
-
-LIB2TARGET=	$(SLB)$/stocservices.uno.lib
-LIB2FILES=	\
-        $(SLB)$/stocservices.lib \
-        $(SLB)$/typeconverter.lib \
-        $(SLB)$/uriproc.lib 
-
-SHL2VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
-
-SHL2STDLIBS= \
-        $(CPPULIB)		\
-        $(CPPUHELPERLIB)	\
-                $(SALLIB)		
-
-SHL2DEPN=
-SHL2IMPLIB=	istocservices.uno
-SHL2LIBS=	$(SLB)$/stocservices.uno.lib
-SHL2DEF=	$(MISC)$/$(SHL2TARGET).def
-SHL2RPATH=  URELIB
-
-DEF2NAME=	$(SHL2TARGET)
-
-# --- openoffice.org.orig/Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/bootstrap.component $(MISC)/stocservices.component
-
-$(MISC)/bootstrap.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        bootstrap.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt bootstrap.component
-
-$(MISC)/stocservices.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt stocservices.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_URE_NATIVE)$(SHL2TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt stocservices.component
author	David Tardon <dtardon@redhat.com>	2012-04-06 14:24:47 +0200
committer	David Tardon <dtardon@redhat.com>	2012-04-06 14:31:05 +0200
commit	7545dbbf64e959cfb166556935946f442199e92b (patch)
tree	8ffd1c318cd4c3ff1efc54b0683660033c6d0002 /stoc
parent	7d82fb18fe6ae68f6eb6a33c6030105f9e2fe232 (diff)
parent	7e94a37403aa4470bd7dad7c549ba8bc7485620a (diff)