[mq]: oox_gmake.patch [hg:d0beb4a8aa40]

21 files changed, 203 insertions, 1099 deletions

diff --git a/oox/source/core/makefile.mk b/oox/source/core/makefile.mk
deleted file mode 100755
index 2b58b95777df..000000000000
--- a/oox/source/core/makefile.mk
+++ /dev/null
@@ -1,66 +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=oox
-TARGET=core
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-.IF "$(SYSTEM_OPENSSL)" == "YES"
-CFLAGS+= $(OPENSSL_CFLAGS)
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/binarycodec.obj				\
-        $(SLO)$/binaryfilterbase.obj		\
-        $(SLO)$/contexthandler.obj			\
-        $(SLO)$/contexthandler2.obj			\
-        $(SLO)$/fastparser.obj				\
-        $(SLO)$/fasttokenhandler.obj		\
-        $(SLO)$/filterbase.obj				\
-        $(SLO)$/filterdetect.obj			\
-        $(SLO)$/fragmenthandler.obj			\
-        $(SLO)$/fragmenthandler2.obj		\
-        $(SLO)$/recordparser.obj			\
-        $(SLO)$/relations.obj				\
-        $(SLO)$/relationshandler.obj		\
-        $(SLO)$/services.obj				\
-        $(SLO)$/xmlfilterbase.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/oox/source/docprop/makefile.mk b/oox/source/docprop/makefile.mk
deleted file mode 100755
index 5687178da9e0..000000000000
--- a/oox/source/docprop/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=oox
-TARGET=docprop
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/ooxmldocpropimport.obj				\
-        $(SLO)$/docprophandler.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/oox/source/drawingml/chart/makefile.mk b/oox/source/drawingml/chart/makefile.mk
deleted file mode 100755
index 84762e6a2540..000000000000
--- a/oox/source/drawingml/chart/makefile.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=oox
-TARGET=chart
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =								\
-    $(SLO)$/axiscontext.obj				\
-    $(SLO)$/axisconverter.obj			\
-    $(SLO)$/axismodel.obj				\
-    $(SLO)$/chartcontextbase.obj		\
-    $(SLO)$/chartconverter.obj			\
-    $(SLO)$/chartdrawingfragment.obj	\
-    $(SLO)$/chartspaceconverter.obj		\
-    $(SLO)$/chartspacefragment.obj		\
-    $(SLO)$/chartspacemodel.obj			\
-    $(SLO)$/converterbase.obj			\
-    $(SLO)$/datasourcecontext.obj		\
-    $(SLO)$/datasourceconverter.obj		\
-    $(SLO)$/datasourcemodel.obj			\
-    $(SLO)$/modelbase.obj				\
-    $(SLO)$/objectformatter.obj			\
-    $(SLO)$/plotareacontext.obj			\
-    $(SLO)$/plotareaconverter.obj		\
-    $(SLO)$/plotareamodel.obj			\
-    $(SLO)$/seriescontext.obj			\
-    $(SLO)$/seriesconverter.obj			\
-    $(SLO)$/seriesmodel.obj				\
-    $(SLO)$/titlecontext.obj			\
-    $(SLO)$/titleconverter.obj			\
-    $(SLO)$/titlemodel.obj				\
-    $(SLO)$/typegroupcontext.obj		\
-    $(SLO)$/typegroupconverter.obj		\
-    $(SLO)$/typegroupmodel.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/oox/source/drawingml/diagram/makefile.mk b/oox/source/drawingml/diagram/makefile.mk
deleted file mode 100755
index 9d526ed3d3fb..000000000000
--- a/oox/source/drawingml/diagram/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=oox
-TARGET=diagram
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
-    $(SLO)$/diagram.obj \
-    $(SLO)$/diagramfragmenthandler.obj \
-    $(SLO)$/diagramdefinitioncontext.obj \
-    $(SLO)$/diagramlayoutatoms.obj \
-    $(SLO)$/datamodelcontext.obj \
-    $(SLO)$/layoutnodecontext.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/oox/source/drawingml/makefile.mk b/oox/source/drawingml/makefile.mk
deleted file mode 100755
index 0546fb4c233d..000000000000
--- a/oox/source/drawingml/makefile.mk
+++ /dev/null
@@ -1,92 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=oox
-TARGET=drawingml
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/clrscheme.obj\
-        $(SLO)$/clrschemecontext.obj\
-        $(SLO)$/color.obj\
-        $(SLO)$/colorchoicecontext.obj\
-        $(SLO)$/connectorshapecontext.obj\
-        $(SLO)$/customshapegeometry.obj\
-        $(SLO)$/customshapeproperties.obj\
-        $(SLO)$/drawingmltypes.obj\
-        $(SLO)$/embeddedwavaudiofile.obj\
-        $(SLO)$/fillproperties.obj\
-        $(SLO)$/fillpropertiesgroupcontext.obj\
-        $(SLO)$/graphicshapecontext.obj\
-        $(SLO)$/guidcontext.obj\
-        $(SLO)$/hyperlinkcontext.obj\
-        $(SLO)$/lineproperties.obj\
-        $(SLO)$/linepropertiescontext.obj\
-        $(SLO)$/objectdefaultcontext.obj\
-        $(SLO)$/shape.obj\
-        $(SLO)$/shapecontext.obj\
-        $(SLO)$/shapegroupcontext.obj\
-        $(SLO)$/shapepropertiescontext.obj\
-        $(SLO)$/shapepropertymap.obj\
-        $(SLO)$/shapestylecontext.obj\
-        $(SLO)$/spdefcontext.obj\
-        $(SLO)$/textbody.obj\
-        $(SLO)$/textbodycontext.obj\
-        $(SLO)$/textbodyproperties.obj\
-        $(SLO)$/textbodypropertiescontext.obj\
-        $(SLO)$/textcharacterproperties.obj\
-        $(SLO)$/textcharacterpropertiescontext.obj\
-        $(SLO)$/textfield.obj\
-        $(SLO)$/textfieldcontext.obj\
-        $(SLO)$/textfont.obj\
-        $(SLO)$/textliststyle.obj \
-        $(SLO)$/textliststylecontext.obj\
-        $(SLO)$/textparagraph.obj\
-        $(SLO)$/textparagraphproperties.obj\
-        $(SLO)$/textparagraphpropertiescontext.obj\
-        $(SLO)$/textrun.obj\
-        $(SLO)$/textspacingcontext.obj\
-        $(SLO)$/texttabstoplistcontext.obj\
-        $(SLO)$/theme.obj\
-        $(SLO)$/themeelementscontext.obj\
-        $(SLO)$/themefragmenthandler.obj\
-        $(SLO)$/transform2dcontext.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/oox/source/drawingml/table/makefile.mk b/oox/source/drawingml/table/makefile.mk
deleted file mode 100755
index fa71971fc278..000000000000
--- a/oox/source/drawingml/table/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=oox
-TARGET=table
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
-    $(SLO)$/tablecontext.obj \
-    $(SLO)$/tableproperties.obj \
-    $(SLO)$/tablerow.obj \
-    $(SLO)$/tablerowcontext.obj \
-    $(SLO)$/tablecell.obj \
-    $(SLO)$/tablecellcontext.obj \
-    $(SLO)$/tablestylelist.obj \
-    $(SLO)$/tablestylelistfragmenthandler.obj \
-    $(SLO)$/tablestylecontext.obj \
-    $(SLO)$/tablestyle.obj \
-    $(SLO)$/tablebackgroundstylecontext.obj \
-    $(SLO)$/tablepartstylecontext.obj \
-    $(SLO)$/tablestyletextstylecontext.obj \
-    $(SLO)$/tablestylecellstylecontext.obj \
-    $(SLO)$/tablestylepart.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/oox/source/dump/makefile.mk b/oox/source/dump/makefile.mk
deleted file mode 100755
index 1e5f615675cc..000000000000
--- a/oox/source/dump/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=oox
-TARGET=dump
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =							\
-        $(SLO)$/biffdumper.obj		\
-        $(SLO)$/dffdumper.obj		\
-        $(SLO)$/dumperbase.obj		\
-        $(SLO)$/oledumper.obj		\
-        $(SLO)$/pptxdumper.obj		\
-        $(SLO)$/xlsbdumper.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/oox/source/helper/makefile.mk b/oox/source/helper/makefile.mk
deleted file mode 100755
index f31736faac8d..000000000000
--- a/oox/source/helper/makefile.mk
+++ /dev/null
@@ -1,60 +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=oox
-TARGET=helper
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/attributelist.obj			\
-        $(SLO)$/binaryinputstream.obj		\
-        $(SLO)$/binaryoutputstream.obj		\
-        $(SLO)$/binarystreambase.obj		\
-        $(SLO)$/containerhelper.obj			\
-        $(SLO)$/graphichelper.obj			\
-        $(SLO)$/modelobjecthelper.obj		\
-        $(SLO)$/progressbar.obj				\
-        $(SLO)$/propertymap.obj				\
-        $(SLO)$/propertyset.obj				\
-        $(SLO)$/storagebase.obj				\
-        $(SLO)$/textinputstream.obj		    \
-        $(SLO)$/zipstorage.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/oox/source/ole/makefile.mk b/oox/source/ole/makefile.mk
deleted file mode 100755
index a5232247cfa5..000000000000
--- a/oox/source/ole/makefile.mk
+++ /dev/null
@@ -1,60 +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=oox
-TARGET=ole
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/axbinaryreader.obj		\
-        $(SLO)$/axcontrol.obj			\
-        $(SLO)$/axcontrolfragment.obj	\
-        $(SLO)$/olehelper.obj			\
-        $(SLO)$/oleobjecthelper.obj		\
-        $(SLO)$/olestorage.obj			\
-        $(SLO)$/vbacontrol.obj          \
-        $(SLO)$/vbahelper.obj           \
-        $(SLO)$/vbainputstream.obj      \
-        $(SLO)$/vbamodule.obj           \
-        $(SLO)$/vbaproject.obj          \
-        $(SLO)$/vbaprojectfilter.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/oox/source/ppt/makefile.mk b/oox/source/ppt/makefile.mk
deleted file mode 100755
index 8d902ed51337..000000000000
--- a/oox/source/ppt/makefile.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=oox
-TARGET=ppt
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/animationspersist.obj \
-        $(SLO)$/animationtypes.obj \
-        $(SLO)$/animvariantcontext.obj \
-        $(SLO)$/backgroundproperties.obj\
-        $(SLO)$/buildlistcontext.obj \
-        $(SLO)$/commonbehaviorcontext.obj \
-        $(SLO)$/commontimenodecontext.obj \
-        $(SLO)$/conditioncontext.obj \
-        $(SLO)$/customshowlistcontext.obj \
-        $(SLO)$/headerfootercontext.obj \
-        $(SLO)$/layoutfragmenthandler.obj\
-        $(SLO)$/pptfilterhelpers.obj\
-        $(SLO)$/pptimport.obj\
-        $(SLO)$/pptshape.obj \
-        $(SLO)$/pptshapecontext.obj \
-        $(SLO)$/pptshapegroupcontext.obj \
-        $(SLO)$/pptshapepropertiescontext.obj \
-        $(SLO)$/presentationfragmenthandler.obj\
-        $(SLO)$/slidefragmenthandler.obj\
-        $(SLO)$/slidemastertextstylescontext.obj \
-        $(SLO)$/slidepersist.obj\
-        $(SLO)$/slidetimingcontext.obj\
-        $(SLO)$/slidetransition.obj\
-        $(SLO)$/slidetransitioncontext.obj\
-        $(SLO)$/soundactioncontext.obj \
-        $(SLO)$/timeanimvaluecontext.obj \
-        $(SLO)$/timenode.obj\
-        $(SLO)$/timenodelistcontext.obj \
-        $(SLO)$/timetargetelementcontext.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/oox/source/shape/makefile.mk b/oox/source/shape/makefile.mk
deleted file mode 100755
index c6534b3a8a6f..000000000000
--- a/oox/source/shape/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=oox
-TARGET=shape
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/ShapeContextHandler.obj \
-        $(SLO)$/ShapeFilterBase.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/oox/source/token/Makefile b/oox/source/token/Makefile
new file mode 100644
index 000000000000..cdd94e794e98
--- /dev/null
+++ b/oox/source/token/Makefile
@@ -0,0 +1,126 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+# generate source and header files from text files ----------------------------
+
+SRCDIR_TOKEN := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+WORKDIR_TOKEN := .
+
+include $(GBUILDDIR)/Output.mk
+include $(GBUILDDIR)/BuildDirs.mk
+include $(GBUILDDIR)/Helper.mk
+
+# XML namespace identifiers and names
+
+$(WORKDIR_TOKEN)/namespaces.hxx : $(SRCDIR_TOKEN)/namespaces.hxx.head $(WORKDIR_TOKEN)/namespaceids.inc $(SRCDIR_TOKEN)/namespaces.hxx.tail
+	$(call gb_Output_announce,$@,build,CAT,1)
+	$(call gb_Helper_abbreviate_dirs,cat $^ > $@)
+
+$(WORKDIR_TOKEN)/namespaceids.inc : $(SRCDIR_TOKEN)/namespaces.txt $(SRCDIR_TOKEN)/namespaces.pl
+	$(call gb_Output_announce,$@,build,PRL,1)
+	$(call gb_Helper_abbreviate_dirs, \
+		mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/namespaces.pl 1 < $< > $@ \
+	)
+
+$(WORKDIR_TOKEN)/namespacenames.inc : $(SRCDIR_TOKEN)/namespaces.txt $(SRCDIR_TOKEN)/namespaces.pl
+	$(call gb_Output_announce,$@,build,PRL,1)
+	$(call gb_Helper_abbreviate_dirs, \
+		mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/namespaces.pl 2 < $< > $@ \
+	)
+
+$(WORKDIR_TOKEN)/namespaces.txt : $(SRCDIR_TOKEN)/namespaces.txt $(SRCDIR_TOKEN)/namespaces.pl
+	$(call gb_Output_announce,$@,build,PRL,1)
+	$(call gb_Helper_abbreviate_dirs, \
+		mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/namespaces.pl 3 < $< > $@ \
+	)
+
+# XML token identifiers and names
+
+$(WORKDIR_TOKEN)/tokens.hxx : $(SRCDIR_TOKEN)/tokens.hxx.head $(WORKDIR_TOKEN)/tokenids.inc $(SRCDIR_TOKEN)/tokens.hxx.tail
+	$(call gb_Output_announce,$@,build,CAT,1)
+	$(call gb_Helper_abbreviate_dirs,cat $^ > $@)
+
+$(WORKDIR_TOKEN)/tokenids.inc : $(SRCDIR_TOKEN)/tokens.txt $(SRCDIR_TOKEN)/tokens.pl
+	$(call gb_Output_announce,$@,build,PRL,1)
+	$(call gb_Helper_abbreviate_dirs, \
+		mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/tokens.pl 1 < $< > $@ \
+	)
+
+$(WORKDIR_TOKEN)/tokennames.inc : $(SRCDIR_TOKEN)/tokens.txt $(SRCDIR_TOKEN)/tokens.pl
+	$(call gb_Output_announce,$@,build,PRL,1)
+	$(call gb_Helper_abbreviate_dirs, \
+		mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/tokens.pl 2 < $< > $@ \
+	)
+
+$(WORKDIR_TOKEN)/tokenhash.inc : $(WORKDIR_TOKEN)/tokenhash.gperf
+	$(call gb_Output_announce,$@,build,GPF,3)
+	$(call gb_Helper_abbreviate_dirs, \
+		gperf $< | $(gb_AWK) -- '{ if ($$0 !~ /^#line/){ gsub("\\(char\\*\\)0", "0", $$0); print; } }' > $@ \
+	)
+
+$(WORKDIR_TOKEN)/tokenhash.gperf : $(SRCDIR_TOKEN)/tokens.txt $(SRCDIR_TOKEN)/tokens.pl
+	$(call gb_Output_announce,$@,build,PRL,1)
+	$(call gb_Helper_abbreviate_dirs, \
+		mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/tokens.pl 3 < $< > $@ \
+	)
+
+# UNO property identifiers and names
+
+$(WORKDIR_TOKEN)/properties.hxx : $(SRCDIR_TOKEN)/properties.hxx.head $(WORKDIR_TOKEN)/propertyids.inc $(SRCDIR_TOKEN)/properties.hxx.tail
+	$(call gb_Output_announce,$@,build,CAT,1)
+	$(call gb_Helper_abbreviate_dirs,cat $^ > $@)
+
+$(WORKDIR_TOKEN)/propertyids.inc : $(SRCDIR_TOKEN)/properties.txt $(SRCDIR_TOKEN)/properties.pl
+	$(call gb_Output_announce,$@,build,PRL,1)
+	$(call gb_Helper_abbreviate_dirs, \
+		mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/properties.pl 1 < $< > $@ \
+	)
+
+$(WORKDIR_TOKEN)/propertynames.inc : $(SRCDIR_TOKEN)/properties.txt $(SRCDIR_TOKEN)/properties.pl
+	$(call gb_Output_announce,$@,build,PRL,1)
+	$(call gb_Helper_abbreviate_dirs, \
+		mkdir -p $(dir $@) && $(PERL) $(SRCDIR_TOKEN)/properties.pl 2 < $< > $@ \
+	)
+
+.DEFAULT_GOAL:=all
+.PHONY: all
+all : \
+		namespaces.hxx \
+		namespaceids.inc \
+		namespacenames.inc \
+		namespaces.txt \
+		tokens.hxx \
+		tokenids.inc \
+		tokennames.inc \
+		tokenhash.inc \
+		tokenhash.gperf \
+		properties.hxx \
+		propertyids.inc \
+		propertynames.inc \
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/oox/source/token/makefile.mk b/oox/source/token/makefile.mk
deleted file mode 100755
index ff42967f0bb1..000000000000
--- a/oox/source/token/makefile.mk
+++ /dev/null
@@ -1,78 +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=oox
-TARGET=token
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
-    $(SLO)$/namespacemap.obj \
-    $(SLO)$/propertynames.obj \
-    $(SLO)$/tokenmap.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-GENHEADERPATH = $(INCCOM)$/oox$/token
-
-$(MISC)$/tokenhash.gperf $(INCCOM)$/tokennames.inc $(GENHEADERPATH)$/tokens.hxx $(INCCOM)$/namespacenames.inc $(MISC)$/namespaces.txt $(GENHEADERPATH)$/namespaces.hxx $(INCCOM)$/propertynames.inc $(GENHEADERPATH)$/properties.hxx :
-    @@noop $(assign do_phony:=.PHONY)
-
-$(SLO)$/tokenmap.obj : $(INCCOM)$/tokenhash.inc $(INCCOM)$/tokennames.inc $(GENHEADERPATH)$/tokens.hxx $(MISC)$/do_tokens
-
-$(INCCOM)$/tokenhash.inc : $(MISC)$/tokenhash.gperf $(MISC)$/do_tokens
-    $(AUGMENT_LIBRARY_PATH) gperf --compare-strncmp $(MISC)$/tokenhash.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" | $(GREP) -v "^#line" >$(INCCOM)$/tokenhash.inc
-
-$(MISC)$/do_tokens $(do_phony) : tokens.txt tokens.pl tokens.hxx.head tokens.hxx.tail $(GENHEADERPATH)$/tokens.hxx $(INCCOM)$/tokennames.inc $(MISC)$/tokenhash.gperf
-    @@-$(RM) $@
-    $(MKDIRHIER) $(GENHEADERPATH)
-    $(PERL) tokens.pl tokens.txt $(MISC)$/tokenids.inc $(INCCOM)$/tokennames.inc $(MISC)$/tokenhash.gperf && $(TYPE) tokens.hxx.head $(MISC)$/tokenids.inc tokens.hxx.tail > $(GENHEADERPATH)$/tokens.hxx && $(TOUCH) $@
-
-$(SLO)$/namespacemap.obj : $(INCCOM)$/namespacenames.inc $(MISC)$/namespaces.txt $(GENHEADERPATH)$/namespaces.hxx $(MISC)$/do_namespaces
-
-$(MISC)$/do_namespaces $(do_phony) : namespaces.txt namespaces.pl namespaces.hxx.head namespaces.hxx.tail $(INCCOM)$/namespacenames.inc $(MISC)$/namespaces.txt $(GENHEADERPATH)$/namespaces.hxx
-    @@-$(RM) $@
-    $(MKDIRHIER) $(GENHEADERPATH)
-    $(PERL) namespaces.pl namespaces.txt $(MISC)$/namespaceids.inc $(INCCOM)$/namespacenames.inc $(MISC)$/namespaces.txt && $(TYPE) namespaces.hxx.head $(MISC)$/namespaceids.inc namespaces.hxx.tail > $(GENHEADERPATH)$/namespaces.hxx && $(TOUCH) $@
-
-$(SLO)$/propertynames.obj : $(INCCOM)$/propertynames.inc $(GENHEADERPATH)$/properties.hxx $(MISC)$/do_properties
-
-$(MISC)$/do_properties $(do_phony) : properties.txt properties.pl properties.hxx.head properties.hxx.tail $(INCCOM)$/propertynames.inc $(GENHEADERPATH)$/properties.hxx
-    @@-$(RM) $@
-    $(MKDIRHIER) $(GENHEADERPATH)
-    $(PERL) properties.pl properties.txt $(MISC)$/propertyids.inc $(INCCOM)$/propertynames.inc && $(TYPE) properties.hxx.head $(MISC)$/propertyids.inc properties.hxx.tail > $(GENHEADERPATH)$/properties.hxx && $(TOUCH) $@
diff --git a/oox/source/token/namespacemap.cxx b/oox/source/token/namespacemap.cxx
index 0f4373d2dc59..d021f2a3a353 100755
--- a/oox/source/token/namespacemap.cxx
+++ b/oox/source/token/namespacemap.cxx
@@ -36,7 +36,7 @@ NamespaceMap::NamespaceMap()
     static const struct NamespaceUrl { sal_Int32 mnId; const sal_Char* mpcUrl; } spNamespaceUrls[] =
     {
 // include auto-generated C array with namespace URLs as C strings
-#include "namespacenames.inc"
+#include <token/namespacenames.inc>
         { -1, "" }
     };
 
