gbuild conversion: registry module

Change-Id: I I9dbd2a05602e7d415ca76850458129f68583c83f

24 files changed, 479 insertions, 348 deletions

diff --git a/registry/Executable_checksingleton.mk b/registry/Executable_checksingleton.mk
new file mode 100644
index 000000000000..dc191c832de2
--- /dev/null
+++ b/registry/Executable_checksingleton.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 David Ostrovsky <d.ostrovsky@gmx.de> (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_Executable_Executable,checksingleton))
+
+$(eval $(call gb_Executable_use_libraries,checksingleton,\
+    sal \
+    salhelper \
+    reg \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,checksingleton,\
+    registry_helper \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,checksingleton,\
+    registry/tools/checksingleton \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/registry/Executable_rdbedit.mk b/registry/Executable_rdbedit.mk
new file mode 100644
index 000000000000..a9b31ff1e8c6
--- /dev/null
+++ b/registry/Executable_rdbedit.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 David Ostrovsky <d.ostrovsky@gmx.de> (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_Executable_Executable,rdbedit))
+
+$(eval $(call gb_Executable_use_libraries,rdbedit,\
+    sal \
+    salhelper \
+    reg \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,rdbedit,\
+    registry_helper \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,rdbedit,\
+    registry/tools/rdbedit \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/registry/Executable_regcompare.mk b/registry/Executable_regcompare.mk
new file mode 100644
index 000000000000..bb3b6dc85ac3
--- /dev/null
+++ b/registry/Executable_regcompare.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 David Ostrovsky <d.ostrovsky@gmx.de> (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_Executable_Executable,regcompare))
+
+$(eval $(call gb_Executable_use_libraries,regcompare,\
+    sal \
+    salhelper \
+    reg \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,regcompare,\
+    registry_helper \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,regcompare,\
+    registry/tools/regcompare \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/registry/Executable_regmerge.mk b/registry/Executable_regmerge.mk
new file mode 100644
index 000000000000..7aafd7debed3
--- /dev/null
+++ b/registry/Executable_regmerge.mk
@@ -0,0 +1,42 @@
+# -*- 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 David Ostrovsky <d.ostrovsky@gmx.de> (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_Executable_Executable,regmerge))
+
+$(eval $(call gb_Executable_use_libraries,regmerge,\
+    sal \
+    reg \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,regmerge,\
+    registry_helper \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,regmerge,\
+    registry/tools/regmerge \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/registry/Executable_regview.mk b/registry/Executable_regview.mk
new file mode 100644
index 000000000000..581c381b74e9
--- /dev/null
+++ b/registry/Executable_regview.mk
@@ -0,0 +1,42 @@
+# -*- 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 David Ostrovsky <d.ostrovsky@gmx.de> (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_Executable_Executable,regview))
+
+$(eval $(call gb_Executable_use_libraries,regview,\
+    sal \
+    reg \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,regview,\
+    registry_helper \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,regview,\
+    registry/tools/regview \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk
new file mode 100644
index 000000000000..0ee4ccda2408
--- /dev/null
+++ b/registry/Library_reg.mk
@@ -0,0 +1,54 @@
+# -*- 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 David Ostrovsky <d.ostrovsky@gmx.de> (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,reg))
+
+$(eval $(call gb_Library_set_soversion_script,reg,3,$(SRCDIR)/registry/util/reg.map))
+
+$(eval $(call gb_Library_use_packages,reg,\
+	registry_inc \
+))
+
+$(eval $(call gb_Library_add_defs,reg,\
+	$(LFS_CFLAGS) \
+	-DREG_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_use_libraries,reg,\
+	sal \
+	store \
+))
+
+$(eval $(call gb_Library_add_exception_objects,reg,\
+	registry/source/keyimpl \
+	registry/source/reflread \
+	registry/source/reflwrit \
+	registry/source/regimpl \
+	registry/source/registry \
+	registry/source/regkey \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/registry/Makefile b/registry/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/registry/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk
new file mode 100644
index 000000000000..066e2fdd1ac9
--- /dev/null
+++ b/registry/Module_registry.mk
@@ -0,0 +1,47 @@
+# -*- 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 David Ostrovsky <d.ostrovsky@gmx.de> (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,registry))
+
+$(eval $(call gb_Module_add_targets,registry,\
+    Library_reg \
+    Package_inc \
+))
+
+ifneq ($(OS),IOS)
+
+$(eval $(call gb_Module_add_targets,registry,\
+    StaticLibrary_registry_helper \
+    Executable_regmerge \
+    Executable_regview \
+    Executable_regcompare \
+    Executable_checksingleton \
+    Executable_rdbedit \
+))
+
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/registry/Package_inc.mk b/registry/Package_inc.mk
new file mode 100644
index 000000000000..6d67701bf73e
--- /dev/null
+++ b/registry/Package_inc.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 David Ostrovsky <d.ostrovsky@gmx.de> (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,registry_inc,$(SRCDIR)/registry/inc/registry))
+
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/reader.h,reader.h))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/reader.hxx,reader.hxx))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/reflread.hxx,reflread.hxx))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/refltype.hxx,refltype.hxx))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/reflwrit.hxx,reflwrit.hxx))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/regdllapi.h,regdllapi.h))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/registry.h,registry.h))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/registry.hxx,registry.hxx))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/regtype.h,regtype.h))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/types.h,types.h))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/version.h,version.h))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/writer.h,writer.h))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/writer.hxx,writer.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/registry/StaticLibrary_registry_helper.mk b/registry/StaticLibrary_registry_helper.mk
new file mode 100644
index 000000000000..a7d4671b6e05
--- /dev/null
+++ b/registry/StaticLibrary_registry_helper.mk
@@ -0,0 +1,35 @@
+# -*- Mode: makefile; 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 David Ostrovsky <d.ostrovsky@gmx.de> (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_StaticLibrary_StaticLibrary,registry_helper))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,registry_helper,\
+    registry/tools/fileurl \
+    registry/tools/options \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/registry/inc/makefile.mk b/registry/inc/makefile.mk
deleted file mode 100644
index 203cb8582424..000000000000
--- a/registry/inc/makefile.mk
+++ /dev/null
@@ -1,39 +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=registry
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/registry/inc/registry/reader.h b/registry/inc/registry/reader.h
index cdbd0bacd487..66aaca241ca6 100644
--- a/registry/inc/registry/reader.h
+++ b/registry/inc/registry/reader.h
@@ -29,6 +29,7 @@
 #ifndef INCLUDED_registry_reader_h
 #define INCLUDED_registry_reader_h
 
