sal: convert to gbuild

author: Matúš Kukan <matus.kukan@gmail.com> 2011-12-17 13:13:11 +0100
committer: Matúš Kukan <matus.kukan@gmail.com> 2011-12-19 10:14:53 +0100
commit: a9e130ab82f3216334e432e9d6ee19a600b6c287 (patch)
tree: e36f219b5e5b854335657dc57410bb401b9e3ec1 /sal
parent: d899f976ee0f4d1058f1adc94853df94a3c6eaea (diff)
28 files changed, 726 insertions, 1312 deletions
diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk
new file mode 100644
index 000000000000..d6adc3c3527c
--- /dev/null
+++ b/sal/Executable_cppunittester.mk
@@ -0,0 +1,46 @@
+# -*- 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) 2011 Matúš Kukan <matus.kukan@gmail.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_Executable_Executable,cppunit/cppunittester))
+
+$(eval $(call gb_Executable_set_include,cppunit/cppunittester,\
+	$$(INCLUDE) \
+	-I$(realpath $(SRCDIR)/sal/inc) \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,cppunit/cppunittester,\
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_use_external,cppunit/cppunittester,cppunit))
+
+$(eval $(call gb_Executable_add_exception_objects,cppunit/cppunittester,\
+	sal/cppunittester/cppunittester \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/Executable_typesconfig.mk b/sal/Executable_typesconfig.mk
new file mode 100644
index 000000000000..db0cc3ae2a27
--- /dev/null
+++ b/sal/Executable_typesconfig.mk
@@ -0,0 +1,38 @@
+# -*- 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) 2011 Matúš Kukan <matus.kukan@gmail.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_Executable_Executable,typesconfig))
+
+$(eval $(call gb_Executable_add_defs,typesconfig,\
+	$(LFS_CFLAGS) \
+))
+
+$(eval $(call gb_Executable_add_cobjects,typesconfig,\
+	sal/typesconfig/typesconfig \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/android/makefile.mk b/sal/Library_lo-bootstrap.mk
index c5e630bed4af..f334eedb8499 100644
--- a/sal/android/makefile.mk
+++ b/sal/Library_lo-bootstrap.mk
@@ -1,9 +1,11 @@
+# -*- 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/
+# 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
@@ -11,11 +13,7 @@
 # License.
 #
 # Major Contributor(s):
-# Copyright (C) 2011 Tor Lillqvist <tml@iki.fi> (initial developer)
-# Copyright (C) 2011 SUSE Linux http://suse.com (initial developer's employer)
-#
-# Zip parsing code lifted from Mozilla's other-licenses/android/APKOpen.cpp,
-# by Michael Wu <mwu@mozilla.com>.
+# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com>
 #
 # All Rights Reserved.
 #
@@ -27,33 +25,22 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-PRJ = ..
-PRJNAME = sal
-TARGET = lo-bootstrap
-
 # Too many warnings from android_native_app_glue.[ch]
 EXTERNAL_WARNINGS_NOT_ERRORS = TRUE
 
-.INCLUDE :  settings.mk
-
-.IF "$(OS)" != "ANDROID"
-ALL:
-# do nothing
-.ENDIF
-
-SHL1TARGET = $(TARGET)
-
-SHL1OBJS = \
-    $(SLO)$/lo-bootstrap.obj
+$(eval $(call gb_Library_Library,lo-bootstrap))
 
 # We don't want to link liblo-bootstrap.so against
 # libgnustl_shared.so. The Android dynamic linker won't find it
 # anyway. One very point of liblo-bootstrap is its wrapper for
 # dlopen() that searches also in the app's lib folder for needed
-# shared libraries. So just re-define STDSHLCUIMT.
-
-STDSHLCUIMT := -llog -landroid
+# shared libraries.
+$(eval $(call gb_Library_add_libs,lo-bootstrap,\
+	-llog -landroid \
+))
 
-# Also don't pointless
+$(eval $(call gb_Library_add_cobjects,lo-bootstrap,\
+	sal/android/lo-bootstrap \
+))
 
-.INCLUDE :  target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
new file mode 100644
index 000000000000..41ccaf6ffb8e
--- /dev/null
+++ b/sal/Library_sal.mk
@@ -0,0 +1,242 @@
+# -*- 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) 2011 Matúš Kukan <matus.kukan@gmail.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,sal))
+
+$(eval $(call gb_Library_set_soversion_script,sal,3,$(SRCDIR)/sal/util/sal.map))
+
+$(eval $(call gb_Library_add_package_headers,sal,sal_generated))
+$(eval $(call gb_Library_add_package_headers,sal,sal_inc))
+
+$(eval $(call gb_Library_set_include,sal,\
+	$$(INCLUDE) \
+	-I$(realpath $(SRCDIR)/sal/inc) \
+))
+
+$(eval $(call gb_Library_add_defs,sal,\
+	$(if $(VALGRIND_CFLAGS), \
+		$(VALGRIND_CFLAGS) \
+		-DHAVE_MEMCHECK_H=1 \
+	) \
+	$(if $(filter $(ALLOC),SYS_ALLOC TCMALLOC JEMALLOC), \
+		-DFORCE_SYSALLOC \
+	) \
+	$(if $(filter $(OS),IOS), \
+		-DNO_DL_FUNCTIONS \
+		-DNO_CHILD_PROCESSES \
+	) \
+	$(LFS_CFLAGS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sal,\
+	$(if $(filter $(GUI),UNX), \
+		dl \
+		pthread \
+	) \
+	$(if $(filter $(OS),SOLARIS), \
+		nsl \
+		socket \
+	) \
+	$(if $(filter $(OS),WNT), \
+		advapi32 \
+		comdlg32 \
+		mpr \
+		ole32 \
+		shell32 \
+		user32 \
+		ws2_32 \
+	) \
+	$(if $(filter $(OS),ANDROID), \
+		lo-bootstrap \
+	) \
+	$(gb_STDLIBS) \
+))
+
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_use_externals,sal,\
+	carbon \
+	corefoundation
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,sal,\
+	sal/osl/all/debugbase \
+	sal/osl/all/loadmodulerelative \
+	sal/osl/all/log  \
+	sal/osl/all/trace  \
+	sal/osl/all/utility \
+	sal/rtl/source/alloc_arena \
+	sal/rtl/source/alloc_cache \
+	sal/rtl/source/alloc_fini \
+	sal/rtl/source/alloc_global \
+	sal/rtl/source/bootstrap \
+	sal/rtl/source/byteseq \
+	sal/rtl/source/cipher \
+	sal/rtl/source/cmdargs \
+	sal/rtl/source/crc \
+	sal/rtl/source/digest \
+	sal/rtl/source/hash \
+	sal/rtl/source/locale \
+	sal/rtl/source/logfile \
+	sal/rtl/source/math \
+	sal/rtl/source/memory \
+	sal/rtl/source/random \
+	sal/rtl/source/rtl_process \
+	sal/rtl/source/strbuf \
+	sal/rtl/source/strimp \
+	sal/rtl/source/string \
+	sal/rtl/source/unload \
+	sal/rtl/source/uri \
+	sal/rtl/source/ustrbuf \
+	sal/rtl/source/ustring \
+	sal/rtl/source/uuid \
+	sal/textenc/convertsinglebytetobmpunicode \
+	sal/textenc/textenc \
+))
+$(eval $(call gb_Library_add_cobjects,sal,\
+	sal/osl/all/filepath \
+	sal/textenc/context \
+	sal/textenc/convertbig5hkscs \
+	sal/textenc/converter \
+	sal/textenc/converteuctw \
+	sal/textenc/convertgb18030 \
+	sal/textenc/convertiso2022cn \
+	sal/textenc/convertiso2022jp \
+	sal/textenc/convertiso2022kr \
+	sal/textenc/tcvtbyte \
+	sal/textenc/tcvtmb \
+	sal/textenc/tcvtutf7 \
+	sal/textenc/tcvtutf8 \
+	sal/textenc/tenchelp \
+	sal/textenc/tencinfo \
+	sal/textenc/textcvt \
+	sal/textenc/unichars \
+))
+
+ifeq ($(GUI),UNX)
+$(eval $(call gb_Library_add_exception_objects,sal,\
+	sal/osl/unx/conditn \
+	sal/osl/unx/file \
+	sal/osl/unx/file_error_transl \
+	sal/osl/unx/file_misc \
+	sal/osl/unx/file_path_helper \
+	sal/osl/unx/file_stat \
+	sal/osl/unx/file_url \
+	sal/osl/unx/file_volume \
+	sal/osl/unx/process \
+	sal/osl/unx/process_impl \
+	sal/osl/unx/salinit \
+	sal/osl/unx/uunxapi \
+))
+$(eval $(call gb_Library_add_cobjects,sal,\
+	sal/osl/unx/diagnose \
+	sal/osl/unx/module \
+	sal/osl/unx/mutex \
+	sal/osl/unx/nlsupport \
+	sal/osl/unx/pipe \
+	sal/osl/unx/profile \
+	sal/osl/unx/readwrite_helper \
+	sal/osl/unx/security \
+	sal/osl/unx/semaphor \
+	sal/osl/unx/socket \
+	sal/osl/unx/system \
+	sal/osl/unx/tempfile \
+	sal/osl/unx/thread \
+	sal/osl/unx/time \
+	sal/osl/unx/util \
+))
+$(eval $(call gb_Library_add_cobject,sal,sal/osl/unx/signal, \
+	$(if $(filter $(ENABLE_CRASHDUMP),YES)$(if $(PRODUCT),,TRUE), \
+		-DSAL_ENABLE_CRASH_REPORT) \
+))
+
+ifneq ($(filter $(OS),MACOSX IOS),)
+$(eval $(call gb_Library_add_exception_objects,sal,\
+	sal/osl/unx/osxlocale \
+))
+endif
+ifneq ($(filter $(OS),SOLARIS FREEBSD NETBSD MACOSX AIX OPENBSD DRAGONFLY)$(filter $(OS)$(CPU),LINUXS),)
+$(eval $(call gb_Library_add_cobjects,sal,\
+	sal/osl/unx/backtrace \
+))
+endif
+ifneq ($(filter $(OS)$(CPU),SOLARISU SOLARISS NETBSDS LINUXS),)
+$(eval $(call gb_Library_add_asmobjects,sal,\
+	sal/osl/unx/asm/interlck_sparc \
+))
+else ifeq ($(OS)$(CPU),SOLARISI)
+$(eval $(call gb_Library_add_asmobjects,sal,\
+	sal/osl/unx/asm/interlck_x86 \
+))
+else
+$(eval $(call gb_Library_add_cobjects,sal,\
+	sal/osl/unx/interlck \
+))
+endif
+
+else # $(GUI) != UNX
+
+# FIXME ?
+# .IF "$(CCNUMVER)" >= "001400000000"
+# $(eval $(call gb_Library_add_defs,sal,\
+	-D_CRT_NON_CONFORMING_SWPRINTFS \
+))
+# .ENDIF
+
+$(eval $(call gb_Library_add_exception_objects,sal,\
+	sal/osl/w32/file \
+	sal/osl/w32/file_dirvol \
+	sal/osl/w32/file_url \
+	sal/osl/w32/module \
+	sal/osl/w32/path_helper \
+	sal/osl/w32/process \
+	sal/osl/w32/procimpl \
+	sal/osl/w32/profile \
+	sal/osl/w32/salinit \
+	sal/osl/w32/signal \
+	sal/osl/w32/socket \
+	sal/osl/w32/tempfile \
+))
+$(eval $(call gb_Library_add_cobjects,sal,\
+	sal/osl/w32/conditn \
+	sal/osl/w32/diagnose \
+	sal/osl/w32/dllentry \
+	sal/osl/w32/file_error \
+	sal/osl/w32/interlck \
+	sal/osl/w32/mutex \
+	sal/osl/w32/nlsupport \
+	sal/osl/w32/pipe \
+	sal/osl/w32/security \
+	sal/osl/w32/semaphor \
+	sal/osl/w32/thread \
+	sal/osl/w32/time \
+	sal/osl/w32/util \
+))
+
+endif # ifeq ($(GUI),UNX)
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/Library_sal_textenc.mk b/sal/Library_sal_textenc.mk
new file mode 100644
index 000000000000..234ab1a8e941
--- /dev/null
+++ b/sal/Library_sal_textenc.mk
@@ -0,0 +1,63 @@
+# -*- 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) 2011 Matúš Kukan <matus.kukan@gmail.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,sal_textenc))
+
+$(eval $(call gb_Library_set_soversion_script,sal_textenc,3,$(SRCDIR)/sal/util/sal_textenc/saltextenc.map))
+
+$(eval $(call gb_Library_add_linked_libs,sal_textenc,\
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_defs,sal_textenc,\
+	$(LFS_CFLAGS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,sal_textenc,\
+	sal/textenc/convertsinglebytetobmpunicode \
+	sal/textenc/tables \
+))
+
+$(eval $(call gb_Library_add_cobjects,sal_textenc,\
+	sal/textenc/context \
+	sal/textenc/convertbig5hkscs \
+	sal/textenc/converter \
+	sal/textenc/converteuctw \
+	sal/textenc/convertgb18030 \
+	sal/textenc/convertiso2022cn \
+	sal/textenc/convertiso2022jp \
+	sal/textenc/convertiso2022kr \
+	sal/textenc/tcvtbyte \
+	sal/textenc/tcvtmb \
+	sal/textenc/tcvtutf7 \
+	sal/textenc/tcvtutf8 \
+	sal/textenc/tenchelp \
+	sal/textenc/unichars \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk
new file mode 100644
index 000000000000..6a9cf08e7d4b
--- /dev/null
+++ b/sal/Library_uwinapi.mk
@@ -0,0 +1,52 @@
+# -*- 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) 2011 Matúš Kukan <matus.kukan@gmail.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,uwinapi))
+
+$(eval $(call gb_Library_add_linked_libs,uwinapi,\
+	$(if $(filter $(COM),MSC), \
+		kernel32 \
+		msvcrt \
+		shlwapi \
+		user32 \
+		version \
+	) \
+	$(filter-out uwinapi,$(gb_STDLIBS)) \
+))
+
+$(eval $(call gb_Library_add_defs,uwinapi,\
+	$(if $(filter $(COM),GCC), \
+		-Wno-unused-parameter -Wno-return-type) \
+	$(LFS_CFLAGS) \
+))
+
+$(eval $(call gb_Library_add_cobjects,uwinapi,\
+	sal/systools/win32/uwinapi/snprintf \
+	sal/systools/win32/uwinapi/snwprintf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index bee84db46d64..f7982adbb99e 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# -*- 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
@@ -28,7 +28,22 @@
 
 $(eval $(call gb_Module_Module,sal))
 
-$(eval $(call gb_Module_add_subsequentcheck_targets,sal,\
+$(eval $(call gb_Module_add_targets,sal,\
+	Executable_cppunittester \
+	$(if $(filter $(CROSS_COMPILING),YES)$(filter $(COM),MSC),, \
+		Executable_typesconfig) \
+	$(if $(filter $(OS),ANDROID), \
+		Library_lo-bootstrap) \
+	Library_sal \
+	Library_sal_textenc \
+	$(if $(filter $(OS),WNT), \
+		Library_uwinapi) \
+	Package_inc \
+	Package_generated \
+	StaticLibrary_salcpprt \
+))
+
+$(eval $(call gb_Module_add_check_targets,sal,\
 	CppunitTest_sal_osl_mutex \
 	CppunitTest_sal_osl_pipe \
 	CppunitTest_sal_osl_profile \
diff --git a/sal/Package_generated.mk b/sal/Package_generated.mk
new file mode 100644
index 000000000000..e2cad8ea35b6
--- /dev/null
+++ b/sal/Package_generated.mk
@@ -0,0 +1,45 @@
+# -*- 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) 2011 Matúš Kukan <matus.kukan@gmail.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,sal_generated,$(WORKDIR)/CustomTarget/sal/util))
+
+$(eval $(call gb_Package_add_customtarget,sal_generated,sal/util))
+
+ifneq ($(OS),WNT)
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,sal/util,\
+	$(call gb_Executable_get_target,typesconfig) \
+))
+endif
+
+$(eval $(call gb_Package_add_file,sal_generated,inc/rtlbootstrap.mk,rtlbootstrap.mk))
+$(eval $(call gb_Package_add_file,sal_generated,inc/sal/udkversion.h,sal/udkversion.h))
+
+ifneq ($(COM),MSC)
+$(eval $(call gb_Package_add_file,sal_generated,inc/sal/typesizes.h,sal/typesizes.h))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/Package_inc.mk b/sal/Package_inc.mk
new file mode 100644
index 000000000000..0c92ab618a3b
--- /dev/null
+++ b/sal/Package_inc.mk
@@ -0,0 +1,118 @@
+# -*- 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) 2011 Matúš Kukan <matus.kukan@gmail.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,sal_inc,$(SRCDIR)/sal/inc))
+
+$(eval $(call gb_Package_add_file,sal_inc,inc/protectorfactory.hxx,cppunittester/protectorfactory.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/armarch.h,osl/armarch.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/conditn.h,osl/conditn.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/conditn.hxx,osl/conditn.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/diagnose.h,osl/diagnose.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/diagnose.hxx,osl/diagnose.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/doublecheckedlocking.h,osl/doublecheckedlocking.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/endian.h,osl/endian.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/file.h,osl/file.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/file.hxx,osl/file.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/getglobalmutex.hxx,osl/getglobalmutex.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/interlck.h,osl/interlck.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/module.h,osl/module.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/module.hxx,osl/module.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/mutex.h,osl/mutex.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/mutex.hxx,osl/mutex.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/nlsupport.h,osl/nlsupport.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/pipe_decl.hxx,osl/pipe_decl.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/pipe.h,osl/pipe.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/pipe.hxx,osl/pipe.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/process.h,osl/process.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/profile.h,osl/profile.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/profile.hxx,osl/profile.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/security_decl.hxx,osl/security_decl.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/security.h,osl/security.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/security.hxx,osl/security.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/semaphor.h,osl/semaphor.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/semaphor.hxx,osl/semaphor.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/signal.h,osl/signal.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/socket_decl.hxx,osl/socket_decl.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/socket.h,osl/socket.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/socket.hxx,osl/socket.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/thread.h,osl/thread.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/thread.hxx,osl/thread.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/time.h,osl/time.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/osl/util.h,osl/util.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/allocator.hxx,rtl/allocator.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/alloc.h,rtl/alloc.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/bootstrap.h,rtl/bootstrap.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/bootstrap.hxx,rtl/bootstrap.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/byteseq.h,rtl/byteseq.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/byteseq.hxx,rtl/byteseq.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/cipher.h,rtl/cipher.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/crc.h,rtl/crc.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/digest.h,rtl/digest.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/instance.hxx,rtl/instance.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/locale.h,rtl/locale.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/locale.hxx,rtl/locale.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/logfile.h,rtl/logfile.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/logfile.hxx,rtl/logfile.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/malformeduriexception.hxx,rtl/malformeduriexception.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/math.h,rtl/math.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/math.hxx,rtl/math.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/memory.h,rtl/memory.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/oustringostreaminserter.hxx,rtl/oustringostreaminserter.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/process.h,rtl/process.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/random.h,rtl/random.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ref.hxx,rtl/ref.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/strbuf.h,rtl/strbuf.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/strbuf.hxx,rtl/strbuf.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/string.h,rtl/string.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/string.hxx,rtl/string.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/tencinfo.h,rtl/tencinfo.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/textcvt.h,rtl/textcvt.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/textenc.h,rtl/textenc.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/unload.h,rtl/unload.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/uri.h,rtl/uri.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/uri.hxx,rtl/uri.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ustrbuf.h,rtl/ustrbuf.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ustrbuf.hxx,rtl/ustrbuf.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ustring.h,rtl/ustring.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ustring.hxx,rtl/ustring.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/uuid.h,rtl/uuid.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/sal/alloca.h,sal/alloca.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/sal/config.h,sal/config.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/sal/log.hxx,sal/log.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/sal/macros.h,sal/macros.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/sal/main.h,sal/main.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/sal/mathconf.h,sal/mathconf.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/sal/precppunit.hxx,sal/precppunit.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/sal/types.h,sal/types.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/sal/detail/log.h,sal/detail/log.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/systools/win32/comptr.hxx,systools/win32/comptr.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/systools/win32/comtools.hxx,systools/win32/comtools.hxx))
+$(eval $(call gb_Package_add_file,sal_inc,inc/systools/win32/qswin32.h,systools/win32/qswin32.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/systools/win32/snprintf.h,systools/win32/snprintf.h))
+$(eval $(call gb_Package_add_file,sal_inc,inc/systools/win32/uwinapi.h,systools/win32/uwinapi.h))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/util/sal_textenc/makefile.mk b/sal/StaticLibrary_salcpprt.mk
index ec133ee98a2c..79583a66c796 100644
--- a/sal/util/sal_textenc/makefile.mk
+++ b/sal/StaticLibrary_salcpprt.mk
@@ -1,3 +1,5 @@
+# -*- 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
@@ -11,8 +13,7 @@
 # License.
 #
 # Major Contributor(s):
-# Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
-#   (initial developer) ]
+# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
 #
 # All Rights Reserved.
 #
@@ -24,23 +25,16 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-PRJ = ../..
-PRJNAME = sal
-TARGET = sal_textenc
-
-# Should be VISIBILITY_HIDDEN=TRUE, but sal/textenc contains objects that end up
-# in both sal and sal_textenc libraries, so need to use a map file here for now.
+$(eval $(call gb_StaticLibrary_StaticLibrary,salcpprt))
 
-.INCLUDE: settings.mk
+$(eval $(call gb_StaticLibrary_add_package_headers,salcpprt,sal_generated))
 
-# Should be DLLPRE= as it is loaded dynamically, but IOS links against it.
+$(eval $(call gb_StaticLibrary_add_defs,salcpprt, \
+	$(LFS_CFLAGS) \
+))
 
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1LIBS = $(SLB)/textenc_tables.lib
-SHL1RPATH = URELIB
-SHL1STDLIBS = $(SALLIB)
-SHL1TARGET = sal_textenc
-SHL1VERSIONMAP = saltextenc.map
-DEF1NAME = $(SHL1TARGET)
+$(eval $(call gb_StaticLibrary_add_exception_objects,salcpprt, \
+	sal/cpprt/operators_new_delete \
+))
 
-.INCLUDE: target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/sal/cpprt/makefile.mk b/sal/cpprt/makefile.mk
deleted file mode 100644
index 1cba8ee7634b..000000000000
--- a/sal/cpprt/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=SAL
-TARGET=salcpprt
-
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-    $(SLO)$/operators_new_delete.obj
-
-
-.IF "$(OS)" != "SOLARIS"
-
-# build as archive
-LIB1TARGET=$(LB)$/$(TARGET).lib
-LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-LIB1OBJFILES=$(SLOFILES)
-
-.ELSE  # SOLARIS
-
-# build as shared library (interposer needed for -Bdirect)
-LINKFLAGS+= -z interpose
-
-SHL1TARGET=	$(TARGET)
-SHL1IMPLIB=	i$(TARGET)
-
-SHL1STDLIBS=$(SALLIB)
-SHL1OBJS=	$(SLOFILES)
-
-.ENDIF # SOLARIS
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sal/cppunittester/makefile.mk b/sal/cppunittester/makefile.mk
deleted file mode 100644
index 7c43bab6b743..000000000000
--- a/sal/cppunittester/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 = sal
-TARGET = cppunittester
-
-ENABLE_EXCEPTIONS = TRUE
-
-.INCLUDE: settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-.IF "$(OS)" == "IOS"
-CFLAGSCXX += -x objective-c++ -fobjc-abi-version=2 -fobjc-legacy-dispatch -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300
-.ENDIF
-
-OBJFILES = $(APP1OBJS)
-
-APP1OBJS = $(OBJ)/cppunittester.obj
-APP1RPATH = NONE
-APP1STDLIBS = $(CPPUNITLIB) $(SALLIB)
-APP1TARGET = cppunittester
-
-.INCLUDE: target.mk
diff --git a/sal/inc/makefile.mk b/sal/inc/makefile.mk
deleted file mode 100644
index c1eadac3cb42..000000000000
--- a/sal/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=sal
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/sal/osl/all/makefile.mk b/sal/osl/all/makefile.mk
deleted file mode 100644
index efd011fa0b60..000000000000
--- a/sal/osl/all/makefile.mk
+++ /dev/null
@@ -1,64 +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=sal
-TARGET=oslall
-ENABLE_EXCEPTIONS=TRUE
-USE_LDUMP2=TRUE
-
-MULTITHREAD_OBJ=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=	\
-            $(SLO)$/utility.obj\
-            $(SLO)$/filepath.obj\
-            $(SLO)$/debugbase.obj\
-            $(SLO)$/loadmodulerelative.obj \
-            $(SLO)/log.obj\
-            $(SLO)/trace.obj
-
-OBJFILES=	\
-            $(OBJ)$/utility.obj\
-            $(OBJ)$/filepath.obj\
-            $(OBJ)$/debugbase.obj\
-            $(OBJ)$/loadmodulerelative.obj \
-            $(OBJ)/log.obj\
-            $(OBJ)/trace.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/sal/osl/unx/makefile.mk b/sal/osl/unx/makefile.mk
deleted file mode 100644
index 1b0b4e3bdef7..000000000000
--- a/sal/osl/unx/makefile.mk
+++ /dev/null
@@ -1,175 +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=sal
-TARGET=cpposl
-USE_LDUMP2=TRUE
-
-TARGETTYPE=CUI
-
-ENABLE_EXCEPTIONS=TRUE
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
-
-.IF "$(OS)" == "IOS"
-CFLAGSCXX+=-D__IPHONE_OS_VERSION_MIN_REQUIRED=40300
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-            $(SLO)$/conditn.obj  \
-            $(SLO)$/diagnose.obj \
-            $(SLO)$/semaphor.obj \
-            $(SLO)$/socket.obj   \
-            $(SLO)$/interlck.obj \
-            $(SLO)$/mutex.obj    \
-            $(SLO)$/nlsupport.obj \
-            $(SLO)$/thread.obj   \
-            $(SLO)$/module.obj   \
-            $(SLO)$/process.obj  \
-            $(SLO)$/security.obj \
-            $(SLO)$/profile.obj  \
-            $(SLO)$/time.obj     \
-            $(SLO)$/signal.obj   \
-            $(SLO)$/pipe.obj   	 \
-            $(SLO)$/system.obj	 \
-            $(SLO)$/util.obj	 \
-            $(SLO)$/tempfile.obj\
-            $(SLO)$/file.obj     \
-            $(SLO)$/file_misc.obj\
-            $(SLO)$/file_url.obj\
-            $(SLO)$/file_error_transl.obj\
-            $(SLO)$/file_path_helper.obj\
-            $(SLO)$/file_stat.obj \
-            $(SLO)$/file_volume.obj \
-            $(SLO)$/uunxapi.obj\
-            $(SLO)$/process_impl.obj\
-            $(SLO)$/salinit.obj \
-            $(SLO)$/readwrite_helper.obj
-
-OBJFILES=   $(OBJ)$/conditn.obj  \
-            $(OBJ)$/diagnose.obj \
-            $(OBJ)$/semaphor.obj \
-            $(OBJ)$/socket.obj   \
-            $(OBJ)$/interlck.obj \
-            $(OBJ)$/mutex.obj    \
-            $(OBJ)$/nlsupport.obj \
-            $(OBJ)$/thread.obj   \
-            $(OBJ)$/module.obj   \
-            $(OBJ)$/process.obj  \
-            $(OBJ)$/security.obj \
-            $(OBJ)$/profile.obj  \
-            $(OBJ)$/time.obj     \
-            $(OBJ)$/signal.obj   \
-            $(OBJ)$/pipe.obj   	 \
-            $(OBJ)$/system.obj	 \
-            $(OBJ)$/util.obj	 \
-            $(OBJ)$/tempfile.obj\
-            $(OBJ)$/file.obj     \
-            $(OBJ)$/file_misc.obj\
-            $(OBJ)$/file_url.obj\
-            $(OBJ)$/file_error_transl.obj\
-            $(OBJ)$/file_path_helper.obj\
-            $(OBJ)$/file_stat.obj \
-            $(OBJ)$/file_volume.obj \
-            $(OBJ)$/uunxapi.obj\
-            $(OBJ)$/process_impl.obj\
-            $(OBJ)$/salinit.obj \
-            $(OBJ)$/readwrite_helper.obj
-            
-
-.IF "$(OS)"=="MACOSX" || "$(OS)"=="IOS"
-SLOFILES += $(SLO)$/osxlocale.obj
-.ENDIF
-
-.IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || \
-    "$(OS)$(CPU)"=="LINUXS" || "$(OS)"=="MACOSX" || "$(OS)"=="AIX" || \
-    "$(OS)"=="OPENBSD" || "$(OS)"=="DRAGONFLY"
-SLOFILES += $(SLO)$/backtrace.obj
-OBJFILES += $(OBJ)$/backtrace.obj
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(COM)"=="C50"
-APP1STDLIBS+=-lC
-.ENDIF
-
-.IF "$(ENABLE_CRASHDUMP)" != "" || "$(PRODUCT)" == ""
-CFLAGS+=-DSAL_ENABLE_CRASH_REPORT
-.ENDIF
-
-.IF "$(OS)" == "IOS"
-CFLAGS+=-DNO_DL_FUNCTIONS -DNO_CHILD_PROCESSES
-.ENDIF
-
-.INCLUDE :  target.mk
-
-.IF "$(OS)$(CPU)"=="SOLARISU" || "$(OS)$(CPU)"=="SOLARISS" || "$(OS)$(CPU)"=="NETBSDS" || "$(OS)$(CPU)"=="LINUXS"
-
-$(SLO)$/interlck.obj: $(SLO)$/interlck.o
-     touch $(SLO)$/interlck.obj
-
-$(OBJ)$/interlck.obj: $(OBJ)$/interlck.o
-     touch $(OBJ)$/interlck.obj
-
-$(SLO)$/interlck.o: $(MISC)$/interlck_sparc.s
-    $(ASM) $(AFLAGS) -o $@ $<
-
-$(OBJ)$/interlck.o: $(MISC)$/interlck_sparc.s
-    $(ASM) $(AFLAGS) -o $@ $<
-
-$(MISC)$/interlck_sparc.s: asm/interlck_sparc.s
-    tr -d "\015" < $< > $@
-
-.ENDIF
-
-.IF "$(OS)$(CPU)"=="SOLARISI"
-
-$(SLO)$/interlck.obj: $(SLO)$/interlck.o
-    touch $(SLO)$/interlck.obj
-
-$(OBJ)$/interlck.obj: $(OBJ)$/interlck.o
-    touch $(OBJ)$/interlck.obj
-
-$(SLO)$/interlck.o: $(MISC)$/interlck_x86.s
-    $(ASM) $(AFLAGS) -o $@ $<
-
-$(OBJ)$/interlck.o: $(MISC)$/interlck_x86.s
-    $(ASM) $(AFLAGS) -o $@ $<
-
-$(MISC)$/interlck_x86.s: asm/interlck_x86.s
-    tr -d "\015" < $< > $@
-
-.ENDIF
diff --git a/sal/osl/w32/makefile.mk b/sal/osl/w32/makefile.mk
deleted file mode 100644
index 7b40397a3904..000000000000
--- a/sal/osl/w32/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=sal
-TARGET=cpposl
-ENABLE_EXCEPTIONS=TRUE
-USE_LDUMP2=TRUE
-
-MULTITHREAD_OBJ=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# Uncomment the following line if you want to compile with -Wall
-# it disables lots of unnecessary warnings comming from the Win32
-# header files (disabling warnings via command line only works with
-# MSVC >= 7.x)
-#
-# CFLAGS+=/wd4668 /wd4711 /wd4201 /wd4710 /wd4619 /wd4514 /wd4820
-
-# --- Files --------------------------------------------------------
-.IF "$(CCNUMVER)" >= "001400000000"
-CDEFS+=-D_CRT_NON_CONFORMING_SWPRINTFS
-.ENDIF
-
-.IF "$(header)" == ""
-
-SLOFILES=   $(SLO)$/conditn.obj  \
-            $(SLO)$/diagnose.obj \
-            $(SLO)$/dllentry.obj \
-            $(SLO)$/semaphor.obj \
-            $(SLO)$/socket.obj   \
-            $(SLO)$/interlck.obj \
-            $(SLO)$/nlsupport.obj\
-            $(SLO)$/mutex.obj    \
-            $(SLO)$/thread.obj   \
-            $(SLO)$/module.obj   \
-            $(SLO)$/process.obj  \
-            $(SLO)$/security.obj \
-            $(SLO)$/profile.obj  \
-            $(SLO)$/time.obj     \
-            $(SLO)$/signal.obj   \
-            $(SLO)$/pipe.obj     \
-            $(SLO)$/util.obj     \
-            $(SLO)$/file.obj\
-            $(SLO)$/file_dirvol.obj\
-            $(SLO)$/file_error.obj\
-            $(SLO)$/file_url.obj\
-            $(SLO)$/tempfile.obj\
-            $(SLO)$/path_helper.obj\
-            $(SLO)$/procimpl.obj \
-            $(SLO)$/salinit.obj
-
-OBJFILES=   $(OBJ)$/conditn.obj  \
-            $(OBJ)$/diagnose.obj \
-            $(OBJ)$/semaphor.obj \
-            $(OBJ)$/socket.obj   \
-            $(OBJ)$/interlck.obj \
-            $(OBJ)$/nlsupport.obj\
-            $(OBJ)$/mutex.obj    \
-            $(OBJ)$/thread.obj   \
-            $(OBJ)$/module.obj   \
-            $(OBJ)$/process.obj  \
-            $(OBJ)$/security.obj \
-            $(OBJ)$/profile.obj  \
-            $(OBJ)$/time.obj     \
-            $(OBJ)$/signal.obj   \
-            $(OBJ)$/pipe.obj     \
-            $(OBJ)$/util.obj     \
-            $(OBJ)$/file.obj\
-            $(OBJ)$/file_dirvol.obj\
-            $(OBJ)$/file_error.obj\
-            $(OBJ)$/file_url.obj\
-            $(OBJ)$/tempfile.obj\
-            $(OBJ)$/path_helper.obj\
-            $(OBJ)$/procimpl.obj \
-            $(OBJ)$/salinit.obj
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index f7f16ad12796..e9234c4e53da 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -1,34 +1,2 @@
 sa	sal	:	NATIVE:xml2cmp external BOOST:boost CPPUNIT:cppunit NULL
-sa	sal										usr1	-	all	sa_mkout NULL
-sa	sal\inc									nmake	-	all	sa_inc NULL
-sa	sal\typesconfig							nmake	-	all	sa_tc sa_inc NULL
-sa	sal\cpprt								nmake	-	u	sa_cpprt sa_util sa_inc NULL
-sa	sal\android								nmake	-	u	sa_android NULL
-sa	sal\rtl\source							nmake	-	all	sa_rtl sa_tc.u sa_inc NULL
-sa	sal\textenc								nmake	-	all	sa_textenc sa_tc.u sa_inc NULL
-sa	sal\systools\win32\uwinapi				nmake	-	n	sa_uwinapi sa_inc NULL
-sa	sal\systools\win32\onlineupdate			nmake	-	n	sa_onlineupdate sa_uwinapi.n sa_inc NULL
-sa	sal\osl\w32								nmake	-	n	sa_osln sa_inc NULL
-sa  sal\qa                                  nmake   -   all sa_qa sa_util NULL
-sa	sal\osl\unx								nmake	-	u	sa_oslu sa_android.u sa_tc.u sa_inc NULL
-sa	sal\osl\all								nmake	-	all	sa_oslall sa_tc.u sa_inc NULL
-sa	sal\util								nmake	-	all	sa_util sa_tc.u sa_oslall sa_uwinapi.n sa_onlineupdate.n sa_osln.n sa_oslu.u sa_rtl sa_textenc NULL
-sa sal\util\sal_textenc nmake - all sa_util_saltextenc sa_util NULL
-sa sal\cppunittester nmake - all sa_cppunittester sa_cpprt.u sa_util NULL
-sa sal\qa\ByteSequence nmake - all sa_qa_ByteSequence sa_cppunittester sa_util_saltextenc NULL
-sa sal\qa\OStringBuffer nmake - all sa_qa_OStringBuffer sa_cppunittester sa_util_saltextenc NULL
-sa sal\qa\osl\getsystempathfromfileurl nmake - all sa_qa_osl_getsystempathfromfileurl sa_cppunittester sa_util_saltextenc NULL
-sa sal\qa\osl\file nmake - u sa_qa_osl_file sa_cppunittester sa_util_saltextenc NULL
-sa sal\qa\osl\module nmake - u sa_qa_osl_module sa_cppunittester sa_util_saltextenc NULL
-sa sal\qa\osl\condition nmake - all sa_qa_osl_condition sa_cppunittester sa_util_saltextenc NULL
-sa sal\qa\osl\security nmake - all sa_qa_osl_security sa_cppunittester sa_util_saltextenc NULL
-sa sal\qa\osl\process nmake - all sa_qa_osl_process sa_cppunittester sa_util_saltextenc NULL
-sa sal\qa\rtl\strings nmake - all sa_qa_rt_strings sa_cppunittester sa_util_saltextenc NULL
-sa sal\qa\rtl\oustringbuffer nmake - all sa_qa_rt_oustringbuffer sa_cppunittester sa_util_saltextenc NULL
-sa sal\qa\rtl\alloc nmake - all sa_qa_rt_alloc sa_cppunittester sa_util_saltextenc NULL
-sa sal\qa\rtl\crc32 nmake - all sa_qa_rtl_crc32 sa_cppunittester sa_util_saltextenc NULL
-sa sal\qa\rtl\cipher nmake - all sa_qa_rtl_cipher sa_cppunittester sa_util_saltextenc NULL
-sa sal\qa\rtl\doublelock nmake - all sa_qa_rtl_doublelock sa_cppunittester sa_util_saltextenc NULL
-sa sal\qa\rtl\locale nmake - all sa_qa_rtl_locale sa_cppunittester sa_util_saltextenc NULL
-sa sal\qa\sal nmake - all sa_qa_sal sa_cppunittester sa_util_saltextenc NULL
-sa sal\qa\static nmake - u sal_qa_static sa_qa_ByteSequence sa_qa_OStringBuffer sa_qa_osl_file.u sa_qa_osl_condition sa_qa_osl_security sa_qa_rt_alloc sa_qa_rtl_crc32 sa_qa_rtl_cipher sa_qa_rtl_doublelock sa_qa_rtl_locale sa_qa_sal NULL
+sa	sal\prj				nmake	-	all	sa_prj NULL
diff --git a/sal/prj/d.lst b/sal/prj/d.lst
index 1d73422d2fae..e69de29bb2d1 100644
--- a/sal/prj/d.lst
+++ b/sal/prj/d.lst
@@ -1,47 +0,0 @@
-mkdir: %_DEST%\bin\cppunit
-mkdir: %_DEST%\inc\cppunittester
-mkdir: %_DEST%\inc\sal
-mkdir: %_DEST%\inc\sal\detail
-mkdir: %_DEST%\inc\osl
-mkdir: %_DEST%\inc\rtl
-mkdir: %_DEST%\inc\systools
-mkdir: %_DEST%\inc\systools\win32
-
-..\inc\cppunittester\protectorfactory.hxx %_DEST%\inc\protectorfactory.hxx
-..\%__SRC%\inc\rtlbootstrap.mk %_DEST%\inc\rtlbootstrap.mk
-..\inc\sal\*.h %_DEST%\inc\sal\*.h
-..\inc\sal\log.hxx %_DEST%\inc\sal\log.hxx
-..\inc\sal\precppunit.hxx %_DEST%\inc\sal\precppunit.hxx
-..\inc\sal\detail\log.h %_DEST%\inc\sal\detail\log.h
-..\%__SRC%\inc\sal\typesizes.h %_DEST%\inc\sal\typesizes.h
-..\inc\osl\*.h %_DEST%\inc\osl\*.h
-..\inc\osl\*.hxx %_DEST%\inc\osl\*.hxx
-..\inc\rtl\*.h %_DEST%\inc\rtl\*.h
-..\inc\rtl\*.hxx %_DEST%\inc\rtl\*.hxx
-..\inc\systools\win32\*.h %_DEST%\inc\systools\win32\*.h
-..\inc\systools\win32\*.hxx %_DEST%\inc\systools\win32\*.hxx
-
-..\%__SRC%\lib\libuno_sal.so.3 %_DEST%\lib\libuno_sal.so.3
-symlink: %_DEST%\lib\libuno_sal.so.3 %_DEST%\lib\libuno_sal.so
-..\%__SRC%\lib\libuno_sal.so %_DEST%\lib\libuno_sal.so
-..\%__SRC%\lib\libuno_sal.dylib.3 %_DEST%\lib\libuno_sal.dylib.3
-symlink: %_DEST%\lib\libuno_sal.dylib.3 %_DEST%\lib\libuno_sal.dylib
-..\%__SRC%\lib\libsal_textenc.so %_DEST%\lib\libsal_textenc.so
-..\%__SRC%\lib\libsal_textenc.dylib %_DEST%\lib\libsal_textenc.dylib
-..\%__SRC%\lib\*.sl %_DEST%\lib\*.sl
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-
-..\%__SRC%\lib\liblo-bootstrap.so %_DEST%\lib\liblo-bootstrap.so
-
-..\%__SRC%\slb\sal.lib %_DEST%\lib\xsal.lib
-
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
-..\%__SRC%\bin\*.bin %_DEST%\bin\*.bin
-..\%__SRC%\misc\*.hid %_DEST%\bin\*.hid
-..\%__SRC%\bin\*.res %_DEST%\bin\*.res
-
-..\%__SRC%\inc\udkversion.h %_DEST%\inc\sal\udkversion.h
-
-..\%__SRC%\bin\cppunittester.exe %_DEST%\bin\cppunit\cppunittester.exe
-..\%__SRC%\bin\cppunittester %_DEST%\bin\cppunit\cppunittester
diff --git a/sal/prj/makefile.mk b/sal/prj/makefile.mk
new file mode 100644
index 000000000000..0997622e00f6
--- /dev/null
+++ b/sal/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/sal/rtl/source/makefile.mk b/sal/rtl/source/makefile.mk
deleted file mode 100644
index 83cb0ed23df2..000000000000
--- a/sal/rtl/source/makefile.mk
+++ /dev/null
@@ -1,126 +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=sal
-TARGET=cpprtl
-ENABLE_EXCEPTIONS=TRUE
-USE_LDUMP2=TRUE
-
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.IF "$(VALGRIND_CFLAGS)" != ""
-CFLAGS += $(VALGRIND_CFLAGS)
-CDEFS  += -DHAVE_MEMCHECK_H=1
-.ENDIF # VALGRIND_CFLAGS
-
-.IF "$(ALLOC)" == "SYS_ALLOC" || "$(ALLOC)" == "TCMALLOC" || "$(ALLOC)" == "JEMALLOC"
-CDEFS+= -DFORCE_SYSALLOC
-.ENDIF
-
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
-
-# --- Files --------------------------------------------------------
-
-.IF "$(header)" == ""
-
-SLOFILES=   \
-            $(SLO)$/memory.obj      \
-            $(SLO)$/cipher.obj      \
-            $(SLO)$/crc.obj         \
-            $(SLO)$/digest.obj      \
-            $(SLO)$/random.obj      \
-            $(SLO)$/locale.obj      \
-            $(SLO)$/strimp.obj      \
-            $(SLO)$/hash.obj        \
-            $(SLO)$/string.obj      \
-            $(SLO)$/ustring.obj     \
-            $(SLO)$/strbuf.obj      \
-            $(SLO)$/ustrbuf.obj     \
-            $(SLO)$/uuid.obj        \
-            $(SLO)$/rtl_process.obj \
-            $(SLO)$/byteseq.obj     \
-            $(SLO)$/uri.obj			\
-            $(SLO)$/bootstrap.obj  	\
-            $(SLO)$/cmdargs.obj		\
-            $(SLO)$/unload.obj		\
-            $(SLO)$/logfile.obj     \
-            $(SLO)$/math.obj        \
-            $(SLO)$/alloc_global.obj\
-            $(SLO)$/alloc_cache.obj \
-            $(SLO)$/alloc_arena.obj \
-            $(SLO)$/alloc_fini.obj
-
-OBJFILES=   \
-            $(OBJ)$/memory.obj      \
-            $(OBJ)$/cipher.obj      \
-            $(OBJ)$/crc.obj         \
-            $(OBJ)$/digest.obj      \
-            $(OBJ)$/random.obj      \
-            $(OBJ)$/locale.obj      \
-            $(OBJ)$/strimp.obj      \
-            $(OBJ)$/hash.obj        \
-            $(OBJ)$/string.obj      \
-            $(OBJ)$/ustring.obj     \
-            $(OBJ)$/strbuf.obj      \
-            $(OBJ)$/ustrbuf.obj     \
-            $(OBJ)$/uuid.obj        \
-            $(OBJ)$/rtl_process.obj \
-            $(OBJ)$/byteseq.obj     \
-            $(OBJ)$/uri.obj			\
-            $(OBJ)$/bootstrap.obj  	\
-            $(OBJ)$/cmdargs.obj		\
-            $(OBJ)$/unload.obj		\
-            $(OBJ)$/logfile.obj     \
-            $(OBJ)$/math.obj \
-            $(OBJ)$/alloc_global.obj\
-            $(OBJ)$/alloc_cache.obj \
-            $(OBJ)$/alloc_arena.obj \
-            $(OBJ)$/alloc_fini.obj
-
-.ENDIF
-
-# --- Makefile snippet  --------------------------------------------
-
-# used by e.g. update info file
-BOOTSTRAPMK = $(OUT)$/inc$/rtlbootstrap.mk
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-ALLTAR : $(BOOTSTRAPMK)
-
-$(BOOTSTRAPMK) :
-    (echo '#include "macro.hxx"'; echo RTL_OS:=THIS_OS; echo RTL_ARCH:=THIS_ARCH) >$(BOOTSTRAPMK).cxx
-    $(CXX) -E $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(BOOTSTRAPMK).cxx | $(GREP) '^RTL_' | $(SED) -e 's/"//g' >$@
diff --git a/sal/systools/win32/uwinapi/makefile.mk b/sal/systools/win32/uwinapi/makefile.mk
deleted file mode 100644
index 0989b6121135..000000000000
--- a/sal/systools/win32/uwinapi/makefile.mk
+++ /dev/null
@@ -1,86 +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=sal
-TARGET=uwinapi
-
-USE_DEFFILE=TRUE
-LIBTARGET=NO
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
-
-# --- Targets ----------------------------------
-
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-CFLAGSCXX+=-Wno-unused-parameter -Wno-return-type
-.ENDIF
-
-SLOFILES=\
-        $(SLO)$/snprintf.obj\
-        $(SLO)$/snwprintf.obj
-
-SHL1TARGET=$(TARGET)
-SHL1IMPLIB=$(SHL1TARGET)
-SHL1DEF=$(MISC)/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-DEF1DEPN=\
-        $(DEF1EXPORTFILE)\
-        makefile.mk
-
-SHL1OBJS=$(SLOFILES)
-
-#No default libraries
-STDSHL=
-
-.IF "$(COM)"=="GCC"
-SHL1STDLIBS=\
-        -lmingw32 \
-        $(MINGW_LIBGCC)
-MINGWSSTDOBJ=
-MINGWSSTDENDOBJ=
-.ENDIF
-
-SHL1STDLIBS+=\
-        $(KERNEL32LIB)\
-        $(USER32LIB)\
-        $(ADVAPI32LIB)\
-        $(VERSIONLIB)\
-        $(LIBCMT)\
-        $(SHLWAPILIB)
-
-
-.ENDIF
-
-.INCLUDE : target.mk
diff --git a/sal/textenc/makefile.mk b/sal/textenc/makefile.mk
deleted file mode 100644
index 09bf20841e71..000000000000
--- a/sal/textenc/makefile.mk
+++ /dev/null
@@ -1,111 +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 = sal
-TARGET = textenc
-LIBTARGET=NO
-
-.INCLUDE: settings.mk
-
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
-
-SAL_OBJECTS = \
-    $(SLO)$/tencinfo.obj \
-    $(SLO)$/textcvt.obj \
-    $(SLO)$/textenc.obj
-
-SAL_COMMON_OBJECTS = \
-    $(SLO)$/context.obj \
-    $(SLO)$/convertbig5hkscs.obj \
-    $(SLO)$/converter.obj \
-    $(SLO)$/converteuctw.obj \
-    $(SLO)$/convertgb18030.obj \
-    $(SLO)$/convertiso2022cn.obj \
-    $(SLO)$/convertiso2022jp.obj \
-    $(SLO)$/convertiso2022kr.obj \
-    $(SLO)$/convertsinglebytetobmpunicode.obj \
-    $(SLO)$/tcvtbyte.obj \
-    $(SLO)$/tcvtmb.obj \
-    $(SLO)$/tcvtutf7.obj \
-    $(SLO)$/tcvtutf8.obj \
-    $(SLO)$/tenchelp.obj \
-    $(SLO)$/unichars.obj
-
-SAL_TABLES_OBJECTS = \
-    $(SLO)$/tables.obj
-
-SLOFILES = $(SAL_OBJECTS) $(SAL_COMMON_OBJECTS) $(SAL_TABLES_OBJECTS)
-
-SAL_OBJFILES = \
-    $(OBJ)$/tencinfo.obj \
-    $(OBJ)$/textcvt.obj \
-    $(OBJ)$/textenc.obj
-
-SAL_COMMON_OBJFILES = \
-    $(OBJ)$/context.obj \
-    $(OBJ)$/convertbig5hkscs.obj \
-    $(OBJ)$/converter.obj \
-    $(OBJ)$/converteuctw.obj \
-    $(OBJ)$/convertgb18030.obj \
-    $(OBJ)$/convertiso2022cn.obj \
-    $(OBJ)$/convertiso2022jp.obj \
-    $(OBJ)$/convertiso2022kr.obj \
-    $(OBJ)$/convertsinglebytetobmpunicode.obj \
-    $(OBJ)$/tcvtbyte.obj \
-    $(OBJ)$/tcvtmb.obj \
-    $(OBJ)$/tcvtutf7.obj \
-    $(OBJ)$/tcvtutf8.obj \
-    $(OBJ)$/tenchelp.obj \
-    $(OBJ)$/unichars.obj
-
-SAL_TABLES_OBJFILES = \
-    $(OBJ)$/tables.obj
-
-OBJFILES = $(SAL_OBJFILES) $(SAL_COMMON_OBJFILES) $(SAL_TABLES_OBJFILES)
-
-# Optimization off on Solaris Intel due to internal compiler error; to be
-# reevaluated after compiler upgrade:
-.IF "$(OS)$(CPU)" == "SOLARISI"
-
-NOOPTFILES = \
-    $(OBJ)$/textenc.obj \
-    $(SLO)$/textenc.obj \
-    $(OBJ)$/tables.obj \
-    $(SLO)$/tables.obj
-
-.ENDIF # OS, CPU, SOLARISI
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1OBJFILES= $(SAL_OBJECTS) $(SAL_COMMON_OBJECTS)
-OBJTARGET=$(LB)$/$(TARGET).lib
-
-LIB2TARGET= $(SLB)$/textenc_tables.lib
-LIB2OBJFILES= $(SAL_TABLES_OBJECTS) $(SAL_COMMON_OBJECTS)
-
-.INCLUDE: target.mk
diff --git a/sal/typesconfig/makefile.mk b/sal/typesconfig/makefile.mk
deleted file mode 100644
index 662bd7d7e186..000000000000
--- a/sal/typesconfig/makefile.mk
+++ /dev/null
@@ -1,91 +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=sal
-TARGET=typesconfig
-TARGETTYPE=CUI
-
-LIBSALCPPRT=$(0)
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
-
-# --- Files --------------------------------------------------------
-
-.IF "$(CROSS_COMPILING)"!="YES" && "$(COM)"!="MSC"
-
-APP1TARGET=	$(TARGET)
-APP1OBJS=		$(OBJ)$/typesconfig.obj
-APP1STDLIBS=
-APP1DEF=
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(L10N-framework)"==""
-.IF "$(COM)"!="MSC"
-ALLTAR : $(INCCOM)$/sal$/typesizes.h
-.ENDIF
-.ENDIF			# "$(L10N-framework)"==""
-
-.IF "$(CROSS_COMPILING)"!="YES"
-
-$(INCCOM)$/sal$/typesizes.h : $(BIN)$/$(TARGET)
-    -$(MKDIR) $(INCCOM)$/sal
-    $(AUGMENT_LIBRARY_PATH) $(BIN)$/$(TARGET) $@
-
-.ELSE
-
-$(INCCOM)$/sal$/typesizes.h : 
-    -$(MKDIRHIER) $(INCCOM)$/sal
-    echo '/* This file is autogenerated from configure script data */' >$@
-    echo >>$@
-    echo "#define SAL_TYPES_ALIGNMENT2	$(ALIGNOF_SHORT)" >>$@
-    echo "#define SAL_TYPES_ALIGNMENT4	$(ALIGNOF_INT)" >>$@
-.IF "$(SIZEOF_LONG)"=="8"
-    echo "#define SAL_TYPES_ALIGNMENT8	$(ALIGNOF_LONG)" >>$@
-.ELIF "$(SIZEOF_DOUBLE)"=="8"
-    echo "#define SAL_TYPES_ALIGNMENT8	$(ALIGNOF_DOUBLE)" >>$@
-.ELSE
-    echo "#error alignment of some 8-byte type unknown" >>$@
-.ENDIF
-    echo "#define SAL_TYPES_SIZEOFSHORT	$(SIZEOF_SHORT)" >>$@
-    echo "#define SAL_TYPES_SIZEOFINT	$(SIZEOF_INT)" >>$@
-    echo "#define SAL_TYPES_SIZEOFLONG	$(SIZEOF_LONG)" >>$@
-    echo "#define SAL_TYPES_SIZEOFLONGLONG	$(SIZEOF_LONGLONG)" >>$@
-    echo "#define SAL_TYPES_SIZEOFPOINTER	$(SIZEOF_POINTER)" >>$@
-
-.ENDIF
diff --git a/sal/unosdk.mk b/sal/unosdk.mk
deleted file mode 100644
index 765ecfc3f1b1..000000000000
--- a/sal/unosdk.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.
-#
-#*************************************************************************
-
-PPATH=inc
-
-FILES= \
-    $(PPATH)\rtl\wstring 	\
-    $(PPATH)\rtl\wstring.h 	\
-    $(PPATH)\rtl\wstring.hxx \
-    $(PPATH)\rtl\string.h 	\
-    $(PPATH)\rtl\string.hxx 	\
-    $(PPATH)\rtl\wstrbuf.hxx \
-    $(PPATH)\rtl\strbuf.hxx 	\
-    $(PPATH)\rtl\locale.h 	\
-    $(PPATH)\rtl\locale.hxx \
-    $(PPATH)\rtl\char.h 		\
-    $(PPATH)\rtl\char.hxx 	\
-    $(PPATH)\rtl\macros.hxx \
-    $(PPATH)\rtl\object.h 	\
-    $(PPATH)\rtl\rb.h 
-
-unosdk: $(FILES)
-     docpp -H -m -f  -u -d ..\..\doc\sal\rtl $(FILES)
diff --git a/sal/util/Makefile b/sal/util/Makefile
new file mode 100644
index 000000000000..78986f793cb6
--- /dev/null
+++ b/sal/util/Makefile
@@ -0,0 +1,78 @@
+# -*- 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) 2011 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+gb_PARTIALBUILD:=T
+include $(GBUILDDIR)/gbuild_simple.mk
+
+all: rtlbootstrap.mk $(if $(filter-out $(COM),MSC),sal/typesizes.h) sal/udkversion.h sal
+
+sal:
+	mkdir sal
+
+rtlbootstrap.mk:
+	(echo '#include "macro.hxx"'; echo RTL_OS:=THIS_OS; echo RTL_ARCH:=THIS_ARCH) > bootstrap.cxx
+	$(CXX) -E $(gb_OSDEFS) -D$(CPUNAME) -I. -I$(SRCDIR)/sal/rtl/source -I$(SRCDIR)/sal/inc bootstrap.cxx | grep '^RTL_' | sed -e 's/"//g' > $@
+
+sal/typesizes.h: sal
+ifneq ($(CROSS_COMPILING),YES)
+	$(gb_Helper_execute)typesconfig $@ > /dev/null
+
+else
+	echo '/* This file is autogenerated from configure script data */' > $@
+	echo >> $@
+	echo "#define SAL_TYPES_ALIGNMENT2	$(ALIGNOF_SHORT)" >> $@
+	echo "#define SAL_TYPES_ALIGNMENT4	$(ALIGNOF_INT)" >> $@
+ifeq ($(SIZEOF_LONG),8)
+	echo "#define SAL_TYPES_ALIGNMENT8	$(ALIGNOF_LONG)" >> $@
+else ifeq ($(SIZEOF_DOUBLE),8)
+	echo "#define SAL_TYPES_ALIGNMENT8	$(ALIGNOF_DOUBLE)" >> $@
+else
+	echo "#error alignment of some 8-byte type unknown" >> $@
+endif
+	echo "#define SAL_TYPES_SIZEOFSHORT	$(SIZEOF_SHORT)" >> $@
+	echo "#define SAL_TYPES_SIZEOFINT	$(SIZEOF_INT)" >> $@
+	echo "#define SAL_TYPES_SIZEOFLONG	$(SIZEOF_LONG)" >> $@
+	echo "#define SAL_TYPES_SIZEOFLONGLONG	$(SIZEOF_LONGLONG)" >> $@
+	echo "#define SAL_TYPES_SIZEOFPOINTER	$(SIZEOF_POINTER)" >> $@
+
+endif
+
+include $(SRCDIR)/solenv/inc/udkversion.mk
+
+sal/udkversion.h: sal
+	echo '#ifndef _SAL_UDKVERSION_H_'           >  $@
+	echo '#define _SAL_UDKVERSION_H_'           >> $@
+	echo ''                                     >> $@
+	echo '#define SAL_UDK_MAJOR "$(UDK_MAJOR)"' >> $@
+	echo '#define SAL_UDK_MINOR "$(UDK_MINOR)"' >> $@
+	echo '#define SAL_UDK_MICRO "$(UDK_MICRO)"' >> $@
+	echo ''                                     >> $@
+	echo '#endif'                               >> $@
+
+.DEFAULT_GOAL := all
+.PHONY: all
+# vim: set noet sw=4 ts=4:
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk
deleted file mode 100644
index 1696d5e01d1f..000000000000
--- a/sal/util/makefile.mk
+++ /dev/null
@@ -1,177 +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=sal
-TARGET=sal
-
-NO_DEFAULT_STL=TRUE
-
-USE_LDUMP2=TRUE
-USE_DEFFILE=TRUE
-
-.IF "$(GUI)"=="UNX"
-TARGETTYPE=CUI
-.ENDIF # UNX
-
-UNIXVERSIONNAMES=UDK
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
-
-.IF "$(depend)" == ""
-
-# --- Files --------------------------------------------------------
-
-# disable check for PIC code as it would complain about 
-# hand coded assembler
-CHECKFORPIC=
-
-.IF "$(header)" == ""
-
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1FILES=	\
-    $(SLB)$/oslall.lib	\
-    $(SLB)$/cpposl.lib	\
-    $(SLB)$/cpprtl.lib	\
-    $(SLB)$/textenc.lib 
-
-.IF "$(COM)" == "MSC"
-SHL1TARGET= $(TARGET)
-SHL1IMPLIB= i$(TARGET)
-.ELSE
-SHL1TARGET= uno_$(TARGET)
-SHL1IMPLIB= uno_$(TARGET)
-.ENDIF
-SHL1VERSIONMAP=	$(TARGET).map
-SHL1RPATH=URELIB
-
-.IF "$(GUI)"=="WNT"
-
-.IF "$(COM)"=="GCC"
-UWINAPILIB=     -luwinapi
-.ELSE
-UWINAPILIB=     $(LB)$/uwinapi.lib
-.ENDIF
-
-SHL1STDLIBS=	\
-                $(UWINAPILIB)\
-                $(ADVAPI32LIB)\
-                $(WS2_32LIB)\
-                $(MPRLIB)\
-                $(SHELL32LIB)\
-                $(COMDLG32LIB)\
-                $(USER32LIB)\
-                $(OLE32LIB)
-.IF "$(COM)"=="GCC"
-MINGWSSTDOBJ=
-MINGWSSTDENDOBJ=
-.ENDIF
-.ENDIF # WNT
-
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="SOLARIS"
-# libposix4.so (SunOS 5.6) <-> librt.so (SunOS >= 5.7)
-SHL1STDLIBS= -Bdynamic -ldl -lpthread -lposix4 -lsocket -lnsl
-.IF "$(COM)" == "C50"
-SHL1STDLIBS+= -z allextract -staticlib=Crun -z defaultextract
-.ENDIF # C50
-.ENDIF # SOLARIS
-.ENDIF # UNX
-
-.IF "$(OS)"=="MACOSX"
-SHL1STDLIBS+=-framework CoreFoundation -framework Carbon
-.ENDIF
-
-.IF "$(OS)" == "ANDROID"
-SHL1STDLIBS+=-llo-bootstrap
-.ENDIF
-
-SHL1LIBS+=$(SLB)$/$(TARGET).lib
-
-.IF "$(linkinc)" != ""
-SHL11FILE=$(MISC)$/sal.slo
-.ELSE
-.IF "$(GUI)"=="UNX"
-SHL1OBJS=
-.ELSE
-.IF "$(GUI)$(COM)"!="WNTGCC"
-SHL1OBJS= \
-    $(SLO)$/dllentry.obj
-.ENDIF # WNTGCC
-.ENDIF # UNX
-.ENDIF # lincinc
-
-SHL1DEPN=
-SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-
-# --- Coverage -----------------------------------------------------
-# LLA: 20040304 The follows lines are an additional which is only need if we run
-#               coverage tests. For normal test runs this feature is not used.
-#               For more information about coverage tests see:
-#               http://gcc.gnu.org/onlinedocs/gcc-3.0/gcc_8.html
-#
-#               Why this additional?
-#               Anybody has decide to link sal with g++ instead of gcc.
-#
-.IF "$(TESTCOVERAGE)"!=""
-.IF "$(GUI)"=="UNX"
-.IF "$(COM)"=="GCC"
-.IF "$(OS)"=="LINUX"
-SHL1STDLIBS+=-lgcc
-.ENDIF
-.ENDIF
-.ENDIF
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.ENDIF # $(header) != ""
-.ENDIF # $(depend) != ""
-
-.INCLUDE :  target.mk
-
-.IF "$(SHL1TARGETN)" != ""
-$(SHL1TARGETN) : $(OUT)$/inc$/udkversion.h
-.ENDIF # "$(SHL1TARGETN)" != ""
-
-$(OUT)$/inc$/udkversion.h: 
-    echo '#ifndef _SAL_UDKVERSION_H_'           >  $@
-    echo '#define _SAL_UDKVERSION_H_'           >> $@
-    echo ''                                     >> $@
-    echo '#define SAL_UDK_MAJOR "$(UDK_MAJOR)"' >> $@
-    echo '#define SAL_UDK_MINOR "$(UDK_MINOR)"' >> $@
-    echo '#define SAL_UDK_MICRO "$(UDK_MICRO)"' >> $@
-    echo ''                                     >> $@
-    echo '#endif'                               >> $@
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 797c1a25c576..797c1a25c576 100755..100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
diff --git a/sal/version.mk b/sal/version.mk
deleted file mode 100644
index 9d5fa163fbcf..000000000000
--- a/sal/version.mk
+++ /dev/null
@@ -1,40 +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.
-#
-#*************************************************************************
-
-# target
-SAL_TARGET=sal
-
-# major 
-SAL_MAJOR=2
-# minor 
-SAL_MINOR=0
-# micro 
-SAL_MICRO=0
-
-# this is a c compatible library 
-SAL_CPP=0
-
author	Matúš Kukan <matus.kukan@gmail.com>	2011-12-17 13:13:11 +0100
committer	Matúš Kukan <matus.kukan@gmail.com>	2011-12-19 10:14:53 +0100
commit	a9e130ab82f3216334e432e9d6ee19a600b6c287 (patch)
tree	e36f219b5e5b854335657dc57410bb401b9e3ec1 /sal
parent	d899f976ee0f4d1058f1adc94853df94a3c6eaea (diff)