diff --git a/oox/source/token/namespaces.pl b/oox/source/token/namespaces.pl
deleted file mode 100644
index 3c741fa7b2af..000000000000
--- a/oox/source/token/namespaces.pl
+++ /dev/null
@@ -1,79 +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.
-#
-#*************************************************************************
-
-$ARGV0 = shift @ARGV;
-$ARGV1 = shift @ARGV;
-$ARGV2 = shift @ARGV;
-$ARGV3 = shift @ARGV;
-
-# parse input file
-
-open( INFILE, $ARGV0 ) or die "cannot open input file: $!";
-my %namespaces;
-while( <INFILE> )
-{
-    # trim newline
-    chomp( $_ );
-    # trim leading/trailing whitespace
-    $_ =~ s/^\s*//g;
-    $_ =~ s/\s*$//g;
-    # trim comments
-    $_ =~ s/^#.*//;
-    # skip empty lines
-    if( $_ )
-    {
-        # check for valid characters
-        $_ =~ /^([a-zA-Z]+)\s+([a-zA-Z0-9-.:\/]+)\s*$/ or die "Error: invalid character in input data";
-        $namespaces{$1} = $2;
-    }
-}
-close( INFILE );
-
-# generate output files
-
-open( IDFILE, ">$ARGV1" ) or die "Error: cannot open output file: $!";
-open( NAMEFILE, ">$ARGV2" ) or die "Error: cannot open output file: $!";
-open( TXTFILE, ">$ARGV3" ) or die "Error: cannot open output file: $!";
-
-# number of bits to shift the namespace identifier
-$shift = 16;
-
-print ( IDFILE "const size_t NMSP_SHIFT = $shift;\n" );
-
-$i = 1;
-foreach( keys( %namespaces ) )
-{
-    print( IDFILE "const sal_Int32 NMSP_$_ = $i << NMSP_SHIFT;\n" );
-    $id = $i << $shift;
-    print( NAMEFILE "{ $id, \"$namespaces{$_}\" },\n" );
-    print( TXTFILE "$id $_ $namespaces{$_}\n" );
-    ++$i;
-}
-
-close( IDFILE );
-close( nameFILE );
-close( TXTFILE );
diff --git a/oox/source/token/properties.pl b/oox/source/token/properties.pl
index f341924bbb90..448cec632343 100644
--- a/oox/source/token/properties.pl
+++ b/oox/source/token/properties.pl
@@ -25,43 +25,33 @@
 #
 #*************************************************************************
 