+#include "registry/regdllapi.h"
 #include "registry/types.h"
 #include "registry/version.h"
 
@@ -68,7 +69,7 @@ extern "C" {
 
    @since UDK 3.2.0
  */
-sal_Bool SAL_CALL typereg_reader_create(
+REG_DLLPUBLIC sal_Bool SAL_CALL typereg_reader_create(
     void const * buffer, sal_uInt32 length, sal_Bool copy,
     enum typereg_Version maxVersion, void ** result)
     SAL_THROW_EXTERN_C();
@@ -80,7 +81,7 @@ sal_Bool SAL_CALL typereg_reader_create(
 
    @since UDK 3.2.0
  */
-void SAL_CALL typereg_reader_acquire(void * handle) SAL_THROW_EXTERN_C();
+REG_DLLPUBLIC void SAL_CALL typereg_reader_acquire(void * handle) SAL_THROW_EXTERN_C();
 
 /**
    Decrements the reference count of a type reader.
@@ -91,7 +92,7 @@ void SAL_CALL typereg_reader_acquire(void * handle) SAL_THROW_EXTERN_C();
 
    @since UDK 3.2.0
  */
-void SAL_CALL typereg_reader_release(void * handle) SAL_THROW_EXTERN_C();
+REG_DLLPUBLIC void SAL_CALL typereg_reader_release(void * handle) SAL_THROW_EXTERN_C();
 
 /**
    Returns the binary blob version of a type reader.
@@ -104,7 +105,7 @@ void SAL_CALL typereg_reader_release(void * handle) SAL_THROW_EXTERN_C();
 
    @since UDK 3.2.0
  */
-enum typereg_Version SAL_CALL typereg_reader_getVersion(void * handle)
+REG_DLLPUBLIC enum typereg_Version SAL_CALL typereg_reader_getVersion(void * handle)
     SAL_THROW_EXTERN_C();
 
 /**
@@ -118,7 +119,7 @@ enum typereg_Version SAL_CALL typereg_reader_getVersion(void * handle)
 
    @since UDK 3.2.0
  */
-void SAL_CALL typereg_reader_getDocumentation(
+REG_DLLPUBLIC void SAL_CALL typereg_reader_getDocumentation(
     void * handle, rtl_uString ** result) SAL_THROW_EXTERN_C();
 
 /**
@@ -133,7 +134,7 @@ void SAL_CALL typereg_reader_getDocumentation(
    @since UDK 3.2.0
    @deprecated
  */
-void SAL_CALL typereg_reader_getFileName(void * handle, rtl_uString ** result)
+REG_DLLPUBLIC void SAL_CALL typereg_reader_getFileName(void * handle, rtl_uString ** result)
     SAL_THROW_EXTERN_C();
 
 /**
@@ -151,7 +152,7 @@ void SAL_CALL typereg_reader_getFileName(void * handle, rtl_uString ** result)
 
    @since UDK 3.2.0
  */
-enum RTTypeClass SAL_CALL typereg_reader_getTypeClass(void * handle)
+REG_DLLPUBLIC enum RTTypeClass SAL_CALL typereg_reader_getTypeClass(void * handle)
     SAL_THROW_EXTERN_C();
 
 /**
@@ -164,7 +165,7 @@ enum RTTypeClass SAL_CALL typereg_reader_getTypeClass(void * handle)
 
    @since UDK 3.2.0
  */
-sal_Bool SAL_CALL typereg_reader_isPublished(void * handle)
+REG_DLLPUBLIC sal_Bool SAL_CALL typereg_reader_isPublished(void * handle)
     SAL_THROW_EXTERN_C();
 
 /**
@@ -178,7 +179,7 @@ sal_Bool SAL_CALL typereg_reader_isPublished(void * handle)
 
    @since UDK 3.2.0
  */
-void SAL_CALL typereg_reader_getTypeName(void * handle, rtl_uString ** result)
+REG_DLLPUBLIC void SAL_CALL typereg_reader_getTypeName(void * handle, rtl_uString ** result)
     SAL_THROW_EXTERN_C();
 
 /**
@@ -191,7 +192,7 @@ void SAL_CALL typereg_reader_getTypeName(void * handle, rtl_uString ** result)
 
    @since UDK 3.2.0
  */
-sal_uInt16 SAL_CALL typereg_reader_getSuperTypeCount(void * handle)
+REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getSuperTypeCount(void * handle)
     SAL_THROW_EXTERN_C();
 
 /**
@@ -208,7 +209,7 @@ sal_uInt16 SAL_CALL typereg_reader_getSuperTypeCount(void * handle)
 
    @since UDK 3.2.0
  */
-void SAL_CALL typereg_reader_getSuperTypeName(
+REG_DLLPUBLIC void SAL_CALL typereg_reader_getSuperTypeName(
     void * handle, rtl_uString ** result, sal_uInt16 index)
     SAL_THROW_EXTERN_C();
 
@@ -222,7 +223,7 @@ void SAL_CALL typereg_reader_getSuperTypeName(
 
    @since UDK 3.2.0
  */
-sal_uInt16 SAL_CALL typereg_reader_getFieldCount(void * handle)
+REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getFieldCount(void * handle)
     SAL_THROW_EXTERN_C();
 
 /**
@@ -238,7 +239,7 @@ sal_uInt16 SAL_CALL typereg_reader_getFieldCount(void * handle)
 
    @since UDK 3.2.0
  */
-void SAL_CALL typereg_reader_getFieldDocumentation(
+REG_DLLPUBLIC void SAL_CALL typereg_reader_getFieldDocumentation(
     void * handle, rtl_uString ** result, sal_uInt16 index)
     SAL_THROW_EXTERN_C();
 
@@ -256,7 +257,7 @@ void SAL_CALL typereg_reader_getFieldDocumentation(
    @since UDK 3.2.0
    @deprecated
  */
-void SAL_CALL typereg_reader_getFieldFileName(
+REG_DLLPUBLIC void SAL_CALL typereg_reader_getFieldFileName(
     void * handle, rtl_uString ** result, sal_uInt16 index)
     SAL_THROW_EXTERN_C();
 
@@ -271,7 +272,7 @@ void SAL_CALL typereg_reader_getFieldFileName(
 
    @since UDK 3.2.0
  */
-RTFieldAccess SAL_CALL typereg_reader_getFieldFlags(
+REG_DLLPUBLIC RTFieldAccess SAL_CALL typereg_reader_getFieldFlags(
     void * handle, sal_uInt16 index) SAL_THROW_EXTERN_C();
 
 /**
@@ -287,7 +288,7 @@ RTFieldAccess SAL_CALL typereg_reader_getFieldFlags(
 
    @since UDK 3.2.0
  */
-void SAL_CALL typereg_reader_getFieldName(
+REG_DLLPUBLIC void SAL_CALL typereg_reader_getFieldName(
     void * handle, rtl_uString ** result, sal_uInt16 index)
     SAL_THROW_EXTERN_C();
 
@@ -304,7 +305,7 @@ void SAL_CALL typereg_reader_getFieldName(
 
    @since UDK 3.2.0
  */
-void SAL_CALL typereg_reader_getFieldTypeName(
+REG_DLLPUBLIC void SAL_CALL typereg_reader_getFieldTypeName(
     void * handle, rtl_uString ** result, sal_uInt16 index)
     SAL_THROW_EXTERN_C();
 
@@ -326,7 +327,7 @@ void SAL_CALL typereg_reader_getFieldTypeName(
 
    @since UDK 3.2.0
  */
-sal_Bool SAL_CALL typereg_reader_getFieldValue(
+REG_DLLPUBLIC sal_Bool SAL_CALL typereg_reader_getFieldValue(
     void * handle, sal_uInt16 index, enum RTValueType * type,
     union RTConstValueUnion * value)
     SAL_THROW_EXTERN_C();
@@ -341,7 +342,7 @@ sal_Bool SAL_CALL typereg_reader_getFieldValue(
 
    @since UDK 3.2.0
  */
-sal_uInt16 SAL_CALL typereg_reader_getMethodCount(void * handle)
+REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getMethodCount(void * handle)
     SAL_THROW_EXTERN_C();
 
 /**
@@ -357,7 +358,7 @@ sal_uInt16 SAL_CALL typereg_reader_getMethodCount(void * handle)
 
    @since UDK 3.2.0
  */
-void SAL_CALL typereg_reader_getMethodDocumentation(
+REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodDocumentation(
     void * handle, rtl_uString ** result, sal_uInt16 index)
     SAL_THROW_EXTERN_C();
 
@@ -372,7 +373,7 @@ void SAL_CALL typereg_reader_getMethodDocumentation(
 
    @since UDK 3.2.0
  */
-enum RTMethodMode SAL_CALL typereg_reader_getMethodFlags(
+REG_DLLPUBLIC enum RTMethodMode SAL_CALL typereg_reader_getMethodFlags(
     void * handle, sal_uInt16 index) SAL_THROW_EXTERN_C();
 
 /**
@@ -388,7 +389,7 @@ enum RTMethodMode SAL_CALL typereg_reader_getMethodFlags(
 
    @since UDK 3.2.0
  */
-void SAL_CALL typereg_reader_getMethodName(
+REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodName(
     void * handle, rtl_uString ** result, sal_uInt16 index)
     SAL_THROW_EXTERN_C();
 
@@ -405,7 +406,7 @@ void SAL_CALL typereg_reader_getMethodName(
 
    @since UDK 3.2.0
  */
-void SAL_CALL typereg_reader_getMethodReturnTypeName(
+REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodReturnTypeName(
     void * handle, rtl_uString ** result, sal_uInt16 index)
     SAL_THROW_EXTERN_C();
 
@@ -420,7 +421,7 @@ void SAL_CALL typereg_reader_getMethodReturnTypeName(
 
    @since UDK 3.2.0
  */
-sal_uInt16 SAL_CALL typereg_reader_getMethodParameterCount(
+REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getMethodParameterCount(
     void * handle, sal_uInt16 index) SAL_THROW_EXTERN_C();
 
 /**
@@ -439,7 +440,7 @@ sal_uInt16 SAL_CALL typereg_reader_getMethodParameterCount(
 
    @since UDK 3.2.0
  */
-enum RTParamMode SAL_CALL typereg_reader_getMethodParameterFlags(
+REG_DLLPUBLIC enum RTParamMode SAL_CALL typereg_reader_getMethodParameterFlags(
     void * handle, sal_uInt16 methodIndex, sal_uInt16 parameterIndex)
     SAL_THROW_EXTERN_C();
 
@@ -460,7 +461,7 @@ enum RTParamMode SAL_CALL typereg_reader_getMethodParameterFlags(
 
    @since UDK 3.2.0
  */
-void SAL_CALL typereg_reader_getMethodParameterName(
+REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodParameterName(
     void * handle, rtl_uString ** result, sal_uInt16 methodIndex,
     sal_uInt16 parameterIndex)
     SAL_THROW_EXTERN_C();
@@ -482,7 +483,7 @@ void SAL_CALL typereg_reader_getMethodParameterName(
 
    @since UDK 3.2.0
  */
-void SAL_CALL typereg_reader_getMethodParameterTypeName(
+REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodParameterTypeName(
     void * handle, rtl_uString ** result, sal_uInt16 methodIndex,
     sal_uInt16 parameterIndex)
     SAL_THROW_EXTERN_C();
@@ -498,7 +499,7 @@ void SAL_CALL typereg_reader_getMethodParameterTypeName(
 
    @since UDK 3.2.0
  */
-sal_uInt16 SAL_CALL typereg_reader_getMethodExceptionCount(
+REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getMethodExceptionCount(
     void * handle, sal_uInt16 index) SAL_THROW_EXTERN_C();
 
 /**
@@ -518,7 +519,7 @@ sal_uInt16 SAL_CALL typereg_reader_getMethodExceptionCount(
 
    @since UDK 3.2.0
  */
-void SAL_CALL typereg_reader_getMethodExceptionTypeName(
+REG_DLLPUBLIC void SAL_CALL typereg_reader_getMethodExceptionTypeName(
     void * handle, rtl_uString ** result, sal_uInt16 methodIndex,
     sal_uInt16 exceptionIndex)
     SAL_THROW_EXTERN_C();
@@ -533,7 +534,7 @@ void SAL_CALL typereg_reader_getMethodExceptionTypeName(
 
    @since UDK 3.2.0
  */
-sal_uInt16 SAL_CALL typereg_reader_getReferenceCount(void * handle)
+REG_DLLPUBLIC sal_uInt16 SAL_CALL typereg_reader_getReferenceCount(void * handle)
     SAL_THROW_EXTERN_C();
 
 /**
@@ -550,7 +551,7 @@ sal_uInt16 SAL_CALL typereg_reader_getReferenceCount(void * handle)
 
    @since UDK 3.2.0
  */
-void SAL_CALL typereg_reader_getReferenceDocumentation(
+REG_DLLPUBLIC void SAL_CALL typereg_reader_getReferenceDocumentation(
     void * handle, rtl_uString ** result, sal_uInt16 index)
     SAL_THROW_EXTERN_C();
 
@@ -566,7 +567,7 @@ void SAL_CALL typereg_reader_getReferenceDocumentation(
 
    @since UDK 3.2.0
  */
-RTFieldAccess SAL_CALL typereg_reader_getReferenceFlags(
+REG_DLLPUBLIC RTFieldAccess SAL_CALL typereg_reader_getReferenceFlags(
     void * handle, sal_uInt16 index) SAL_THROW_EXTERN_C();
 
 /**
@@ -581,7 +582,7 @@ RTFieldAccess SAL_CALL typereg_reader_getReferenceFlags(
 
    @since UDK 3.2.0
  */
-enum RTReferenceType SAL_CALL typereg_reader_getReferenceSort(
+REG_DLLPUBLIC enum RTReferenceType SAL_CALL typereg_reader_getReferenceSort(
     void * handle, sal_uInt16 index) SAL_THROW_EXTERN_C();
 
 /**
@@ -598,7 +599,7 @@ enum RTReferenceType SAL_CALL typereg_reader_getReferenceSort(
 
    @since UDK 3.2.0
  */
-void SAL_CALL typereg_reader_getReferenceTypeName(
+REG_DLLPUBLIC void SAL_CALL typereg_reader_getReferenceTypeName(
     void * handle, rtl_uString ** result, sal_uInt16 index)
     SAL_THROW_EXTERN_C();
 
diff --git a/registry/inc/registry/reflread.hxx b/registry/inc/registry/reflread.hxx
index 37602566dfbf..95892e392ad9 100644
--- a/registry/inc/registry/reflread.hxx
+++ b/registry/inc/registry/reflread.hxx
@@ -29,6 +29,7 @@
 #ifndef _REGISTRY_REFLREAD_HXX_
 #define _REGISTRY_REFLREAD_HXX_
 
+#include <registry/regdllapi.h>
 #include <registry/refltype.hxx>
 #include <registry/regtype.h>
 #include <rtl/ustring.hxx>
@@ -91,7 +92,7 @@ struct RegistryTypeReader_Api
 
 /** the API initialization function.
 */
-RegistryTypeReader_Api* TYPEREG_CALLTYPE initRegistryTypeReader_Api(void);
+REG_DLLPUBLIC RegistryTypeReader_Api* TYPEREG_CALLTYPE initRegistryTypeReader_Api(void);
 
 #ifdef __cplusplus
 }
diff --git a/registry/inc/registry/reflwrit.hxx b/registry/inc/registry/reflwrit.hxx
index 82e40118952a..e3325ac673d5 100644
--- a/registry/inc/registry/reflwrit.hxx
+++ b/registry/inc/registry/reflwrit.hxx
@@ -29,6 +29,7 @@
 #ifndef _REGISTRY_REFLWRIT_HXX_
 #define _REGISTRY_REFLWRIT_HXX_
 
+#include <registry/regdllapi.h>
 #include <registry/refltype.hxx>
 #include <registry/regtype.h>
 #include <rtl/ustring.hxx>
@@ -70,7 +71,7 @@ struct RegistryTypeWriter_Api
 
 /** the API initialization function.
 */
-RegistryTypeWriter_Api* TYPEREG_CALLTYPE initRegistryTypeWriter_Api(void);
+REG_DLLPUBLIC RegistryTypeWriter_Api* TYPEREG_CALLTYPE initRegistryTypeWriter_Api(void);
 
 #ifdef __cplusplus
 }
diff --git a/registry/inc/registry/regdllapi.h b/registry/inc/registry/regdllapi.h
new file mode 100644
index 000000000000..6587ee647d75
--- /dev/null
+++ b/registry/inc/registry/regdllapi.h
@@ -0,0 +1,15 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#ifndef INCLUDED_REGDLLAPI_H
+#define INCLUDED_REGDLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(REG_DLLIMPLEMENTATION)
+#define REG_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
+#else
+#define REG_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
+#endif
+
+#endif /* INCLUDED_REGDLLAPI_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/inc/registry/registry.h b/registry/inc/registry/registry.h
index c27da988c303..75e0c91f766d 100644
--- a/registry/inc/registry/registry.h
+++ b/registry/inc/registry/registry.h
@@ -32,6 +32,7 @@
 #include <stddef.h>
 #include <rtl/ustring.h>
 #include <registry/regtype.h>
+#include <registry/regdllapi.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -63,7 +64,7 @@ RegError REGISTRY_CALLTYPE reg_createKey(RegKeyHandle hKey,
                      reg_closeKey. If the function fails, phNewKey is NULL.
     @return REG_NO_ERROR if succeeds else an error code.
 */
-RegError REGISTRY_CALLTYPE reg_openKey(RegKeyHandle hKey,
+REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openKey(RegKeyHandle hKey,
                                          rtl_uString* keyName,
                                          RegKeyHandle* phOpenKey);
 
@@ -116,7 +117,7 @@ RegError REGISTRY_CALLTYPE reg_deleteKey(RegKeyHandle hKey,
                  The memory of the variable specifying the key will be freed.
     @return REG_NO_ERROR if succeeds else an error code.
 */
-RegError REGISTRY_CALLTYPE reg_closeKey(RegKeyHandle hKey);
+REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_closeKey(RegKeyHandle hKey);
 
 
 /** This function returns the name of a key.
diff --git a/registry/prj/build.lst b/registry/prj/build.lst
index 624601246e3a..cc4aad1a0679 100644
--- a/registry/prj/build.lst
+++ b/registry/prj/build.lst
@@ -1,7 +1,2 @@
 rg	registry	:	salhelper store NULL
-rg	registry								usr1	-	all	rg_mkout NULL
-rg	registry\inc							nmake	-	all	rg_inc NULL
-rg	registry\prj							get		-	all	rg_prj rg_inc NULL
-rg	registry\source							nmake	-	all	rg_src rg_inc NULL
-rg	registry\util							nmake	-	all	rg_utl rg_src NULL
-rg	registry\tools							nmake	-	all	rg_tls rg_utl NULL
+rg registry\prj       nmake - all rg_prj NULL
\ No newline at end of file
diff --git a/registry/prj/d.lst b/registry/prj/d.lst
index f1dfa729c7f7..e69de29bb2d1 100644
--- a/registry/prj/d.lst
+++ b/registry/prj/d.lst
@@ -1,19 +0,0 @@
-mkdir: %_DEST%\inc\registry
-
-..\inc\registry\*.h %_DEST%\inc\registry\*.h
-..\inc\registry\*.hxx %_DEST%\inc\registry\*.hxx
-
-..\%__SRC%\lib\ireg.lib %_DEST%\lib\ireg.lib
-..\%__SRC%\lib\libreg.* %_DEST%\lib\*
-..\%__SRC%\bin\reg*.dll %_DEST%\bin\reg*.dll
-
-..\%__SRC%\bin\checksingleton.exe %_DEST%\bin\checksingleton.exe
-..\%__SRC%\bin\regcompare.exe %_DEST%\bin\regcompare.exe
-..\%__SRC%\bin\regmerge.exe %_DEST%\bin\regmerge.exe
-..\%__SRC%\bin\regview.exe %_DEST%\bin\regview.exe
-..\%__SRC%\bin\checksingleton %_DEST%\bin\checksingleton
-..\%__SRC%\bin\regcompare %_DEST%\bin\regcompare
-..\%__SRC%\bin\regmerge %_DEST%\bin\regmerge
-..\%__SRC%\bin\regview %_DEST%\bin\regview
-
-linklib: libreg.*.*
diff --git a/registry/prj/dmake b/registry/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/registry/prj/dmake
+++ /dev/null
diff --git a/registry/source/makefile.mk b/registry/source/makefile.mk
deleted file mode 100644
index 9b9cb5ca4fee..000000000000
--- a/registry/source/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=registry
-TARGET=regcpp
-
-ENABLE_EXCEPTIONS := TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : ..$/version.mk
-
-# ------------------------------------------------------------------
-
-SLOFILES= \
-            $(SLO)$/regimpl.obj		\
-            $(SLO)$/regkey.obj		\
-            $(SLO)$/registry.obj 	\
-            $(SLO)$/keyimpl.obj 	\
-            $(SLO)$/reflread.obj	\
-            $(SLO)$/reflwrit.obj
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 791a6e4b68c1..4ee8b9611b90 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -1243,7 +1243,7 @@ static void TYPEREG_CALLTYPE setFileName(TypeWriterImpl hEntry, rtl_uString* fil
     static_cast< TypeWriter * >(hEntry)->m_fileName = toByteString(fileName);
 }
 
-sal_Bool typereg_writer_setFieldData(
+REG_DLLPUBLIC sal_Bool typereg_writer_setFieldData(
     void * handle, sal_uInt16 index, rtl_uString const * documentation,
     rtl_uString const * fileName, RTFieldAccess flags, rtl_uString const * name,
     rtl_uString const * typeName, RTValueType valueType,
@@ -1276,7 +1276,7 @@ static void TYPEREG_CALLTYPE setFieldData(TypeWriterImpl    hEntry,
         constValue);
 }
 
-sal_Bool typereg_writer_setMethodData(
+REG_DLLPUBLIC sal_Bool typereg_writer_setMethodData(
     void * handle, sal_uInt16 index, rtl_uString const * documentation,
     RTMethodMode flags, rtl_uString const * name,
     rtl_uString const * returnTypeName, sal_uInt16 parameterCount,
@@ -1306,7 +1306,7 @@ static void TYPEREG_CALLTYPE setMethodData(TypeWriterImpl   hEntry,
         hEntry, index, doku, mode, name, returnTypeName, paramCount, excCount);
 }
 
-sal_Bool typereg_writer_setMethodParameterData(
+REG_DLLPUBLIC sal_Bool typereg_writer_setMethodParameterData(
     void * handle, sal_uInt16 methodIndex, sal_uInt16 parameterIndex,
     RTParamMode flags, rtl_uString const * name, rtl_uString const * typeName)
     SAL_THROW_EXTERN_C()
@@ -1332,7 +1332,7 @@ static void TYPEREG_CALLTYPE setParamData(TypeWriterImpl    hEntry,
         hEntry, index, paramIndex, mode, name, type);
 }
 
-sal_Bool typereg_writer_setMethodExceptionTypeName(
+REG_DLLPUBLIC sal_Bool typereg_writer_setMethodExceptionTypeName(
     void * handle, sal_uInt16 methodIndex, sal_uInt16 exceptionIndex,
     rtl_uString const * typeName)
     SAL_THROW_EXTERN_C()
@@ -1354,7 +1354,7 @@ static void TYPEREG_CALLTYPE setExcData(TypeWriterImpl  hEntry,
     typereg_writer_setMethodExceptionTypeName(hEntry, index, excIndex, type);
 }
 
-void const * typereg_writer_getBlob(void * handle, sal_uInt32 * size)
+REG_DLLPUBLIC void const * typereg_writer_getBlob(void * handle, sal_uInt32 * size)
     SAL_THROW_EXTERN_C()
 {
     TypeWriter * writer = static_cast< TypeWriter * >(handle);
@@ -1383,7 +1383,7 @@ static sal_uInt32 TYPEREG_CALLTYPE getBlopSize(TypeWriterImpl hEntry)
     return size;
 }
 
-sal_Bool typereg_writer_setReferenceData(
+REG_DLLPUBLIC sal_Bool typereg_writer_setReferenceData(
     void * handle, sal_uInt16 index, rtl_uString const * documentation,
     RTReferenceType sort, RTFieldAccess flags, rtl_uString const * typeName)
     SAL_THROW_EXTERN_C()
@@ -1407,7 +1407,7 @@ static void TYPEREG_CALLTYPE setReferenceData(TypeWriterImpl    hEntry,
     typereg_writer_setReferenceData(hEntry, index, doku, refType, access, name);
 }
 
-void * typereg_writer_create(
+REG_DLLPUBLIC void * typereg_writer_create(
     typereg_Version version, rtl_uString const * documentation,
     rtl_uString const * fileName, RTTypeClass typeClass, sal_Bool published,
     rtl_uString const * typeName, sal_uInt16 superTypeCount,
@@ -1424,11 +1424,11 @@ void * typereg_writer_create(
     }
 }
 
-void typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C() {
+REG_DLLPUBLIC void typereg_writer_destroy(void * handle) SAL_THROW_EXTERN_C() {
     delete static_cast< TypeWriter * >(handle);
 }
 
-sal_Bool typereg_writer_setSuperTypeName(
+REG_DLLPUBLIC sal_Bool typereg_writer_setSuperTypeName(
     void * handle, sal_uInt16 index, rtl_uString const * typeName)
     SAL_THROW_EXTERN_C()
 {
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx
index 61764e80a37c..d6251da27895 100644
--- a/registry/source/registry.cxx
+++ b/registry/source/registry.cxx
@@ -29,6 +29,7 @@
 
 #include <registry/registry.h>
 #include <registry/registry.hxx>
+
 #include <osl/process.h>
 
 #include "keyimpl.hxx"
@@ -410,7 +411,7 @@ static RegError REGISTRY_CALLTYPE dumpRegistry(RegHandle hReg,
 //*********************************************************************
 //  initRegistry_Api
 //
-Registry_Api* REGISTRY_CALLTYPE initRegistry_Api(void)
+REG_DLLPUBLIC Registry_Api* REGISTRY_CALLTYPE initRegistry_Api(void)
 {
     static Registry_Api aApi= {&acquire,
                                &release,
@@ -461,7 +462,7 @@ Registry_Api* REGISTRY_CALLTYPE initRegistry_Api(void)
 //*********************************************************************
 //  reg_loadRegKey
 //
-RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey,
+REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey,
                                        rtl_uString* keyName,
                                        rtl_uString* regFileName)
 {
@@ -478,7 +479,7 @@ RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey,
 //*********************************************************************
 //  reg_saveKey
 //
-RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey,
+REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey,
                                        rtl_uString* keyName,
                                        rtl_uString* regFileName)
 {
@@ -495,7 +496,7 @@ RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey,
 //*********************************************************************
 //  reg_mergeKey
 //
-RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey,
+REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey,
                                         rtl_uString* keyName,
                                         rtl_uString* regFileName,
                                         sal_Bool bWarnings,
@@ -514,7 +515,7 @@ RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey,
 //*********************************************************************
 //  reg_createRegistry
 //
-RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName,
+REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName,
                                               RegHandle* phRegistry)
 {
     RegError ret;
@@ -534,7 +535,7 @@ RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName,
 //*********************************************************************
 //  reg_openRootKey
 //
-RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry,
+REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry,
                                           RegKeyHandle* phRootKey)
 {
     return openRootKey(hRegistry, phRootKey);
@@ -544,7 +545,7 @@ RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry,
 //*********************************************************************
 //  reg_getName
 //
-RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName)
+REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName)
 {
     return getName(hRegistry, pName);
 }
@@ -553,7 +554,7 @@ RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName)
 //*********************************************************************
 //  reg_isReadOnly
 //
-sal_Bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hRegistry)
+REG_DLLPUBLIC sal_Bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hRegistry)
 {
     return isReadOnly(hRegistry);
 }
@@ -562,7 +563,7 @@ sal_Bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hRegistry)
 //*********************************************************************
 //  reg_openRegistry
 //
-RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName,
+REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName,
                                             RegHandle* phRegistry,
                                             RegAccessMode accessMode)
 {
@@ -583,7 +584,7 @@ RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName,
 //*********************************************************************
 //  reg_closeRegistry
 //
-RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry)
+REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry)
 {
     ORegistry* pReg;
 
@@ -602,7 +603,7 @@ RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry)
 //*********************************************************************
 //  reg_destroyRegistry
 //
-RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry,
+REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry,
                                                rtl_uString* registryName)
 {
     return destroyRegistry(hRegistry, registryName);
@@ -612,7 +613,7 @@ RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry,
 //*********************************************************************
 //  reg_dumpRegistry
 //
-RegError REGISTRY_CALLTYPE reg_dumpRegistry(RegKeyHandle hKey)
+REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_dumpRegistry(RegKeyHandle hKey)
 {
     ORegKey *pKey;
 
diff --git a/registry/tools/makefile.mk b/registry/tools/makefile.mk
deleted file mode 100644
index 43043716346b..000000000000
--- a/registry/tools/makefile.mk
+++ /dev/null
@@ -1,92 +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=registry
-TARGET=regmerge
-TARGETTYPE=CUI
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS := TRUE
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  settings.mk
-
-.INCLUDE :  ..$/version.mk
-
-.IF "$(OS)"!="IOS"
-
-# --- Files --------------------------------------------------------
-CDEFS += -DDLL_VERSION=$(EMQ)"$(DLLPOSTFIX)$(EMQ)"
-
-APP1TARGET= $(TARGET)
-APP1OBJS=   $(OBJ)$/regmerge.obj $(OBJ)/fileurl.obj $(OBJ)/options.obj
-APP1RPATH=  UREBIN
-
-APP1STDLIBS=\
-            $(SALLIB) \
-            $(REGLIB)
-
-APP2TARGET= regview
-APP2OBJS=   $(OBJ)$/regview.obj $(OBJ)/fileurl.obj
-APP2RPATH=  UREBIN
-
-APP2STDLIBS=\
-            $(SALLIB) \
-            $(REGLIB)
-
-APP3TARGET= regcompare
-APP3OBJS=   $(OBJ)$/regcompare.obj $(OBJ)/fileurl.obj $(OBJ)/options.obj
-APP3RPATH=  SDKBIN
-
-APP3STDLIBS=\
-            $(SALLIB) \
-            $(SALHELPERLIB) \
-            $(REGLIB)
-
-APP4TARGET= checksingleton
-APP4OBJS=   $(OBJ)$/checksingleton.obj $(OBJ)/fileurl.obj $(OBJ)/options.obj
-
-APP4STDLIBS=\
-            $(SALLIB) \
-            $(SALHELPERLIB) \
-            $(REGLIB)
-
-APP5TARGET= rdbedit
-APP5OBJS=   $(OBJ)$/rdbedit.obj
-
-APP5STDLIBS=\
-            $(SALLIB) \
-            $(SALHELPERLIB) \
-            $(REGLIB)
-
-OBJFILES = $(APP1OBJS) $(APP2OBJS) $(APP3OBJS) $(APP4OBJS) $(APP5OBJS)
-
-.ENDIF
-
-.INCLUDE :  target.mk
diff --git a/registry/util/makefile.mk b/registry/util/makefile.mk
deleted file mode 100644
index ecc356c7bf12..000000000000
--- a/registry/util/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=registry
-TARGET=reg
-
-UNIXVERSIONNAMES=UDK
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-USE_LDUMP2=TRUE
-LDUMP2=LDUMP3
-
-DOCPPFILES= $(INC)$/registry$/registry.hxx \
-            $(INC)$/registry$/registry.h \
-            $(INC)$/registry$/regtype.h \
-            $(INC)$/registry$/reflread.hxx \
-            $(INC)$/registry$/reflwrit.hxx \
-            $(INC)$/registry$/refltype.hxx \
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-
-LIB1FILES= 	$(SLB)$/$(TARGET)cpp.lib
-
-SHL1TARGET= $(TARGET)
-.IF "$(COM)" == "MSC"
-SHL1IMPLIB= ireg
-.ELSE
-SHL1IMPLIB= $(TARGET)
-.ENDIF
-SHL1STDLIBS= \
-    $(SALLIB) \
-    $(STORELIB)
-
-SHL1VERSIONMAP=	$(TARGET).map
-
-SHL1LIBS= $(LIB1TARGET)	
-SHL1DEPN= $(LIB1TARGET)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME= $(SHL1TARGET)
-DEF1DES	= RegistryRuntime
-SHL1RPATH=URELIB
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-makedocpp: $(DOCPPFILES)
-     docpp -H -m -f  -u -d $(OUT)$/doc$/$(PRJNAME) $(DOCPPFILES)
-