os146: gnumake3 merged

14 files changed, 386 insertions, 601 deletions

diff --git a/editeng/source/outliner/makefile.mk b/editeng/AllLangResTarget_editeng.mk
index df1c795801ae..e2bd16e4885c 100644..100755
--- a/editeng/source/outliner/makefile.mk
+++ b/editeng/AllLangResTarget_editeng.mk
@@ -2,7 +2,7 @@
 #
 # 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,36 +25,26 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,editeng))
 
-PRJNAME=editeng
-TARGET=outliner
-AUTOSEG=true
-ENABLE_EXCEPTIONS=TRUE
+$(eval $(call gb_AllLangResTarget_set_reslocation,editeng,svx))
 
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=outl_pch
-PROJECTPCHSOURCE=outl_pch
+$(eval $(call gb_AllLangResTarget_add_srs,editeng, editeng/res))
+$(eval $(call gb_SrsTarget_SrsTarget,editeng/res))
 
+$(eval $(call gb_SrsTarget_set_include,editeng/res,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/editeng/inc \
+))
 
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Allgemein ----------------------------------------------------------
-
-SLOFILES=	\
-            $(SLO)$/outlundo.obj	\
-            $(SLO)$/outliner.obj 	\
-            $(SLO)$/outlin2.obj		\
-            $(SLO)$/paralist.obj 	\
-            $(SLO)$/outlvw.obj 		\
-            $(SLO)$/outleeng.obj 	\
-            $(SLO)$/outlobj.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES=	outliner.src
-
-.INCLUDE :  target.mk
+# add src files here (complete path relative to repository root)
+$(eval $(call gb_SrsTarget_add_files,editeng/res,\
+    editeng/source/accessibility/accessibility.src \
+    editeng/source/editeng/editeng.src \
+    editeng/source/items/page.src \
+    editeng/source/items/svxitems.src \
+    editeng/source/misc/lingu.src \
+    editeng/source/outliner/outliner.src \
+))
 
+# vim: set noet sw=4 ts=4:
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
new file mode 100755
index 000000000000..293270b9a47c
--- /dev/null
+++ b/editeng/Library_editeng.mk
@@ -0,0 +1,179 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,editeng))
+
+$(eval $(call gb_Library_add_package_headers,editeng,editeng_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,editeng,$(SRCDIR)/editeng/inc/pch/precompiled_editeng))
+
+# in case UNO services are exported: declare location of component file
+#$(eval $(call gb_Library_set_componentfile,editeng,editeng/COMPONENT_FILE))
+
+# add any additional include paths for this library here
+$(eval $(call gb_Library_set_include,editeng,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/editeng/inc/pch \
+    -I$(SRCDIR)/editeng/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,editeng,\
+    $$(DEFS) \
+    -DEDITENG_DLLIMPLEMENTATION \
+))
+
+ifneq ($(strip $(EDITDEBUG)),)
+$(eval $(call gb_Library_set_defs,editeng,\
+    $$(DEFS) \
+    -DEDITDEBUG \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,editeng,\
+    editeng/inc/pch/precompiled_editeng \
+    editeng/source/accessibility/AccessibleComponentBase \
+    editeng/source/accessibility/AccessibleContextBase \
+    editeng/source/accessibility/AccessibleEditableTextPara \
+    editeng/source/accessibility/AccessibleHyperlink \
+    editeng/source/accessibility/AccessibleImageBullet \
+    editeng/source/accessibility/AccessibleParaManager \
+    editeng/source/accessibility/AccessibleSelectionBase \
+    editeng/source/accessibility/AccessibleStaticTextBase \
+    editeng/source/accessibility/AccessibleStringWrap \
+    editeng/source/editeng/editattr \
+    editeng/source/editeng/editdbg \
+    editeng/source/editeng/editdoc \
+    editeng/source/editeng/editdoc2 \
+    editeng/source/editeng/editeng \
+    editeng/source/editeng/editobj \
+    editeng/source/editeng/editsel \
+    editeng/source/editeng/editundo \
+    editeng/source/editeng/editview \
+    editeng/source/editeng/edtspell \
+    editeng/source/editeng/eehtml \
+    editeng/source/editeng/eeng_pch \
+    editeng/source/editeng/eeobj \
+    editeng/source/editeng/eerdll \
+    editeng/source/editeng/eertfpar \
+    editeng/source/editeng/impedit \
+    editeng/source/editeng/impedit2 \
+    editeng/source/editeng/impedit3 \
+    editeng/source/editeng/impedit4 \
+    editeng/source/editeng/impedit5 \
+    editeng/source/editeng/textconv \
+    editeng/source/items/bulitem \
+    editeng/source/items/charhiddenitem \
+    editeng/source/items/flditem \
+    editeng/source/items/frmitems \
+    editeng/source/items/itemtype \
+    editeng/source/items/numitem \
+    editeng/source/items/optitems \
+    editeng/source/items/paperinf \
+    editeng/source/items/paraitem \
+    editeng/source/items/svdfield \
+    editeng/source/items/svxfont \
+    editeng/source/items/textitem \
+    editeng/source/items/writingmodeitem \
+    editeng/source/items/xmlcnitm \
+    editeng/source/misc/acorrcfg \
+    editeng/source/misc/edtdlg \
+    editeng/source/misc/forbiddencharacterstable \
+    editeng/source/misc/hangulhanja \
+    editeng/source/misc/splwrap \
+    editeng/source/misc/svxacorr \
+    editeng/source/misc/SvXMLAutoCorrectExport \
+    editeng/source/misc/SvXMLAutoCorrectImport \
+    editeng/source/misc/swafopt \
+    editeng/source/misc/txtrange \
+    editeng/source/misc/unolingu \
+    editeng/source/outliner/outleeng \
+    editeng/source/outliner/outlin2 \
+    editeng/source/outliner/outliner \
+    editeng/source/outliner/outlobj \
+    editeng/source/outliner/outlundo \
+    editeng/source/outliner/outlvw \
+    editeng/source/outliner/outl_pch \
+    editeng/source/outliner/paralist \
+    editeng/source/rtf/rtfgrf \
+    editeng/source/rtf/rtfitem \
+    editeng/source/rtf/svxrtf \
+    editeng/source/uno/unoedhlp \
+    editeng/source/uno/unoedprx \
+    editeng/source/uno/unoedsrc \
+    editeng/source/uno/unofdesc \
+    editeng/source/uno/unofield \
+    editeng/source/uno/UnoForbiddenCharsTable \
+    editeng/source/uno/unofored \
+    editeng/source/uno/unoforou \
+    editeng/source/uno/unoipset \
+    editeng/source/uno/unonrule \
+    editeng/source/uno/unopracc \
+    editeng/source/uno/unotext \
+    editeng/source/uno/unotext2 \
+    editeng/source/uno/unoviwed \
+    editeng/source/uno/unoviwou \
+    editeng/source/xml/xmltxtexp \
+    editeng/source/xml/xmltxtimp \
+))
+
+# add libraries to be linked to editeng; again these names need to be given as
+# specified in Repository.mk
+$(eval $(call gb_Library_add_linked_libs,editeng,\
+    xo \
+    basegfx \
+    lng \
+    svt \
+    tk \
+    vcl \
+    svl \
+    stl \
+    sot \
+    utl \
+    tl \
+    comphelper \
+    ucbhelper \
+    cppuhelper \
+    cppu \
+    vos3 \
+    sal \
+    icuuc \
+    i18nisolang1 \
+    i18npaper \
+    $(gb_StdLibs) \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,editeng,\
+    dl \
+    m \
+    pthread \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/editeng/source/rtf/makefile.mk b/editeng/Makefile
index 081cd5b506cd..a79aff831024 100644..100755
--- a/editeng/source/rtf/makefile.mk
+++ b/editeng/Makefile
@@ -25,26 +25,14 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-PRJNAME=editeng
-TARGET=rtf
-ENABLE_EXCEPTIONS=TRUE
-# --- Settings -----------------------------------------------------
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES= \
-        $(SLO)$/rtfitem.obj \
-        $(SLO)$/svxrtf.obj
-
-SLOFILES= \
-        $(EXCEPTIONSFILES) \
-        $(SLO)$/rtfgrf.obj
-
-# ==========================================================================
-
-.INCLUDE :  target.mk
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
+# vim: set noet sw=4 ts=4:
diff --git a/editeng/inc/makefile.mk b/editeng/Module_editeng.mk
index 6ecb444e03eb..4a5dbcf30695 100644..100755
--- a/editeng/inc/makefile.mk
+++ b/editeng/Module_editeng.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,24 +25,21 @@
 #
 #*************************************************************************
 
-PRJ=..
-
-PRJNAME=editeng
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+$(eval $(call gb_Module_Module,editeng))
 
-# --- Files --------------------------------------------------------
+$(eval $(call gb_Module_add_targets,editeng,\
+    AllLangResTarget_editeng \
+    Library_editeng \
+    Package_inc \
+))
 
-.INCLUDE :  target.mk
+# add any runtime tests (unit tests) here
+# remove if no tests
+$(eval $(call gb_Module_add_check_targets,editeng,\
+))
 
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
+# add any subsequent checks (e.g. complex tests) here
+$(eval $(call gb_Module_add_subsequentcheck_targets,editeng,\
+))
 
+# vim: set noet sw=4 ts=4:
diff --git a/editeng/Package_inc.mk b/editeng/Package_inc.mk
new file mode 100755
index 000000000000..d0c984a78a90
--- /dev/null
+++ b/editeng/Package_inc.mk
@@ -0,0 +1,154 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,editeng_inc,$(SRCDIR)/editeng/inc))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleComponentBase.hxx,editeng/AccessibleComponentBase.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleContextBase.hxx,editeng/AccessibleContextBase.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleEditableTextPara.hxx,editeng/AccessibleEditableTextPara.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleImageBullet.hxx,editeng/AccessibleImageBullet.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleParaManager.hxx,editeng/AccessibleParaManager.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleSelectionBase.hxx,editeng/AccessibleSelectionBase.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleStaticTextBase.hxx,editeng/AccessibleStaticTextBase.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/AccessibleStringWrap.hxx,editeng/AccessibleStringWrap.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/acorrcfg.hxx,editeng/acorrcfg.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/adjitem.hxx,editeng/adjitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/akrnitem.hxx,editeng/akrnitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/blnkitem.hxx,editeng/blnkitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/bolnitem.hxx,editeng/bolnitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/borderline.hxx,editeng/borderline.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/boxitem.hxx,editeng/boxitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/brkitem.hxx,editeng/brkitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/brshitem.hxx,editeng/brshitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/bulitem.hxx,editeng/bulitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charhiddenitem.hxx,editeng/charhiddenitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charreliefitem.hxx,editeng/charreliefitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charrotateitem.hxx,editeng/charrotateitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/charscaleitem.hxx,editeng/charscaleitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/cmapitem.hxx,editeng/cmapitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/cntritem.hxx,editeng/cntritem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/colritem.hxx,editeng/colritem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/crsditem.hxx,editeng/crsditem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/cscoitem.hxx,editeng/cscoitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editdata.hxx,editeng/editdata.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editeng.hxx,editeng/editeng.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editengdllapi.h,editeng/editengdllapi.h))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editerr.hxx,editeng/editerr.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editids.hrc,editeng/editids.hrc))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editobj.hxx,editeng/editobj.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editrids.hrc,editeng/editrids.hrc))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editstat.hxx,editeng/editstat.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editund2.hxx,editeng/editund2.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/editview.hxx,editeng/editview.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/edtdlg.hxx,editeng/edtdlg.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eedata.hxx,editeng/eedata.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eeitem.hxx,editeng/eeitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eeitemid.hxx,editeng/eeitemid.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/eerdll.hxx,editeng/eerdll.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/emphitem.hxx,editeng/emphitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/escpitem.hxx,editeng/escpitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/fhgtitem.hxx,editeng/fhgtitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/flditem.hxx,editeng/flditem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/flstitem.hxx,editeng/flstitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/fontitem.hxx,editeng/fontitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/forbiddencharacterstable.hxx,editeng/forbiddencharacterstable.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/forbiddenruleitem.hxx,editeng/forbiddenruleitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/frmdir.hxx,editeng/frmdir.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/frmdiritem.hxx,editeng/frmdiritem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/fwdtitem.hxx,editeng/fwdtitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/hangulhanja.hxx,editeng/hangulhanja.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/hngpnctitem.hxx,editeng/hngpnctitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/hyznitem.hxx,editeng/hyznitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/itemtype.hxx,editeng/itemtype.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/keepitem.hxx,editeng/keepitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/kernitem.hxx,editeng/kernitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/langitem.hxx,editeng/langitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/lcolitem.hxx,editeng/lcolitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/lrspitem.hxx,editeng/lrspitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/lspcitem.hxx,editeng/lspcitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/measfld.hxx,editeng/measfld.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/memberids.hrc,editeng/memberids.hrc))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/mutxhelp.hxx,editeng/mutxhelp.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/nhypitem.hxx,editeng/nhypitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/nlbkitem.hxx,editeng/nlbkitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/numdef.hxx,editeng/numdef.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/numitem.hxx,editeng/numitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/opaqitem.hxx,editeng/opaqitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/optitems.hxx,editeng/optitems.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/orphitem.hxx,editeng/orphitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/outliner.hxx,editeng/outliner.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/outlobj.hxx,editeng/outlobj.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/paperinf.hxx,editeng/paperinf.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/paragraphdata.hxx,editeng/paragraphdata.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/paravertalignitem.hxx,editeng/paravertalignitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/pbinitem.hxx,editeng/pbinitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/pgrditem.hxx,editeng/pgrditem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/pmdlitem.hxx,editeng/pmdlitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/postitem.hxx,editeng/postitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/prntitem.hxx,editeng/prntitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/protitem.hxx,editeng/protitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/prszitem.hxx,editeng/prszitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/scriptspaceitem.hxx,editeng/scriptspaceitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/scripttypeitem.hxx,editeng/scripttypeitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/shaditem.hxx,editeng/shaditem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/shdditem.hxx,editeng/shdditem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/sizeitem.hxx,editeng/sizeitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/SpellPortions.hxx,editeng/SpellPortions.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/spltitem.hxx,editeng/spltitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/splwrap.hxx,editeng/splwrap.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/svxacorr.hxx,editeng/svxacorr.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/svxenum.hxx,editeng/svxenum.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/svxfont.hxx,editeng/svxfont.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/svxrtf.hxx,editeng/svxrtf.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/swafopt.hxx,editeng/swafopt.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/tstpitem.hxx,editeng/tstpitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/twolinesitem.hxx,editeng/twolinesitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/txtrange.hxx,editeng/txtrange.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/udlnitem.hxx,editeng/udlnitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/ulspitem.hxx,editeng/ulspitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoedhlp.hxx,editeng/unoedhlp.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoedprx.hxx,editeng/unoedprx.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoedsrc.hxx,editeng/unoedsrc.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unofdesc.hxx,editeng/unofdesc.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unofield.hxx,editeng/unofield.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/UnoForbiddenCharsTable.hxx,editeng/UnoForbiddenCharsTable.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unofored.hxx,editeng/unofored.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoforou.hxx,editeng/unoforou.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoipset.hxx,editeng/unoipset.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unolingu.hxx,editeng/unolingu.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unonrule.hxx,editeng/unonrule.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unopracc.hxx,editeng/unopracc.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoprnms.hxx,editeng/unoprnms.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unotext.hxx,editeng/unotext.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoviwed.hxx,editeng/unoviwed.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/unoviwou.hxx,editeng/unoviwou.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/wghtitem.hxx,editeng/wghtitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/widwitem.hxx,editeng/widwitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/writingmodeitem.hxx,editeng/writingmodeitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/wrlmitem.hxx,editeng/wrlmitem.hxx))
+$(eval $(call gb_Package_add_file,editeng_inc,inc/editeng/xmlcnitm.hxx,editeng/xmlcnitm.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/editeng/prj/build.lst b/editeng/prj/build.lst
index 551a21bc37f2..3c714c6dac25 100644
--- a/editeng/prj/build.lst
+++ b/editeng/prj/build.lst
@@ -1,13 +1,3 @@
 ed	editeng	:	l10n svtools xmloff linguistic NULL
-ed	editeng										usr1	-	all	ed_mkout NULL
-ed	editeng\inc									nmake	-	all	ed_inc NULL
-ed	editeng\source\items						nmake	-	all	ed_items ed_inc NULL
-ed	editeng\source\editeng						nmake	-	all	ed_eeng ed_inc NULL
-ed	editeng\source\misc							nmake	-	all	ed_misc ed_inc NULL
-ed	editeng\source\outliner						nmake	-	all	ed_outl ed_inc NULL
-ed	editeng\source\rtf							nmake	-	all	ed_rtf ed_inc NULL
-ed	editeng\source\uno							nmake	-	all	ed_uno ed_inc NULL
-ed	editeng\source\xml							nmake	-	all	ed_xml ed_inc NULL
-ed	editeng\source\accessibility				nmake	-	all	ed_accessibility ed_inc NULL
-ed  editeng\util                                nmake   -   all ed_util ed_rtf ed_eeng ed_items ed_outl ed_uno ed_xml ed_accessibility ed_misc NULL
+ed	editeng\prj									nmake	-	all	ed_prj NULL
 
diff --git a/editeng/util/makefile.pmk b/editeng/prj/makefile.mk
index fac1139d7b89..e312a7ccab65 100644
--- a/editeng/util/makefile.pmk
+++ b/editeng/prj/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.pmk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,19 +25,16 @@
 #
 #*************************************************************************
 
-# define EDITENG_DLLIMPLEMENTATION (see @ editengdllapi.h)
-CDEFS += -DEDITENG_DLLIMPLEMENTATION
+PRJ=..
+TARGET=prj
 
-.IF "$(ENABLE_GTK)" != ""
-CFLAGS+=-DENABLE_GTK
-.ENDIF
-
-.IF "$(ENABLE_KDE)" != ""
-CFLAGS+=-DENABLE_KDE
-.ENDIF
+.INCLUDE : settings.mk
 
-.IF "$(ENABLE_KDE4)" != ""
-CFLAGS+=-DENABLE_KDE4
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
 .ENDIF
 
-VISIBILITY_HIDDEN=TRUE
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/editeng/source/accessibility/makefile.mk b/editeng/source/accessibility/makefile.mk
deleted file mode 100644
index 80cb6df746e5..000000000000
--- a/editeng/source/accessibility/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.25 $
-#
-# 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=editeng
-TARGET=accessibility
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
-    $(SLO)$/AccessibleStringWrap.obj			\
-    $(SLO)$/AccessibleContextBase.obj			\
-    $(SLO)$/AccessibleComponentBase.obj			\
-    $(SLO)$/AccessibleSelectionBase.obj			\
-    $(SLO)$/AccessibleStaticTextBase.obj		\
-    $(SLO)$/AccessibleParaManager.obj			\
-    $(SLO)$/AccessibleEditableTextPara.obj		\
-    $(SLO)$/AccessibleHyperlink.obj			    \
-    $(SLO)$/AccessibleImageBullet.obj			
-    
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/editeng/source/editeng/makefile.mk b/editeng/source/editeng/makefile.mk
deleted file mode 100644
index 4a8f8f254070..000000000000
--- a/editeng/source/editeng/makefile.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=editeng
-TARGET=editeng
-AUTOSEG=true
-
-#PROJECTPCH4DLL=TRUE
-#PROJECTPCH=eeng_pch
-#PROJECTPCHSOURCE=eeng_pch
-
-ENABLE_EXCEPTIONS=TRUE
-
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(editdebug)" != "" || "$(EDITDEBUG)" != ""
-CDEFS+=-DEDITDEBUG
-.ENDIF
-
-SLOFILES =	\
-            $(SLO)$/textconv.obj \
-            $(SLO)$/editattr.obj \
-            $(SLO)$/editdbg.obj	\
-            $(SLO)$/editdoc.obj	\
-            $(SLO)$/editdoc2.obj \
-            $(SLO)$/editeng.obj	\
-            $(SLO)$/editobj.obj	\
-            $(SLO)$/editsel.obj	\
-            $(SLO)$/editundo.obj \
-            $(SLO)$/editview.obj  \
-            $(SLO)$/edtspell.obj \
-            $(SLO)$/eehtml.obj \
-            $(SLO)$/eerdll.obj	\
-            $(SLO)$/eeobj.obj \
-            $(SLO)$/eertfpar.obj \
-            $(SLO)$/impedit.obj	\
-            $(SLO)$/impedit2.obj \
-            $(SLO)$/impedit3.obj \
-            $(SLO)$/impedit4.obj \
-            $(SLO)$/impedit5.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES=	editeng.src
-
-EXCEPTIONSFILES= \
-    $(SLO)$/unolingu.obj
-
-.INCLUDE :  target.mk
-
diff --git a/editeng/source/items/makefile.mk b/editeng/source/items/makefile.mk
deleted file mode 100644
index 512db7cc34bd..000000000000
--- a/editeng/source/items/makefile.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.19 $
-#
-# 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=..$/..
-
-#PROJECTPCH4DLL=TRUE
-#PROJECTPCH=svxpch
-#PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch
-#ENABLE_EXCEPTIONS=TRUE
-
-PRJNAME=editeng
-TARGET=items
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=items
-SRC1FILES =  \
-        page.src \
-        svxitems.src
-
-SLOFILES= \
-                $(SLO)$/optitems.obj    \
-                $(SLO)$/svdfield.obj \
-        $(SLO)$/writingmodeitem.obj \
-        $(SLO)$/frmitems.obj \
-        $(SLO)$/paraitem.obj \
-        $(SLO)$/textitem.obj \
-        $(SLO)$/flditem.obj \
-        $(SLO)$/svxfont.obj \
-        $(SLO)$/paperinf.obj    \
-        $(SLO)$/itemtype.obj	\
-        $(SLO)$/bulitem.obj \
-        $(SLO)$/numitem.obj \
-        $(SLO)$/xmlcnitm.obj \
-        $(SLO)$/charhiddenitem.obj
-
-EXCEPTIONSFILES= \
-        $(SLO)$/svdfield.obj \
-        $(SLO)$/paraitem.obj \
-        $(SLO)$/frmitems.obj \
-        $(SLO)$/numitem.obj\
-        $(SLO)$/xmlcnitm.obj\
-        $(SLO)$/flditem.obj
-
-.INCLUDE :	target.mk
-
diff --git a/editeng/source/misc/makefile.mk b/editeng/source/misc/makefile.mk
deleted file mode 100644
index 7eb2d80447a1..000000000000
--- a/editeng/source/misc/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.18 $
-#
-# 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=editeng
-TARGET=misc
-
-#PROJECTPCH4DLL=TRUE
-#PROJECTPCH=eeng_pch
-#PROJECTPCHSOURCE=eeng_pch
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(editdebug)" != "" || "$(EDITDEBUG)" != ""
-CDEFS+=-DEDITDEBUG
-.ENDIF
-
-SLOFILES =	\
-    $(SLO)$/edtdlg.obj \
-    $(SLO)$/unolingu.obj \
-    $(SLO)$/acorrcfg.obj \
-    $(SLO)$/forbiddencharacterstable.obj \
-    $(SLO)$/hangulhanja.obj \
-    $(SLO)$/splwrap.obj \
-    $(SLO)$/svxacorr.obj \
-    $(SLO)$/SvXMLAutoCorrectExport.obj \
-    $(SLO)$/SvXMLAutoCorrectImport.obj \
-    $(SLO)$/swafopt.obj \
-    $(SLO)$/txtrange.obj
-
-SRS1NAME=misc
-SRC1FILES =  \
-        lingu.src
-
-.INCLUDE :  target.mk
-
diff --git a/editeng/source/uno/makefile.mk b/editeng/source/uno/makefile.mk
deleted file mode 100644
index 573dd21508a2..000000000000
--- a/editeng/source/uno/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=editeng
-TARGET=uno
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-        $(SLO)$/unonrule.obj	\
-        $(SLO)$/unoedsrc.obj	\
-        $(SLO)$/unoedhlp.obj	\
-        $(SLO)$/unofdesc.obj	\
-        $(SLO)$/unoviwou.obj	\
-        $(SLO)$/unofored.obj	\
-        $(SLO)$/unoforou.obj	\
-        $(SLO)$/unoipset.obj	\
-        $(SLO)$/unotext.obj		\
-        $(SLO)$/unotext2.obj	\
-        $(SLO)$/unofield.obj	\
-        $(SLO)$/UnoForbiddenCharsTable.obj \
-        $(SLO)$/unopracc.obj	\
-        $(SLO)$/unoedprx.obj	\
-        $(SLO)$/unoviwed.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/editeng/source/xml/makefile.mk b/editeng/source/xml/makefile.mk
deleted file mode 100644
index bfcfeb70f123..000000000000
--- a/editeng/source/xml/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.12 $
-#
-# 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=editeng
-TARGET=xml
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-SLOFILES = \
-        $(SLO)$/xmltxtimp.obj		\
-        $(SLO)$/xmltxtexp.obj		
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/editeng/util/makefile.mk b/editeng/util/makefile.mk
deleted file mode 100644
index a11bde28aed3..000000000000
--- a/editeng/util/makefile.mk
+++ /dev/null
@@ -1,102 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.61 $
-#
-# 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=editeng
-TARGET=editeng
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# -------------
-
-HELPIDFILES=    ..$/inc$/helpid.hrc
-
-# editeng
-SHL1TARGET= editeng$(DLLPOSTFIX)
-SHL1IMPLIB= iediteng
-SHL1USE_EXPORTS=name
-SHL1LIBS= \
-    $(SLB)$/items.lib     \
-    $(SLB)$/misc.lib	\
-    $(SLB)$/rtf.lib	\
-    $(SLB)$/uno.lib	\
-    $(SLB)$/accessibility.lib	\
-    $(SLB)$/editeng.lib \
-    $(SLB)$/outliner.lib \
-    $(SLB)$/xml.lib 
-
-SHL1STDLIBS= \
-             $(XMLOFFLIB) \
-             $(BASEGFXLIB) \
-             $(LNGLIB) \
-             $(SVTOOLLIB) \
-             $(TKLIB) \
-             $(VCLLIB) \
-             $(SVLLIB) \
-             $(SOTLIB) \
-             $(UNOTOOLSLIB) \
-             $(TOOLSLIB) \
-             $(I18NISOLANGLIB) \
-             $(I18NPAPERLIB) \
-             $(COMPHELPERLIB) \
-             $(UCBHELPERLIB) \
-             $(CPPUHELPERLIB) \
-             $(CPPULIB) \
-             $(VOSLIB) \
-             $(SALLIB) \
-             $(ICUUCLIB)
-
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=	$(SHL1TARGET)
-DEFLIB1NAME=$(TARGET)
-
-# ------------------------------------------------------------------------------
-
-# Resource files
-SRSFILELIST=\
-        $(SRS)$/editeng.srs \
-        $(SRS)$/outliner.srs \
-        $(SRS)$/misc.srs \
-        $(SRS)$/items.srs
-
-RESLIB1NAME=editeng
-RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/svdraw
-RESLIB1SRSFILES= $(SRSFILELIST)
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-