-$ARGV0 = shift @ARGV;
-$ARGV1 = shift @ARGV;
-$ARGV2 = shift @ARGV;
+# operation mode (1 = identifiers, 2 = names)
+$op = shift @ARGV;
+die "Error: invalid operation" unless( $op >= 1 && $op <= 2);
 
-# parse input file
-
-open( INFILE, $ARGV0 ) or die "Error: cannot open input file: $!";
-my %props;
-while( <INFILE> )
-{
+$i = 0;
+while( <> ) {
     # trim newline
     chomp( $_ );
     # trim leading/trailing whitespace
     $_ =~ s/^\s*//g;
     $_ =~ s/\s*$//g;
-    # check for valid characters
-    $_ =~ /^[A-Z][a-zA-Z0-9]*$/ or die "Error: invalid character in property '$_'";
-    $id = "PROP_$_";
-    $props{$_} = $id;
+    # skip empty lines
+    if( $_ ) {
+        # check for valid characters
+        $_ =~ /^[A-Z][a-zA-Z0-9]+$/ or die "Error: invalid entry: '$_'";
+        # generate output
+        if( $op == 1 ) {
+            print( "const sal_Int32 PROP_$_ = $i;\n" );
+        } elsif( $op == 2 ) {
+            print( "/* $i */ \"$_\",\n" );
+        }
+        ++$i;
+    }
 }
-close( INFILE );
-
-# generate output files
-
-open( IDFILE, ">$ARGV1" ) or die "Error: cannot open output file: $!";
-open( NAMEFILE, ">$ARGV2" ) or die "Error: cannot open output file: $!";
 
-$i = 0;
-foreach( sort( keys( %props ) ) )
-{
-    print( IDFILE "const sal_Int32 $props{$_} = $i;\n" );
-    print( NAMEFILE "/* $i */ \"$_\",\n" );
-    ++$i;
+if( $op == 1 ) {
+    print( "const sal_Int32 PROP_COUNT = $i;\nconst sal_Int32 PROP_INVALID = -1;\n" );
+} elsif( $op == 2 ) {
+    print( "    \"\"" );
 }
-
-print( IDFILE "const sal_Int32 PROP_COUNT = $i;\n" );
-print( IDFILE "const sal_Int32 PROP_INVALID = -1;\n" );
-
-close( IDFILE );
-close( NAMEFILE );
diff --git a/oox/source/token/propertynames.cxx b/oox/source/token/propertynames.cxx
index 401d168fe696..b8f06496c7ff 100644
--- a/oox/source/token/propertynames.cxx
+++ b/oox/source/token/propertynames.cxx
@@ -36,8 +36,7 @@ PropertyNameVector::PropertyNameVector()
     static const sal_Char* sppcPropertyNames[] =
     {
         // include auto-generated C array with property names as C strings
-#include "propertynames.inc"
-        ""
+#include <token/propertynames.inc>
     };
 
     size_t nArraySize = (sizeof( sppcPropertyNames ) / sizeof( *sppcPropertyNames )) - 1;
diff --git a/oox/source/token/tokenmap.cxx b/oox/source/token/tokenmap.cxx
index a5189269c3c8..0be0a1c4c470 100644
--- a/oox/source/token/tokenmap.cxx
+++ b/oox/source/token/tokenmap.cxx
@@ -43,8 +43,10 @@ using ::rtl::OUString;
 // ============================================================================
 
 namespace {
-// include auto-generated Perfect_Hash
-#include "tokenhash.inc"
+
+// include auto-generated Perfect_Hash class
+#include <token/tokenhash.inc>
+
 } // namespace
 
 // ============================================================================
@@ -55,7 +57,7 @@ TokenMap::TokenMap() :
     static const sal_Char* sppcTokenNames[] =
     {
 // include auto-generated C array with token names as C strings
-#include "tokennames.inc"
+#include <token/tokennames.inc>
         ""
     };
 
@@ -68,14 +70,14 @@ TokenMap::TokenMap() :
     }
 
 #if OSL_DEBUG_LEVEL > 0
-    // check that the perfect_hash is in sync with the token name list
+    // check that the Perfect_Hash is in sync with the token name list
     bool bOk = true;
     for( sal_Int32 nToken = 0; bOk && (nToken < XML_TOKEN_COUNT); ++nToken )
     {
         // check that the getIdentifier <-> getToken roundtrip works
         OString aUtf8Name = OUStringToOString( maTokenNames[ nToken ].maUniName, RTL_TEXTENCODING_UTF8 );
-        struct xmltoken* pToken = Perfect_Hash::in_word_set( aUtf8Name.getStr(), aUtf8Name.getLength() );
-        bOk = pToken && (pToken->nToken == nToken);
+        const XMLTokenInfo* pTokenInfo = Perfect_Hash::getTokenInfo( aUtf8Name.getStr(), aUtf8Name.getLength() );
+        bOk = pTokenInfo && (pTokenInfo->mnToken == nToken);
         OSL_ENSURE( bOk, ::rtl::OStringBuffer( "TokenMap::TokenMap - token list broken, #" ).
             append( nToken ).append( ", '" ).append( aUtf8Name ).append( '\'' ).getStr() );
     }
@@ -96,8 +98,8 @@ OUString TokenMap::getUnicodeTokenName( sal_Int32 nToken ) const
 sal_Int32 TokenMap::getTokenFromUnicode( const OUString& rUnicodeName ) const
 {
     OString aUtf8Name = OUStringToOString( rUnicodeName, RTL_TEXTENCODING_UTF8 );
-    struct xmltoken* pToken = Perfect_Hash::in_word_set( aUtf8Name.getStr(), aUtf8Name.getLength() );
-    return pToken ? pToken->nToken : XML_TOKEN_INVALID;
+    const XMLTokenInfo* pTokenInfo = Perfect_Hash::getTokenInfo( aUtf8Name.getStr(), aUtf8Name.getLength() );
+    return pTokenInfo ? pTokenInfo->mnToken : XML_TOKEN_INVALID;
 }
 
 Sequence< sal_Int8 > TokenMap::getUtf8TokenName( sal_Int32 nToken ) const
@@ -109,9 +111,9 @@ Sequence< sal_Int8 > TokenMap::getUtf8TokenName( sal_Int32 nToken ) const
 
 sal_Int32 TokenMap::getTokenFromUtf8( const Sequence< sal_Int8 >& rUtf8Name ) const
 {
-    struct xmltoken* pToken = Perfect_Hash::in_word_set(
+    const XMLTokenInfo* pTokenInfo = Perfect_Hash::getTokenInfo(
         reinterpret_cast< const char* >( rUtf8Name.getConstArray() ), rUtf8Name.getLength() );
-    return pToken ? pToken->nToken : XML_TOKEN_INVALID;
+    return pTokenInfo ? pTokenInfo->mnToken : XML_TOKEN_INVALID;
 }
 
 // ============================================================================
diff --git a/oox/source/token/tokens.pl b/oox/source/token/tokens.pl
index a951cee80db2..ba7f39f2be39 100644
--- a/oox/source/token/tokens.pl
+++ b/oox/source/token/tokens.pl
@@ -25,56 +25,55 @@
 #
 #*************************************************************************
 
-$ARGV0 = shift @ARGV;
-$ARGV1 = shift @ARGV;
-$ARGV2 = shift @ARGV;
-$ARGV3 = shift @ARGV;
+# operation mode (1 = identifiers, 2 = names, 3 = gperf)
+$op = shift @ARGV;
+die "Error: invalid operation" unless( $op >= 1 && $op <= 3);
 
-open( INFILE, $ARGV0 ) or die "Error: cannot open input file: $!";
-my %tokens;
-while ( <INFILE> )
+if( $op == 3 ) {
+    print( "%language=C++\n" );
+    print( "%define slot-name mpcName\n" );
+    print( "%define initializer-suffix ,0\n" );
+    print( "%define lookup-function-name getTokenInfo\n" );
+    print( "%compare-strncmp\n" );
+    print( "%readonly-tables\n" );
+    print( "%enum\n" );
+    print( "%null-strings\n" );
+    print( "%struct-type\n" );
+    print( "struct XMLTokenInfo {\n" );
+    print( "    const sal_Char* mpcName;\n" );
+    print( "    sal_Int32       mnToken;\n" );
+    print( "};\n" );
+    print( "%%\n" );
+}
+
+$i = 0;
+while( <> )
 {
     # trim newline
     chomp( $_ );
     # trim leading/trailing whitespace
     $_ =~ s/^\s*//g;
     $_ =~ s/\s*$//g;
-    # check for valid characters
-    $_ =~ /^[a-zA-Z0-9-_]+$/ or die "Error: invalid character in token '$_'";
-    $id = "XML_$_";
-    $id =~ s/-/_/g;
-    $tokens{$_} = $id;
+    # skip empty lines
+    if( $_ ) {
+        # check for valid characters
+        $_ =~ /^[a-zA-Z0-9-_]+$/ or die "Error: invalid entry: '$_'";
+        # generate output
+        $id = "XML_$_";
+        $id =~ s/-/_/g;
+        if( $op == 1 ) {
+            print( "const sal_Int32 $id = $i;\n" );
+        } elsif( $op == 2 ) {
+            print( "\"$_\",\n" );
+        } elsif( $op == 3 ) {
+            print( "$_,$id\n" );
+        }
+        ++$i;
+    }
 }
-close ( INFILE );
-
-# generate output files
-
-open ( IDFILE, ">$ARGV1" ) or die "Error: cannot open output file: $!";
-open ( NAMEFILE, ">$ARGV2" ) or die "Error: cannot open output file: $!";
-open ( GPERFFILE, ">$ARGV3" ) or die "Error: cannot open output file: $!";
 
-print( GPERFFILE "%language=C++\n" );
-print( GPERFFILE "%global-table\n" );
-print( GPERFFILE "%null-strings\n" );
-print( GPERFFILE "%struct-type\n" );
-print( GPERFFILE "struct xmltoken {\n" );
-print( GPERFFILE "    const sal_Char *name;\n" );
-print( GPERFFILE "    sal_Int32 nToken;\n" );
-print( GPERFFILE "};\n" );
-print( GPERFFILE "%%\n" );
-
-$i = 0;
-foreach( sort( keys( %tokens ) ) )
-{
-    print( IDFILE "const sal_Int32 $tokens{$_} = $i;\n" );
-    print( NAMEFILE "\"$_\",\n" );
-    print( GPERFFILE "$_,$tokens{$_}\n" );
-    ++$i;
+if( $op == 1 ) {
+    print( "const sal_Int32 XML_TOKEN_COUNT = $i;\n" );
+} elsif( $op == 3 ) {
+    print( "%%\n" );
 }
-
-print( IDFILE "const sal_Int32 XML_TOKEN_COUNT = $i;\n" );
-print( GPERFFILE "%%\n" );
-
-close( IDFILE );
-close( NAMEFILE );
-close( GPERFFILE );
diff --git a/oox/source/vml/makefile.mk b/oox/source/vml/makefile.mk
deleted file mode 100755
index 094d37cd8c1c..000000000000
--- a/oox/source/vml/makefile.mk
+++ /dev/null
@@ -1,56 +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=oox
-TARGET=vml
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/vmldrawing.obj            \
-        $(SLO)$/vmldrawingfragment.obj    \
-        $(SLO)$/vmlformatting.obj         \
-        $(SLO)$/vmlinputstream.obj        \
-        $(SLO)$/vmlshape.obj              \
-        $(SLO)$/vmlshapecontainer.obj     \
-        $(SLO)$/vmlshapecontext.obj       \
-        $(SLO)$/vmltextbox.obj            \
-        $(SLO)$/vmltextboxcontext.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/oox/source/xls/makefile.mk b/oox/source/xls/makefile.mk
deleted file mode 100755
index bcd539a70705..000000000000
--- a/oox/source/xls/makefile.mk
+++ /dev/null
@@ -1,105 +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=oox
-TARGET=xls
-AUTOSEG=true
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =										\
-        $(SLO)$/addressconverter.obj			\
-        $(SLO)$/autofilterbuffer.obj			\
-        $(SLO)$/autofiltercontext.obj			\
-        $(SLO)$/biffcodec.obj					\
-        $(SLO)$/biffdetector.obj				\
-        $(SLO)$/biffhelper.obj					\
-        $(SLO)$/biffinputstream.obj				\
-        $(SLO)$/biffoutputstream.obj			\
-        $(SLO)$/chartsheetfragment.obj			\
-        $(SLO)$/commentsbuffer.obj				\
-        $(SLO)$/commentsfragment.obj			\
-        $(SLO)$/condformatbuffer.obj			\
-        $(SLO)$/condformatcontext.obj			\
-        $(SLO)$/connectionsbuffer.obj			\
-        $(SLO)$/connectionsfragment.obj			\
-        $(SLO)$/defnamesbuffer.obj				\
-        $(SLO)$/drawingbase.obj					\
-        $(SLO)$/drawingfragment.obj				\
-        $(SLO)$/drawingmanager.obj				\
-        $(SLO)$/excelchartconverter.obj			\
-        $(SLO)$/excelfilter.obj					\
-        $(SLO)$/excelhandlers.obj				\
-        $(SLO)$/excelvbaproject.obj				\
-        $(SLO)$/externallinkbuffer.obj			\
-        $(SLO)$/externallinkfragment.obj		\
-        $(SLO)$/formulabase.obj					\
-        $(SLO)$/formulaparser.obj				\
-        $(SLO)$/numberformatsbuffer.obj			\
-        $(SLO)$/ooxformulaparser.obj			\
-        $(SLO)$/pagesettings.obj				\
-        $(SLO)$/pivotcachebuffer.obj			\
-        $(SLO)$/pivotcachefragment.obj			\
-        $(SLO)$/pivottablebuffer.obj			\
-        $(SLO)$/pivottablefragment.obj			\
-        $(SLO)$/querytablebuffer.obj			\
-        $(SLO)$/querytablefragment.obj			\
-        $(SLO)$/richstring.obj					\
-        $(SLO)$/richstringcontext.obj			\
-        $(SLO)$/scenariobuffer.obj				\
-        $(SLO)$/scenariocontext.obj				\
-        $(SLO)$/sharedstringsbuffer.obj			\
-        $(SLO)$/sharedstringsfragment.obj		\
-        $(SLO)$/sheetdatabuffer.obj				\
-        $(SLO)$/sheetdatacontext.obj			\
-        $(SLO)$/stylesbuffer.obj				\
-        $(SLO)$/stylesfragment.obj				\
-        $(SLO)$/tablebuffer.obj					\
-        $(SLO)$/tablefragment.obj				\
-        $(SLO)$/themebuffer.obj					\
-        $(SLO)$/unitconverter.obj				\
-        $(SLO)$/viewsettings.obj				\
-        $(SLO)$/workbookfragment.obj			\
-        $(SLO)$/workbookhelper.obj				\
-        $(SLO)$/workbooksettings.obj			\
-        $(SLO)$/worksheetbuffer.obj				\
-        $(SLO)$/worksheetfragment.obj			\
-        $(SLO)$/worksheethelper.obj				\
-        $(SLO)$/worksheetsettings.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk