convert package to gbuild

24 files changed, 301 insertions, 366 deletions

diff --git a/package/Library_package2.mk b/package/Library_package2.mk
new file mode 100644
index 000000000000..3f36f5573cb2
--- /dev/null
+++ b/package/Library_package2.mk
@@ -0,0 +1,100 @@
+# -*- 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.
+#
+# The Initial Developer of the Original Code is
+#       Matúš Kukan <matus.kukan@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,package2))
+
+$(eval $(call gb_Library_add_package_headers,package2,package_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,package2,$(SRCDIR)/package/inc/pch/precompiled_package))
+
+$(eval $(call gb_Library_set_componentfile,package2,package/util/package2))
+
+$(eval $(call gb_Library_set_include,package2,\
+	$$(INCLUDE) \
+	-I$(realpath $(SRCDIR)/package/inc) \
+	-I$(realpath $(SRCDIR)/package/inc/pch) \
+))
+
+$(eval $(call gb_Library_add_api,package2,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_add_defs,package2,\
+	-DDLLIMPLEMENTATION_PACKAGE \
+))
+
+$(eval $(call gb_Library_add_linked_libs,package2,\
+	comphelper \
+	cppu \
+	cppuhelper \
+	sal \
+	ucbhelper \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_use_externals,package2,\
+	zlib \
+))
+
+$(eval $(call gb_Library_add_exception_objects,package2,\
+	package/source/manifest/Base64Codec \
+	package/source/manifest/ManifestExport \
+	package/source/manifest/ManifestImport \
+	package/source/manifest/ManifestReader \
+	package/source/manifest/ManifestWriter \
+	package/source/manifest/UnoRegister \
+	package/source/zipapi/blowfishcontext \
+	package/source/zipapi/ByteChucker \
+	package/source/zipapi/ByteGrabber \
+	package/source/zipapi/CRC32 \
+	package/source/zipapi/Deflater \
+	package/source/zipapi/Inflater \
+	package/source/zipapi/sha1context \
+	package/source/zipapi/XUnbufferedStream \
+	package/source/zipapi/ZipEnumeration \
+	package/source/zipapi/ZipFile \
+	package/source/zipapi/ZipOutputStream \
+	package/source/zippackage/wrapstreamforshare \
+	package/source/zippackage/zipfileaccess \
+	package/source/zippackage/ZipPackageBuffer \
+	package/source/zippackage/ZipPackage \
+	package/source/zippackage/ZipPackageEntry \
+	package/source/zippackage/ZipPackageFolder \
+	package/source/zippackage/ZipPackageFolderEnumeration \
+	package/source/zippackage/ZipPackageSink \
+	package/source/zippackage/ZipPackageStream \
+))
+
+ifeq ($(SYSTEM_ZLIB),YES)
+$(eval $(call gb_Library_add_defs,package2,\
+	-DSYSTEM_ZLIB \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/package/Library_xstor.mk b/package/Library_xstor.mk
new file mode 100644
index 000000000000..50a28edcb9e7
--- /dev/null
+++ b/package/Library_xstor.mk
@@ -0,0 +1,67 @@
+# -*- 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.
+#
+# The Initial Developer of the Original Code is
+#       Matúš Kukan <matus.kukan@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,xstor))
+
+$(eval $(call gb_Library_add_precompiled_header,xstor,$(SRCDIR)/package/inc/pch/precompiled_package))
+
+$(eval $(call gb_Library_set_componentfile,xstor,package/source/xstor/xstor))
+
+$(eval $(call gb_Library_set_include,xstor,\
+	$$(INCLUDE) \
+	-I$(realpath $(SRCDIR)/package/inc) \
+	-I$(realpath $(SRCDIR)/package/inc/pch) \
+))
+
+$(eval $(call gb_Library_add_api,xstor,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xstor,\
+	comphelper \
+	cppu \
+	cppuhelper \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xstor,\
+	package/source/xstor/disposelistener \
+	package/source/xstor/ocompinstream \
+	package/source/xstor/ohierarchyholder \
+	package/source/xstor/oseekinstream \
+	package/source/xstor/owriteablestream \
+	package/source/xstor/register \
+	package/source/xstor/selfterminatefilestream \
+	package/source/xstor/switchpersistencestream \
+	package/source/xstor/xfactory \
+	package/source/xstor/xstorage \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/package/source/manifest/makefile.mk b/package/Makefile
index abc61848fc45..a1b344d72564 100644
--- a/package/source/manifest/makefile.mk
+++ b/package/Makefile
@@ -1,8 +1,9 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,31 +26,14 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
-PRJNAME=package
-TARGET=manifest
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-
-SLOFILES= \
-        $(SLO)$/ManifestReader.obj	\
-        $(SLO)$/ManifestWriter.obj \
-        $(SLO)$/ManifestImport.obj \
-        $(SLO)$/ManifestExport.obj \
-        $(SLO)$/Base64Codec.obj \
-        $(SLO)$/UnoRegister.obj
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-.ENDIF # L10N_framework
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-# --- Targets ------------------------------------------------------
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
-.INCLUDE : target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/package/Module_package.mk b/package/Module_package.mk
new file mode 100644
index 000000000000..0ed480bd415e
--- /dev/null
+++ b/package/Module_package.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.
+#
+# The Initial Developer of the Original Code is
+#       Matúš Kukan <matus.kukan@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,package))
+
+$(eval $(call gb_Module_add_targets,package,\
+	Library_package2 \
+	Library_xstor \
+	Package_dtd \
+	Package_inc \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/package/Package_dtd.mk b/package/Package_dtd.mk
new file mode 100644
index 000000000000..55414eecf6c5
--- /dev/null
+++ b/package/Package_dtd.mk
@@ -0,0 +1,33 @@
+# -*- 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.
+#
+# The Initial Developer of the Original Code is
+#       Matúš Kukan <matus.kukan@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,package_dtd,$(SRCDIR)/package/dtd))
+
+$(eval $(call gb_Package_add_file,package_dtd,bin/Manifest.dtd,Manifest.dtd))
+
+# vim: set noet sw=4 ts=4:
diff --git a/package/Package_inc.mk b/package/Package_inc.mk
new file mode 100644
index 000000000000..f85f4322d1bd
--- /dev/null
+++ b/package/Package_inc.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.
+#
+# The Initial Developer of the Original Code is
+#       Matúš Kukan <matus.kukan@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,package_inc,$(SRCDIR)/package/inc))
+
+$(eval $(call gb_Package_add_file,package_inc,inc/package/Deflater.hxx,package/Deflater.hxx))
+$(eval $(call gb_Package_add_file,package_inc,inc/package/Inflater.hxx,package/Inflater.hxx))
+$(eval $(call gb_Package_add_file,package_inc,inc/package/packagedllapi.hxx,package/packagedllapi.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index 05186c0abccf..bb348f3c3262 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -35,9 +35,9 @@
 #include <com/sun/star/xml/crypto/XCipherContext.hpp>
 #include <com/sun/star/xml/crypto/XDigestContext.hpp>
 
+#include <package/Inflater.hxx>
 #include <ByteGrabber.hxx>
 #include <HashMaps.hxx>
-#include <Inflater.hxx>
 #include <EncryptionData.hxx>
 
 #include <mutexholder.hxx>
diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx
index b5d6ee8b54f2..abd5efc31249 100644
--- a/package/inc/ZipOutputStream.hxx
+++ b/package/inc/ZipOutputStream.hxx
@@ -34,8 +34,8 @@
 #include <com/sun/star/xml/crypto/XCipherContext.hpp>
 #include <com/sun/star/xml/crypto/XDigestContext.hpp>
 
+#include <package/Deflater.hxx>
 #include <ByteChucker.hxx>
-#include <Deflater.hxx>
 #include <CRC32.hxx>
 
 #include <vector>
diff --git a/package/inc/Deflater.hxx b/package/inc/package/Deflater.hxx
index 6c1cf4456d30..6c1cf4456d30 100644
--- a/package/inc/Deflater.hxx
+++ b/package/inc/package/Deflater.hxx
diff --git a/package/inc/Inflater.hxx b/package/inc/package/Inflater.hxx
index f5241df133d2..f5241df133d2 100644
--- a/package/inc/Inflater.hxx
+++ b/package/inc/package/Inflater.hxx
diff --git a/package/inc/packagedllapi.hxx b/package/inc/package/packagedllapi.hxx
index 41e8efa4dae4..41e8efa4dae4 100644
--- a/package/inc/packagedllapi.hxx
+++ b/package/inc/package/packagedllapi.hxx
diff --git a/package/prj/build.lst b/package/prj/build.lst
index 6afa434558a4..e1a2c11e6e06 100644
--- a/package/prj/build.lst
+++ b/package/prj/build.lst
@@ -1,9 +1,2 @@
 pk	package	:	cppu cppuhelper comphelper ucbhelper sal ZLIB:zlib LIBXSLT:libxslt NULL
-pk	package									usr1	-	all	pk_mkout NULL
-pk	package\inc								nmake	-	all	pk_inc NULL
-pk	package\source\zipapi					nmake	-	all	pk_zipapi pk_inc NULL
-pk	package\source\zippackage				nmake	-	all	pk_zippackage pk_inc NULL
-pk	package\source\manifest					nmake	-	all	pk_manifest pk_inc NULL
-pk	package\source\xstor					nmake	-	all	pk_xstor pk_manifest pk_inc NULL
-pk	package\util							nmake	-	all	pk_util pk_zipapi pk_zippackage pk_manifest pk_xstor NULL
-
+pk	package\prj					nmake	-	all	pk_prj NULL
diff --git a/package/prj/d.lst b/package/prj/d.lst
index 7b3aff2482d8..e69de29bb2d1 100644
--- a/package/prj/d.lst
+++ b/package/prj/d.lst
@@ -1,12 +0,0 @@
-..\%__SRC%\misc\*.map %_DEST%\bin\*.map
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-..\dtd\*.dtd %_DEST%\bin\*.*
-..\%__SRC%\misc\package2.component %_DEST%\xml\package2.component
-..\%__SRC%\misc\xstor.component %_DEST%\xml\xstor.component
-..\inc\Inflater.hxx %_DEST%\inc\package\Inflater.hxx
-..\inc\Deflater.hxx %_DEST%\inc\package\Deflater.hxx
-..\inc\packagedllapi.hxx %_DEST%\inc\package\packagedllapi.hxx
diff --git a/package/inc/makefile.mk b/package/prj/makefile.mk
index 19d89678b0ae..85b25665cc83 100644
--- a/package/inc/makefile.mk
+++ b/package/prj/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # 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
@@ -24,24 +24,17 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..
-
-PRJNAME=package
-TARGET=inc
 
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
+PRJ=..
+TARGET=prj
 
-.INCLUDE :  target.mk
+.INCLUDE : settings.mk
 
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/package/source/xstor/makefile.mk b/package/source/xstor/makefile.mk
deleted file mode 100644
index 5c381ba4c803..000000000000
--- a/package/source/xstor/makefile.mk
+++ /dev/null
@@ -1,83 +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=package
-TARGET=xstor
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-
-SLOFILES =  \
-        $(SLO)$/ohierarchyholder.obj\
-        $(SLO)$/ocompinstream.obj\
-        $(SLO)$/oseekinstream.obj\
-        $(SLO)$/owriteablestream.obj\
-        $(SLO)$/xstorage.obj\
-        $(SLO)$/xfactory.obj\
-        $(SLO)$/disposelistener.obj\
-        $(SLO)$/selfterminatefilestream.obj\
-        $(SLO)$/switchpersistencestream.obj\
-        $(SLO)$/register.obj
-
-SHL1TARGET=$(TARGET)
-SHL1STDLIBS=\
-    $(SALLIB) 	\
-    $(CPPULIB)	\
-    $(CPPUHELPERLIB)	\
-    $(COMPHELPERLIB)
-
-SHL1OBJS=$(SLOFILES)
-SHL1DEF=$(MISC)$/$(TARGET).def
-
-SHL1IMPLIB=i$(SHL1TARGET)
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=$(SHL1TARGET).dxp
-
-.ENDIF # L10N_framework
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-ALLTAR : $(MISC)/xstor.component
-
-$(MISC)/xstor.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        xstor.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt xstor.component
diff --git a/package/source/xstor/xstor.dxp b/package/source/xstor/xstor.dxp
deleted file mode 100644
index 70033078921a..000000000000
--- a/package/source/xstor/xstor.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx
index 30318ce5c520..1e42bdbe3810 100644
--- a/package/source/zipapi/Deflater.cxx
+++ b/package/source/zipapi/Deflater.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_package.hxx"
-#include <Deflater.hxx>
+#include <package/Deflater.hxx>
 #ifndef _ZLIB_H
 #ifdef SYSTEM_ZLIB
 #include <zlib.h>
diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx
index 40d2bee99333..1438b69da378 100644
--- a/package/source/zipapi/Inflater.cxx
+++ b/package/source/zipapi/Inflater.cxx
@@ -28,7 +28,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_package.hxx"
-#include <Inflater.hxx>
+#include <package/Inflater.hxx>
 #ifndef _ZLIB_H
 #ifdef SYSTEM_ZLIB
 #include <zlib.h>
diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx
index 43a659485c24..796c6330a160 100644
--- a/package/source/zipapi/XUnbufferedStream.hxx
+++ b/package/source/zipapi/XUnbufferedStream.hxx
@@ -36,7 +36,7 @@
 
 #include <cppuhelper/implbase1.hxx>
 #include <rtl/ref.hxx>
-#include <Inflater.hxx>
+#include <package/Inflater.hxx>
 #include <ZipEntry.hxx>
 #include <CRC32.hxx>
 #include <mutexholder.hxx>
diff --git a/package/source/zipapi/makefile.mk b/package/source/zipapi/makefile.mk
deleted file mode 100644
index 8a07d448ddbb..000000000000
--- a/package/source/zipapi/makefile.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=package
-TARGET=zipapi
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/package.pmk
-
-# --- Files --------------------------------------------------------
-.IF "$(L10N_framework)"==""
-.IF "$(SYSTEM_ZLIB)" == "YES"
-CFLAGS+=-DSYSTEM_ZLIB
-.ENDIF
-
-SLOFILES= \
-        $(SLO)$/CRC32.obj			\
-        $(SLO)$/ByteChucker.obj		\
-        $(SLO)$/ByteGrabber.obj		\
-        $(SLO)$/blowfishcontext.obj	\
-        $(SLO)$/Inflater.obj		\
-        $(SLO)$/Deflater.obj		\
-        $(SLO)$/sha1context.obj		\
-        $(SLO)$/ZipEnumeration.obj	\
-        $(SLO)$/ZipFile.obj			\
-        $(SLO)$/ZipOutputStream.obj	\
-        $(SLO)$/XUnbufferedStream.obj
-
-.ENDIF # L10N_framework
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/package/source/zippackage/makefile.mk b/package/source/zippackage/makefile.mk
deleted file mode 100644
index c729b945f0df..000000000000
--- a/package/source/zippackage/makefile.mk
+++ /dev/null
@@ -1,58 +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=package
-TARGET=zippackage
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-
-SLOFILES= \
-        $(SLO)$/ZipPackage.obj			\
-        $(SLO)$/ZipPackageBuffer.obj	\
-        $(SLO)$/ZipPackageEntry.obj		\
-        $(SLO)$/ZipPackageFolder.obj	\
-        $(SLO)$/ZipPackageFolderEnumeration.obj	\
-        $(SLO)$/ZipPackageSink.obj		\
-        $(SLO)$/ZipPackageStream.obj	\
-        $(SLO)$/wrapstreamforshare.obj	\
-        $(SLO)$/zipfileaccess.obj
-
-.ENDIF # L10N_framework
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/package/util/exports.dxp b/package/util/exports.dxp
deleted file mode 100644
index 70033078921a..000000000000
--- a/package/util/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/package/util/makefile.mk b/package/util/makefile.mk
deleted file mode 100644
index cf94fe80ed61..000000000000
--- a/package/util/makefile.mk
+++ /dev/null
@@ -1,89 +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.
-#
-#*************************************************************************
-
-# 2 == Unicode
-MAJOR_VERSION=2
-
-PRJ=..
-PRJNAME=package
-TARGET=package
-
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-NO_BSYMBOLIC=TRUE
-
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.IF "$(L10N_framework)"==""
-
-# --- General ----------------------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1FILES=	\
-    $(SLB)$/zipapi.lib \
-    $(SLB)$/zippackage.lib \
-    $(SLB)$/manifest.lib
-
-# --- Shared-Library -----------------------------------------------
-
-SHL1TARGET=$(TARGET)$(MAJOR_VERSION)
-.IF "$(COM)" == "MSC"
-SHL1IMPLIB=i$(TARGET)
-.ELSE
-SHL1IMPLIB=$(TARGET)$(MAJOR_VERSION)
-.ENDIF
-SHL1USE_EXPORTS=name
-
-SHL1STDLIBS=\
-    $(CPPULIB)		\
-    $(UCBHELPERLIB)		\
-    $(CPPUHELPERLIB)	\
-    $(COMPHELPERLIB)		\
-    $(SALLIB)		\
-    $(ZLIB3RDLIB)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=$(LIB1TARGET)
-DEF1NAME=$(SHL1TARGET)
-
-.ENDIF # L10N_framework
-
-# --- Targets ----------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-ALLTAR : $(MISC)/package2.component
-
-$(MISC)/package2.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        package2.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt package2.component
diff --git a/package/util/package.pmk b/package/util/package.pmk
deleted file mode 100644
index 7d3d412b89a0..000000000000
--- a/package/util/package.pmk
+++ /dev/null
@@ -1,2 +0,0 @@
-VISIBILITY_HIDDEN = TRUE
-CDEFS += -DDLLIMPLEMENTATION_PACKAGE
\ No newline at end of file