[Libreoffice-commits] .: 7 commits - sd/AllLangResTarget_sd.mk sd/CppUnitTest_sd_uimpress.mk sd/inc sd/Library_sdd.mk sd/Library_sdfilt.mk sd/Library_sd.mk sd/Library_sdui.mk sd/Module_sd.mk sd/Package_inc.mk sd/Package_qa_unit.mk sd/Package_uiconfig.mk sd/Package_web.mk sd/Package_xml.mk sd/prj sd/qa sd/sdi sd/source sd/util slideshow/CppunitTest_slideshow.mk slideshow/Executable_demoshow.mk slideshow/inc slideshow/Library_OGLTrans.mk slideshow/Library_slideshow.mk slideshow/Makefile slideshow/Module_slideshow.mk slideshow/prj slideshow/source slideshow/test slideshow/util

David Tardon dtardon at kemper.freedesktop.org
Thu Apr 21 12:02:40 PDT 2011


 sd/AllLangResTarget_sd.mk                          |  110 ++++
 sd/CppUnitTest_sd_uimpress.mk                      |   93 +++
 sd/Library_sd.mk                                   |  526 +++++++++++++++++++++
 sd/Library_sdd.mk                                  |   63 ++
 sd/Library_sdfilt.mk                               |  105 ++++
 sd/Library_sdui.mk                                 |  101 ++++
 sd/Module_sd.mk                                    |   14 
 sd/Package_inc.mk                                  |   32 +
 sd/Package_qa_unit.mk                              |   41 +
 sd/Package_uiconfig.mk                             |  129 +++++
 sd/Package_web.mk                                  |   58 ++
 sd/Package_xml.mk                                  |   62 ++
 sd/inc/makefile.mk                                 |   48 -
 sd/prj/build.lst                                   |   47 -
 sd/prj/d.lst                                       |   60 --
 sd/prj/makefile.mk                                 |   40 +
 sd/qa/unit/Makefile                                |   48 +
 sd/qa/unit/makefile.mk                             |  127 -----
 sd/qa/unit/uimpress.cxx                            |    6 
 sd/sdi/makefile.mk                                 |   97 ---
 sd/source/core/annotations/makefile.mk             |   49 -
 sd/source/core/makefile.mk                         |   78 ---
 sd/source/core/text/makefile.mk                    |   48 -
 sd/source/core/undo/makefile.mk                    |   50 -
 sd/source/filter/cgm/makefile.mk                   |   45 -
 sd/source/filter/eppt/makefile.mk                  |   57 --
 sd/source/filter/grf/makefile.mk                   |   44 -
 sd/source/filter/html/buttonset.hxx                |    4 
 sd/source/filter/html/makefile.mk                  |   68 --
 sd/source/filter/makefile.mk                       |   54 --
 sd/source/filter/ppt/makefile.mk                   |   57 --
 sd/source/filter/ppt/pptatom.cpp                   |  122 ----
 sd/source/filter/ppt/pptatom.cxx                   |  122 ++++
 sd/source/filter/xml/makefile.mk                   |   47 -
 sd/source/helper/makefile.mk                       |   47 -
 sd/source/ui/accessibility/makefile.mk             |   71 --
 sd/source/ui/animations/makefile.mk                |   65 --
 sd/source/ui/annotations/makefile.mk               |   56 --
 sd/source/ui/app/makefile.mk                       |  102 ----
 sd/source/ui/controller/makefile.mk                |   50 -
 sd/source/ui/dlg/ins_paste.cxx                     |    4 
 sd/source/ui/dlg/layeroptionsdlg.cxx               |    3 
 sd/source/ui/dlg/makefile.mk                       |  196 -------
 sd/source/ui/docshell/makefile.mk                  |   56 --
 sd/source/ui/framework/configuration/makefile.mk   |   63 --
 sd/source/ui/framework/factories/makefile.mk       |   60 --
 sd/source/ui/framework/module/makefile.mk          |   62 --
 sd/source/ui/framework/tools/makefile.mk           |   51 --
 sd/source/ui/func/bulmaper.cxx                     |    4 
 sd/source/ui/func/makefile.mk                      |  185 -------
 sd/source/ui/inc/bulmaper.hxx                      |    4 
 sd/source/ui/inc/ins_paste.hxx                     |    4 
 sd/source/ui/inc/layeroptionsdlg.hxx               |    4 
 sd/source/ui/notes/makefile.mk                     |   60 --
 sd/source/ui/presenter/makefile.mk                 |   56 --
 sd/source/ui/slideshow/makefile.mk                 |   65 --
 sd/source/ui/slidesorter/cache/makefile.mk         |   64 --
 sd/source/ui/slidesorter/controller/makefile.mk    |   69 --
 sd/source/ui/slidesorter/makefile.mk               |   58 --
 sd/source/ui/slidesorter/model/makefile.mk         |   57 --
 sd/source/ui/slidesorter/shell/makefile.mk         |   55 --
 sd/source/ui/slidesorter/view/makefile.mk          |   69 --
 sd/source/ui/table/makefile.mk                     |   56 --
 sd/source/ui/toolpanel/controls/makefile.mk        |   67 --
 sd/source/ui/toolpanel/makefile.mk                 |   70 --
 sd/source/ui/tools/makefile.mk                     |   61 --
 sd/source/ui/unoidl/makefile.mk                    |   90 ---
 sd/source/ui/view/makefile.mk                      |  122 ----
 sd/source/unotypes/makefile.mk                     |   47 -
 sd/util/makefile.mk                                |  301 ------------
 slideshow/CppunitTest_slideshow.mk                 |   77 +++
 slideshow/Executable_demoshow.mk                   |   71 ++
 slideshow/Library_OGLTrans.mk                      |  111 ++++
 slideshow/Library_slideshow.mk                     |  185 +++++++
 slideshow/Makefile                                 |   38 +
 slideshow/Module_slideshow.mk                      |   41 +
 slideshow/inc/makefile.mk                          |   47 -
 slideshow/prj/build.lst                            |   12 
 slideshow/prj/d.lst                                |    8 
 slideshow/prj/makefile.mk                          |   40 +
 slideshow/source/engine/OGLTrans/mac/makefile.mk   |   87 ---
 slideshow/source/engine/OGLTrans/unx/makefile.mk   |   73 --
 slideshow/source/engine/OGLTrans/win/makefile.mk   |   80 ---
 slideshow/source/engine/activities/makefile.mk     |   53 --
 slideshow/source/engine/animationnodes/makefile.mk |   61 --
 slideshow/source/engine/makefile.mk                |  102 ----
 slideshow/source/engine/shapes/makefile.mk         |   60 --
 slideshow/source/engine/slide/makefile.mk          |   51 --
 slideshow/source/engine/transitions/makefile.mk    |   73 --
 slideshow/test/makefile.mk                         |  104 ----
 slideshow/test/slidetest.cxx                       |    5 
 slideshow/util/makefile.mk                         |  112 ----
 92 files changed, 2122 insertions(+), 4475 deletions(-)

New commits:
commit 1b74e62915959646f690279e052a8aded0ddc69f
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Apr 21 20:54:23 2011 +0200

    build resources too

diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 88d7681..9e03dc6 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -28,6 +28,7 @@
 $(eval $(call gb_Module_Module,sd))
 
 $(eval $(call gb_Module_add_targets,sd,\
+    AllLangResTarget_sd \
     CppUnitTest_sd_uimpress \
     Library_sd \
     Library_sdd \
commit c054db20b58086e989604d3cd4f1f617acc4725f
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Apr 21 19:35:16 2011 +0200

    deliver sd/res

diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 644de2b..88d7681 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Module_add_targets,sd,\
     Package_inc \
     Package_qa_unit \
     Package_uiconfig \
+    Package_web \
     Package_xml \
 ))
 
diff --git a/sd/Package_web.mk b/sd/Package_web.mk
new file mode 100644
index 0000000..da37053
--- /dev/null
+++ b/sd/Package_web.mk
@@ -0,0 +1,58 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,sd_web,$(SRCDIR)/sd/res))
+
+$(eval $(call gb_Package_add_file,sd_web,pck/glas-blue.zip,buttons/glas-blue.zip))
+$(eval $(call gb_Package_add_file,sd_web,pck/glas-green.zip,buttons/glas-green.zip))
+$(eval $(call gb_Package_add_file,sd_web,pck/glas-red.zip,buttons/glas-red.zip))
+$(eval $(call gb_Package_add_file,sd_web,pck/round-gorilla.zip,buttons/round-gorilla.zip))
+$(eval $(call gb_Package_add_file,sd_web,pck/round-white.zip,buttons/round-white.zip))
+$(eval $(call gb_Package_add_file,sd_web,pck/simple.zip,buttons/simple.zip))
+$(eval $(call gb_Package_add_file,sd_web,pck/square-blue.zip,buttons/square-blue.zip))
+$(eval $(call gb_Package_add_file,sd_web,pck/square-gray.zip,buttons/square-gray.zip))
+$(eval $(call gb_Package_add_file,sd_web,pck/square-green.zip,buttons/square-green.zip))
+$(eval $(call gb_Package_add_file,sd_web,pck/square-red.zip,buttons/square-red.zip))
+$(eval $(call gb_Package_add_file,sd_web,pck/square-yellow.zip,buttons/square-yellow.zip))
+$(eval $(call gb_Package_add_file,sd_web,pck/common.inc,webview/common.inc))
+$(eval $(call gb_Package_add_file,sd_web,pck/common.pl,webview/common.pl))
+$(eval $(call gb_Package_add_file,sd_web,pck/edit.asp,webview/edit.asp))
+$(eval $(call gb_Package_add_file,sd_web,pck/editpic.asp,webview/editpic.asp))
+$(eval $(call gb_Package_add_file,sd_web,pck/editpic.pl,webview/editpic.pl))
+$(eval $(call gb_Package_add_file,sd_web,pck/edit.pl,webview/edit.pl))
+$(eval $(call gb_Package_add_file,sd_web,pck/index.pl,webview/index.pl))
+$(eval $(call gb_Package_add_file,sd_web,pck/poll.asp,webview/poll.asp))
+$(eval $(call gb_Package_add_file,sd_web,pck/poll.pl,webview/poll.pl))
+$(eval $(call gb_Package_add_file,sd_web,pck/savepic.asp,webview/savepic.asp))
+$(eval $(call gb_Package_add_file,sd_web,pck/savepic.pl,webview/savepic.pl))
+$(eval $(call gb_Package_add_file,sd_web,pck/show.asp,webview/show.asp))
+$(eval $(call gb_Package_add_file,sd_web,pck/show.pl,webview/show.pl))
+# the following two files are really renamed
+$(eval $(call gb_Package_add_file,sd_web,pck/webcast.asp,webview/webview.asp))
+$(eval $(call gb_Package_add_file,sd_web,pck/webcast.pl,webview/webview.pl))
+
+# vim: set noet ts=4 sw=4:
commit da6dd3b61d3f5024c0832fe80d562d0db8f83f3c
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Apr 21 19:25:46 2011 +0200

    the xml/ prefix is the other way around

diff --git a/sd/Package_xml.mk b/sd/Package_xml.mk
index f29a9dc..5c511cf 100644
--- a/sd/Package_xml.mk
+++ b/sd/Package_xml.mk
@@ -27,36 +27,36 @@
 
 $(eval $(call gb_Package_Package,sd_xml,$(SRCDIR)/sd/xml))
 
-$(eval $(call gb_Package_add_file,sd_xml,AccessibleDrawDocumentView.xml,xml/AccessibleDrawDocumentView.xml))
-$(eval $(call gb_Package_add_file,sd_xml,AccessibleOutlineView.xml,xml/AccessibleOutlineView.xml))
-$(eval $(call gb_Package_add_file,sd_xml,AccessiblePageShape.xml,xml/AccessiblePageShape.xml))
-$(eval $(call gb_Package_add_file,sd_xml,AccessiblePresentationGraphicShape.xml,xml/AccessiblePresentationGraphicShape.xml))
-$(eval $(call gb_Package_add_file,sd_xml,AccessiblePresentationOLEShape.xml,xml/AccessiblePresentationOLEShape.xml))
-$(eval $(call gb_Package_add_file,sd_xml,AccessiblePresentationShape.xml,xml/AccessiblePresentationShape.xml))
-$(eval $(call gb_Package_add_file,sd_xml,AccessibleSlideViewObject.xml,xml/AccessibleSlideViewObject.xml))
-$(eval $(call gb_Package_add_file,sd_xml,AccessibleSlideView.xml,xml/AccessibleSlideView.xml))
-$(eval $(call gb_Package_add_file,sd_xml,DrawingView.xml,xml/DrawingView.xml))
-$(eval $(call gb_Package_add_file,sd_xml,effects.xml,xml/effects.xml))
-$(eval $(call gb_Package_add_file,sd_xml,HandoutView.xml,xml/HandoutView.xml))
-$(eval $(call gb_Package_add_file,sd_xml,NotesView.xml,xml/NotesView.xml))
-$(eval $(call gb_Package_add_file,sd_xml,OutlineView.xml,xml/OutlineView.xml))
-$(eval $(call gb_Package_add_file,sd_xml,PresentationView.xml,xml/PresentationView.xml))
-$(eval $(call gb_Package_add_file,sd_xml,SdDocLinkTargets.xml,xml/SdDocLinkTargets.xml))
-$(eval $(call gb_Package_add_file,sd_xml,SdDrawPagesAccess.xml,xml/SdDrawPagesAccess.xml))
-$(eval $(call gb_Package_add_file,sd_xml,SdDrawPage.xml,xml/SdDrawPage.xml))
-$(eval $(call gb_Package_add_file,sd_xml,SdGenericDrawPage.xml,xml/SdGenericDrawPage.xml))
-$(eval $(call gb_Package_add_file,sd_xml,SdLayerManager.xml,xml/SdLayerManager.xml))
-$(eval $(call gb_Package_add_file,sd_xml,SdLayer.xml,xml/SdLayer.xml))
-$(eval $(call gb_Package_add_file,sd_xml,SdMasterPagesAccess.xml,xml/SdMasterPagesAccess.xml))
-$(eval $(call gb_Package_add_file,sd_xml,SdMasterPage.xml,xml/SdMasterPage.xml))
-$(eval $(call gb_Package_add_file,sd_xml,SdPageLinkTargets.xml,xml/SdPageLinkTargets.xml))
-$(eval $(call gb_Package_add_file,sd_xml,SdXCustomPresentationAccess.xml,xml/SdXCustomPresentationAccess.xml))
-$(eval $(call gb_Package_add_file,sd_xml,SdXCustomPresentation.xml,xml/SdXCustomPresentation.xml))
-$(eval $(call gb_Package_add_file,sd_xml,SdXImpressDocument.xml,xml/SdXImpressDocument.xml))
-$(eval $(call gb_Package_add_file,sd_xml,SdXPresentation.xml,xml/SdXPresentation.xml))
-$(eval $(call gb_Package_add_file,sd_xml,SdXShape.xml,xml/SdXShape.xml))
-$(eval $(call gb_Package_add_file,sd_xml,SlidesView.xml,xml/SlidesView.xml))
-$(eval $(call gb_Package_add_file,sd_xml,transitions-ogl.xml,xml/transitions-ogl.xml))
-$(eval $(call gb_Package_add_file,sd_xml,transitions.xml,xml/transitions.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/AccessibleDrawDocumentView.xml,AccessibleDrawDocumentView.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/AccessibleOutlineView.xml,AccessibleOutlineView.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/AccessiblePageShape.xml,AccessiblePageShape.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/AccessiblePresentationGraphicShape.xml,AccessiblePresentationGraphicShape.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/AccessiblePresentationOLEShape.xml,AccessiblePresentationOLEShape.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/AccessiblePresentationShape.xml,AccessiblePresentationShape.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/AccessibleSlideViewObject.xml,AccessibleSlideViewObject.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/AccessibleSlideView.xml,AccessibleSlideView.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/DrawingView.xml,DrawingView.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/effects.xml,effects.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/HandoutView.xml,HandoutView.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/NotesView.xml,NotesView.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/OutlineView.xml,OutlineView.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/PresentationView.xml,PresentationView.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/SdDocLinkTargets.xml,SdDocLinkTargets.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/SdDrawPagesAccess.xml,SdDrawPagesAccess.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/SdDrawPage.xml,SdDrawPage.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/SdGenericDrawPage.xml,SdGenericDrawPage.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/SdLayerManager.xml,SdLayerManager.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/SdLayer.xml,SdLayer.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/SdMasterPagesAccess.xml,SdMasterPagesAccess.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/SdMasterPage.xml,SdMasterPage.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/SdPageLinkTargets.xml,SdPageLinkTargets.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/SdXCustomPresentationAccess.xml,SdXCustomPresentationAccess.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/SdXCustomPresentation.xml,SdXCustomPresentation.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/SdXImpressDocument.xml,SdXImpressDocument.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/SdXPresentation.xml,SdXPresentation.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/SdXShape.xml,SdXShape.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/SlidesView.xml,SlidesView.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/transitions-ogl.xml,transitions-ogl.xml))
+$(eval $(call gb_Package_add_file,sd_xml,xml/transitions.xml,transitions.xml))
 
 # vim: set noet ts=4 sw=4:
commit a9f8fe02e4048197f472d24d88150dcf9d686c26
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Apr 21 18:35:37 2011 +0200

    be prepared for nonexist. dir

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index daf2c36..5663fd9 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -518,7 +518,8 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
 endif
 
 $(WORKDIR)/inc/sd/sduilib.hxx :
-	echo \#define DLL_NAME \"$(if $(filter UNX,$(GUI)),lib)sdui$(DLLPOSTFIX)$(DLLPOST)\" > $@
+	mkdir -p $(dir $@) && \
+		echo \#define DLL_NAME \"$(if $(filter UNX,$(GUI)),lib)sdui$(DLLPOSTFIX)$(DLLPOST)\" > $@
 
 $(call gb_CxxObject_get_target,sd/source/ui/dlg/sdabstdlg) : $(WORKDIR)/inc/sd/sduilib.hxx
 
commit ff5bb2a535f868ef17e5dc4b28326749c094cede
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Apr 20 10:31:26 2011 +0200

    gbuildize slideshow

diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk
new file mode 100644
index 0000000..3105f90
--- /dev/null
+++ b/slideshow/CppunitTest_slideshow.mk
@@ -0,0 +1,77 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_CppunitTest_CppunitTest,slideshow))
+
+$(eval $(call gb_CppunitTest_add_package_headers,slideshow,sd_qa_unit))
+
+$(eval $(call gb_CppunitTest_set_include,slideshow,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/slideshow/inc/pch) \
+    -I$(realpath $(SRCDIR)/slideshow/source/inc) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_CppunitTest_set_defs,slideshow,\
+    $$(DEFS) \
+    $(if $(filter TRUE,$(VERBOSE)),-DVERBOSE) \
+))
+
+ifneq ($(strip $(debug)$(DEBUG)),)
+$(eval $(call gb_CppunitTest_set_defs,slideshow,\
+    $$(DEFS) \
+    -DBOOST_SP_ENABLE_DEBUG_HOOKS \
+))
+endif
+
+$(eval $(call gb_CppunitTest_add_library_objects,slideshow,slideshow))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,slideshow,\
+    avmedia \
+    basegfx \
+    canvastools \
+    comphelper \
+    cppcanvas \
+    cppu \
+    cppuhelper \
+    sal \
+    svt \
+    tl \
+    utl \
+    vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,slideshow,\
+    slideshow/test/slidetest \
+    slideshow/test/testshape \
+    slideshow/test/testview \
+    slideshow/test/views \
+))
+
+# vim: set noet sw=4:
diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk
new file mode 100644
index 0000000..6c54ff5
--- /dev/null
+++ b/slideshow/Executable_demoshow.mk
@@ -0,0 +1,71 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,demoshow))
+
+$(eval $(call gb_Executable_add_package_headers,demoshow,sd_qa_unit))
+
+$(eval $(call gb_Executable_set_include,demoshow,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/slideshow/inc/pch) \
+    -I$(realpath $(SRCDIR)/slideshow/source/inc) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+ifeq ($(strip $(VERBOSE)),TRUE)
+$(eval $(call gb_Executable_set_defs,demoshow,\
+    $$(DEFS) \
+    -DVERBOSE \
+))
+endif
+
+ifneq ($(strip $(debug)$(DEBUG)),)
+$(eval $(call gb_Executable_set_defs,demoshow,\
+    $$(DEFS) \
+    -DBOOST_SP_ENABLE_DEBUG_HOOKS \
+))
+endif
+
+$(eval $(call gb_Executable_add_linked_libs,demoshow,\
+    basegfx \
+    comphelper \
+    cppcanvas \
+    cppu \
+    cppuhelper \
+    sal \
+    tl \
+    ucbhelper \
+    vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,demoshow,\
+    slideshow/test/demoshow \
+))
+
+# vim: set noet sw=4:
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
new file mode 100644
index 0000000..4a94e9c
--- /dev/null
+++ b/slideshow/Library_OGLTrans.mk
@@ -0,0 +1,111 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,OGLTrans))
+
+$(eval $(call gb_Library_add_precompiled_header,OGLTrans,$(SRCDIR)/sd/inc/pch/precompiled_sd))
+
+$(eval $(call gb_Library_set_include,OGLTrans,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/slideshow/inc/pch) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+ifeq ($(strip $(VERBOSE)),TRUE)
+$(eval $(call gb_Library_set_defs,OGLTrans,\
+    $$(DEFS) \
+    -DVERBOSE \
+))
+endif
+
+ifneq ($(strip $(debug)$(DEBUG)),)
+$(eval $(call gb_Library_set_defs,OGLTrans,\
+    $$(DEFS) \
+    -DBOOST_SP_ENABLE_DEBUG_HOOKS \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,OGLTrans,\
+    canvastools \
+    comphelper \
+    cppu \
+    cppuhelper \
+    sal \
+    vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,OGLTrans,slideshow/source/engine/OGLTrans/ogltrans))
+
+ifeq ($(strip $(OS)),MACOSX)
+$(eval $(call gb_Library_add_objcobjects,OGLTrans,\
+    slideshow/source/engine/OGLTrans/mac/aquaOpenGLView \
+    slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders \
+    , $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+
+$(eval $(call gb_Library_add_objcxxobjects,OGLTrans,\
+    slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl \
+    slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl \
+    , $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,OGLTrans,\
+    Cocoa \
+    GLUT \
+    OpenGL \
+))
+
+else ifeq ($(strip $(OS)),WNT)
+$(eval $(call gb_Library_add_linked_libs,OGLTrans,\
+    gdi32 \
+    glu32 \
+    opengl32 \
+))
+
+$(eval $(call gb_Library_add_exception_objects,OGLTrans,\
+    slideshow/source/engine/OGLTrans/win/OGLTrans_Shaders \
+    slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl \
+    slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl \
+))
+
+else
+$(eval $(call gb_Library_add_exception_objects,OGLTrans,\
+    slideshow/source/engine/OGLTrans/unx/OGLTrans_Shaders \
+    slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl \
+    slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl \
+))
+
+$(eval $(call gb_Library_add_linked_libs,OGLTrans,\
+    GL \
+    GLU \
+    X11 \
+))
+endif
+
+# vim: set noet ts=4 sw=4:
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
new file mode 100644
index 0000000..3823474
--- /dev/null
+++ b/slideshow/Library_slideshow.mk
@@ -0,0 +1,185 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,slideshow))
+
+$(eval $(call gb_Library_add_precompiled_header,slideshow,$(SRCDIR)/slideshow/inc/pch/precompiled_slideshow))
+
+$(eval $(call gb_Library_set_include,slideshow,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/slideshow/inc/pch) \
+    -I$(realpath $(SRCDIR)/slideshow/source/inc) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,slideshow,\
+    $$(DEFS) \
+    -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
+    $(if $(filter TRUE,$(VERBOSE)),-DVERBOSE) \
+))
+
+ifneq ($(strip $(debug)$(DEBUG)),)
+$(eval $(call gb_Library_set_defs,slideshow,\
+    $$(DEFS) \
+    -DBOOST_SP_ENABLE_DEBUG_HOOKS \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,slideshow,\
+    avmedia \
+    basegfx \
+    canvastools \
+    comphelper \
+    cppcanvas \
+    cppu \
+    cppuhelper \
+    sal \
+    svt \
+    tl \
+    utl \
+    vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,slideshow,slideshow/util/slideshow))
+
+$(eval $(call gb_Library_add_exception_objects,slideshow,\
+    slideshow/source/engine/activities/activitiesfactory \
+    slideshow/source/engine/activities/activitybase \
+    slideshow/source/engine/activities/continuousactivitybase \
+    slideshow/source/engine/activities/continuouskeytimeactivitybase \
+    slideshow/source/engine/activities/discreteactivitybase \
+    slideshow/source/engine/activitiesqueue \
+    slideshow/source/engine/activities/simplecontinuousactivitybase \
+    slideshow/source/engine/animatedsprite \
+    slideshow/source/engine/animationfactory \
+    slideshow/source/engine/animationnodes/animationaudionode \
+    slideshow/source/engine/animationnodes/animationbasenode \
+    slideshow/source/engine/animationnodes/animationcolornode \
+    slideshow/source/engine/animationnodes/animationcommandnode \
+    slideshow/source/engine/animationnodes/animationnodefactory \
+    slideshow/source/engine/animationnodes/animationpathmotionnode \
+    slideshow/source/engine/animationnodes/animationsetnode \
+    slideshow/source/engine/animationnodes/animationtransformnode \
+    slideshow/source/engine/animationnodes/animationtransitionfilternode \
+    slideshow/source/engine/animationnodes/basecontainernode \
+    slideshow/source/engine/animationnodes/basenode \
+    slideshow/source/engine/animationnodes/generateevent \
+    slideshow/source/engine/animationnodes/nodetools \
+    slideshow/source/engine/animationnodes/paralleltimecontainer \
+    slideshow/source/engine/animationnodes/propertyanimationnode \
+    slideshow/source/engine/animationnodes/sequentialtimecontainer \
+    slideshow/source/engine/attributemap \
+    slideshow/source/engine/color \
+    slideshow/source/engine/debug \
+    slideshow/source/engine/delayevent \
+    slideshow/source/engine/effectrewinder \
+    slideshow/source/engine/eventmultiplexer \
+    slideshow/source/engine/eventqueue \
+    slideshow/source/engine/expressionnodefactory \
+    slideshow/source/engine/rehearsetimingsactivity \
+    slideshow/source/engine/screenupdater \
+    slideshow/source/engine/shapeattributelayer \
+    slideshow/source/engine/shapes/appletshape \
+    slideshow/source/engine/shapes/backgroundshape \
+    slideshow/source/engine/shapes/drawinglayeranimation \
+    slideshow/source/engine/shapes/drawshape \
+    slideshow/source/engine/shapes/drawshapesubsetting \
+    slideshow/source/engine/shapes/externalshapebase \
+    slideshow/source/engine/shapes/gdimtftools \
+    slideshow/source/engine/shapes/intrinsicanimationactivity \
+    slideshow/source/engine/shapes/mediashape \
+    slideshow/source/engine/shapes/shapeimporter \
+    slideshow/source/engine/shapesubset \
+    slideshow/source/engine/shapes/viewappletshape \
+    slideshow/source/engine/shapes/viewbackgroundshape \
+    slideshow/source/engine/shapes/viewmediashape \
+    slideshow/source/engine/shapes/viewshape \
+    slideshow/source/engine/slidebitmap \
+    slideshow/source/engine/slide/layer \
+    slideshow/source/engine/slide/layermanager \
+    slideshow/source/engine/slide/shapemanagerimpl \
+    slideshow/source/engine/slideshowcontext \
+    slideshow/source/engine/slideshowimpl \
+    slideshow/source/engine/slide/slideanimations \
+    slideshow/source/engine/slide/slideimpl \
+    slideshow/source/engine/slide/userpaintoverlay \
+    slideshow/source/engine/slideview \
+    slideshow/source/engine/soundplayer \
+    slideshow/source/engine/tools \
+    slideshow/source/engine/transitions/barndoorwipe \
+    slideshow/source/engine/transitions/barwipepolypolygon \
+    slideshow/source/engine/transitions/boxwipe \
+    slideshow/source/engine/transitions/checkerboardwipe \
+    slideshow/source/engine/transitions/clippingfunctor \
+    slideshow/source/engine/transitions/clockwipe \
+    slideshow/source/engine/transitions/combtransition \
+    slideshow/source/engine/transitions/doublediamondwipe \
+    slideshow/source/engine/transitions/ellipsewipe \
+    slideshow/source/engine/transitions/fanwipe \
+    slideshow/source/engine/transitions/figurewipe \
+    slideshow/source/engine/transitions/fourboxwipe \
+    slideshow/source/engine/transitions/iriswipe \
+    slideshow/source/engine/transitions/parametricpolypolygonfactory \
+    slideshow/source/engine/transitions/pinwheelwipe \
+    slideshow/source/engine/transitions/randomwipe \
+    slideshow/source/engine/transitions/shapetransitionfactory \
+    slideshow/source/engine/transitions/slidechangebase \
+    slideshow/source/engine/transitions/slidetransitionfactory \
+    slideshow/source/engine/transitions/snakewipe \
+    slideshow/source/engine/transitions/spiralwipe \
+    slideshow/source/engine/transitions/sweepwipe \
+    slideshow/source/engine/transitions/transitionfactorytab \
+    slideshow/source/engine/transitions/transitiontools \
+    slideshow/source/engine/transitions/veewipe \
+    slideshow/source/engine/transitions/waterfallwipe \
+    slideshow/source/engine/transitions/zigzagwipe \
+    slideshow/source/engine/unoviewcontainer \
+    slideshow/source/engine/usereventqueue \
+    slideshow/source/engine/waitsymbol \
+    slideshow/source/engine/wakeupevent \
+))
+
+ifeq ($(strip $(OS)),MACOSX)
+$(eval $(call gb_Library_add_cxxobjects,slideshow,\
+    slideshow/source/engine/smilfunctionparser \
+    , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+$(eval $(call gb_Library_add_exception_objects,slideshow,\
+    slideshow/source/engine/smilfunctionparser \
+))
+endif
+
+ifneq ($(strip $(debug)$(DEBUG)),)
+$(eval $(call gb_Library_add_exception_objects,slideshow,\
+    slideshow/source/engine/sp_debug \
+))
+endif
+
+# vim: set noet ts=4 sw=4:
diff --git a/slideshow/Makefile b/slideshow/Makefile
new file mode 100644
index 0000000..c898975
--- /dev/null
+++ b/slideshow/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.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/slideshow/Module_slideshow.mk b/slideshow/Module_slideshow.mk
new file mode 100644
index 0000000..0c39701
--- /dev/null
+++ b/slideshow/Module_slideshow.mk
@@ -0,0 +1,41 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,slideshow))
+
+$(eval $(call gb_Module_add_targets,slideshow,\
+    $(if $(filter TRUE,$(ENABLE_OPENGL)),Library_OGLTrans) \
+    Library_slideshow \
+))
+
+# not working
+    # CppunitTest_slideshow \
+
+# not built normally (and unbuildable anyway ;)
+    # Executable_demoshow \
+
+# vim: set noet ts=4 sw=4:
diff --git a/slideshow/inc/makefile.mk b/slideshow/inc/makefile.mk
deleted file mode 100644
index ac68ba0..0000000
--- a/slideshow/inc/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=slideshow
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/slideshow/prj/build.lst b/slideshow/prj/build.lst
index 25ecb52..30c3d3a 100644
--- a/slideshow/prj/build.lst
+++ b/slideshow/prj/build.lst
@@ -1,13 +1,3 @@
 pe	slideshow	:	tools sal cppu vcl comphelper cppuhelper offuh cppcanvas basegfx svtools unotools toolkit animations avmedia MESA:Mesa LIBXSLT:libxslt NULL
 pe	slideshow								usr1	-	all	pe_mkout NULL
-pe	slideshow\inc							nmake	-	all	pe_inc NULL
-pe	slideshow\source\engine					nmake	-	all	pe_engine pe_inc NULL
-pe	slideshow\source\engine\slide			nmake	-	all	pe_slide pe_inc NULL
-pe	slideshow\source\engine\shapes			nmake	-	all	pe_shapes pe_inc NULL
-pe	slideshow\source\engine\OGLTrans\unx        nmake   -   u pe_ogltrans_unx pe_ogltrans_mac.u pe_inc NULL
-pe	slideshow\source\engine\OGLTrans\win        nmake   -   w pe_ogltrans_win pe_inc NULL
-pe	slideshow\source\engine\OGLTrans\mac        nmake   -   u pe_ogltrans_mac pe_transitions pe_inc NULL
-pe	slideshow\source\engine\transitions		nmake	-	all	pe_transitions pe_inc NULL
-pe	slideshow\source\engine\animationnodes	nmake	-	all	pe_animationnodes pe_inc NULL
-pe	slideshow\source\engine\activities		nmake	-	all	pe_activities pe_inc NULL
-pe	slideshow\util							nmake	-	all	pe_util pe_shapes pe_slide pe_activities pe_animationnodes pe_transitions pe_ogltrans_mac.u pe_ogltrans_unx.u pe_ogltrans_win.w pe_engine NULL
+pe	slideshow\prj							nmake	-	all	pe_prj NULL
diff --git a/slideshow/prj/d.lst b/slideshow/prj/d.lst
index f6707c2..e69de29 100644
--- a/slideshow/prj/d.lst
+++ b/slideshow/prj/d.lst
@@ -1,8 +0,0 @@
-..\%__SRC%\bin\OGLTrans.uno.dll %_DEST%\bin%_EXT%\OGLTrans.uno.dll
-..\%__SRC%\bin\slidesho*.dll %_DEST%\bin%_EXT%\slidesho*.dll
-..\%__SRC%\bin\*.rdb %_DEST%\bin%_EXT%\*.rdb
-..\%__SRC%\lib\slideshow.uno.so %_DEST%\lib%_EXT%\slideshow.uno.so
-..\%__SRC%\lib\OGLTrans.uno.so %_DEST%\lib%_EXT%\OGLTrans.uno.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\misc\ogltrans.component %_DEST%\xml%_EXT%\ogltrans.component
-..\%__SRC%\misc\slideshow.component %_DEST%\xml%_EXT%\slideshow.component
diff --git a/slideshow/prj/makefile.mk b/slideshow/prj/makefile.mk
new file mode 100755
index 0000000..e312a7c
--- /dev/null
+++ b/slideshow/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/slideshow/source/engine/OGLTrans/mac/makefile.mk b/slideshow/source/engine/OGLTrans/mac/makefile.mk
deleted file mode 100644
index aaaedb9..0000000
--- a/slideshow/source/engine/OGLTrans/mac/makefile.mk
+++ /dev/null
@@ -1,87 +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
-#
-# 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=..$/..$/..$/..
-
-.IF "$(OS)" != "MACOSX"
-all:
-    @echo "Nothing to build for this platform"
-.ELIF "$(ENABLE_OPENGL)" != "TRUE"
-all:
-    @echo "Building without OpenGL transitions"
-.ENDIF
-
-
-PRJNAME=slideshow
-TARGET=OGLTrans
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :      settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Common ----------------------------------------------------------
-
-.IF "$(OS)"=="WNT"
-IMPL_SUBDIR=win
-.ELIF "$(OS)"=="MACOSX"
-IMPL_SUBDIR=mac
-.ELSE
-IMPL_SUBDIR=unx
-.ENDIF
-
-SLOFILES = \
-    $(SLO)$/OGLTrans_Shaders.obj \
-    $(SLO)$/OGLTrans_TransitionImpl.obj \
-    $(SLO)$/aquaOpenGLView.obj \
-    $(SLO)$/OGLTrans_TransitionerImpl.obj
-
-SHL1TARGET=$(TARGET).uno
-
-SHL1STDLIBS= $(SALLIB) $(VCLLIB) $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB)
-
-SHL1STDLIBS += \
-    -framework OpenGL \
-    -framework Cocoa \
-    -framework GLUT
-
-CFLAGSCXX+= -x objective-c++ -fobjc-exceptions
-
-
-SHL1IMPLIB=i$(TARGET)
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=../exports.dxp
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/slideshow/source/engine/OGLTrans/unx/makefile.mk b/slideshow/source/engine/OGLTrans/unx/makefile.mk
deleted file mode 100644
index 31066e3..0000000
--- a/slideshow/source/engine/OGLTrans/unx/makefile.mk
+++ /dev/null
@@ -1,73 +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
-#
-# 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=slideshow
-TARGET=OGLTrans
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :      settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Nothing to do if we're compiling with --disable-opengl or if nto the right OS  -----------
-.IF "$(ENABLE_OPENGL)" != "TRUE"  || "$(OS)" == "MACOSX"
- at all:
-    @echo "Building without OpenGL Transitions..."
-.ENDIF
-
-# --- Common ----------------------------------------------------------
-
-SLOFILES = \
-    $(SLO)$/OGLTrans_TransitionImpl.obj \
-    $(SLO)$/OGLTrans_Shaders.obj \
-    $(SLO)$/OGLTrans_TransitionerImpl.obj
-
-DLLPRE=
-SHL1TARGET=$(TARGET).uno
-
-SHL1STDLIBS= $(SALLIB) $(VCLLIB) $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB)
-
-SHL1STDLIBS+= \
-    -lGL \
-    -lGLU \
-    -lX11
-
-SHL1IMPLIB=i$(TARGET)
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=../exports.dxp
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/slideshow/source/engine/OGLTrans/win/makefile.mk b/slideshow/source/engine/OGLTrans/win/makefile.mk
deleted file mode 100644
index 7da3787..0000000
--- a/slideshow/source/engine/OGLTrans/win/makefile.mk
+++ /dev/null
@@ -1,80 +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
-#
-# 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=slideshow
-TARGET=OGLTrans
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :      settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Nothing to do if we're compiling with --disable-opengl -----------
-.IF "$(ENABLE_OPENGL)" != "TRUE" || "$(OS)" != "WNT"
- at all:
-    @echo "Building without OpenGL Transitions..."
-.ENDIF
-
-# --- Common ----------------------------------------------------------
-
-SLOFILES = \
-    $(SLO)$/OGLTrans_TransitionImpl.obj \
-    $(SLO)$/OGLTrans_Shaders.obj \
-    $(SLO)$/OGLTrans_TransitionerImpl.obj
-
-SHL1TARGET=$(TARGET).uno
-
-SHL1STDLIBS= $(SALLIB) $(VCLLIB) $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB)
-
-SHL1STDLIBS += \
-    opengl32.lib \
-    glu32.lib \
-    gdi32.lib
-
-SHL1IMPLIB=i$(TARGET)
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-SHL1VERSIONMAP=../exports.map
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=../exports.dxp
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/ogltrans.component
-
-$(MISC)/ogltrans.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        ogltrans.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt ogltrans.component
diff --git a/slideshow/source/engine/activities/makefile.mk b/slideshow/source/engine/activities/makefile.mk
deleted file mode 100644
index fc24b40..0000000
--- a/slideshow/source/engine/activities/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=slideshow
-TARGET=activities
-ENABLE_EXCEPTIONS=TRUE
-PRJINC=..$/..
-
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Common ----------------------------------------------------------
-
-SLOFILES =	$(SLO)$/activitybase.obj 					\
-            $(SLO)$/activitiesfactory.obj 				\
-            $(SLO)$/continuousactivitybase.obj			\
-            $(SLO)$/continuouskeytimeactivitybase.obj	\
-            $(SLO)$/discreteactivitybase.obj			\
-            $(SLO)$/simplecontinuousactivitybase.obj
-
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/slideshow/source/engine/animationnodes/makefile.mk b/slideshow/source/engine/animationnodes/makefile.mk
deleted file mode 100644
index fc1c803..0000000
--- a/slideshow/source/engine/animationnodes/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=slideshow
-TARGET=animationnodes
-ENABLE_EXCEPTIONS=TRUE
-PRJINC=..$/..
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :      settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Common ----------------------------------------------------------
-
-SLOFILES = $(SLO)$/animationaudionode.obj \
-           $(SLO)$/animationcommandnode.obj \
-           $(SLO)$/animationbasenode.obj \
-           $(SLO)$/animationcolornode.obj \
-           $(SLO)$/animationnodefactory.obj \
-           $(SLO)$/animationpathmotionnode.obj \
-           $(SLO)$/animationsetnode.obj \
-           $(SLO)$/animationtransformnode.obj \
-           $(SLO)$/animationtransitionfilternode.obj \
-           $(SLO)$/basecontainernode.obj \
-           $(SLO)$/basenode.obj \
-           $(SLO)$/nodetools.obj \
-           $(SLO)$/paralleltimecontainer.obj \
-           $(SLO)$/propertyanimationnode.obj \
-           $(SLO)$/sequentialtimecontainer.obj \
-           $(SLO)$/generateevent.obj
-
-# ==========================================================================
-
-.INCLUDE :      target.mk
diff --git a/slideshow/source/engine/makefile.mk b/slideshow/source/engine/makefile.mk
deleted file mode 100644
index fdc99cd..0000000
--- a/slideshow/source/engine/makefile.mk
+++ /dev/null
@@ -1,102 +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=slideshow
-TARGET=engine
-ENABLE_EXCEPTIONS=TRUE
-
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.IF "$(ENABLE_PRESENTER_EXTRA_UI)"=="YES"
-ENABLE_PRESENTER_EXTRA_UI is not used anymore
-.ENDIF
-
-# --- Common ----------------------------------------------------------
-
-ENVCFLAGS += -DBOOST_SPIRIT_USE_OLD_NAMESPACE
-
-.IF "$(OS)"=="SOLARIS"
-.IF "$(CCNUMVER)"=="00050009"
-# SunStudio12: anachronism warning in boost code (smilfunctionparser.cxx)
-# reevaluate with newer boost or compiler version
-CFLAGSWARNCXX!:=$(CFLAGSWARNCXX),badargtype2w
-.ENDIF
-.ENDIF
-
-# Disable optimization for SunCC Sparc (funny loops
-# when parsing e.g. "x+width/2")
-# Do not disable optimization for SunCC++ 5.5 Solaris x86,
-# this compiler has an ICE on smilfunctionparser.cxx *without*
-# optimization
-.IF "$(OS)$(CPU)"=="SOLARISS" && "$(COM)"!="GCC"
-NOOPTFILES= $(SLO)$/smilfunctionparser.obj
-.ENDIF
-# same issue for MACOSX
-.IF "$(OS)"=="MACOSX"
-NOOPTFILES= $(SLO)$/smilfunctionparser.obj
-.ENDIF
-
-SLOFILES =	$(SLO)$/activitiesqueue.obj \
-            $(SLO)$/animatedsprite.obj \
-            $(SLO)$/animationfactory.obj \
-            $(SLO)$/attributemap.obj \
-            $(SLO)$/color.obj \
-            $(SLO)$/delayevent.obj \
-            $(SLO)$/effectrewinder.obj \
-            $(SLO)$/eventmultiplexer.obj \
-            $(SLO)$/eventqueue.obj \
-            $(SLO)$/expressionnodefactory.obj \
-            $(SLO)$/rehearsetimingsactivity.obj \
-            $(SLO)$/screenupdater.obj \
-            $(SLO)$/shapeattributelayer.obj \
-            $(SLO)$/shapesubset.obj \
-            $(SLO)$/slidebitmap.obj \
-            $(SLO)$/slideshowcontext.obj \
-            $(SLO)$/slideshowimpl.obj \
-            $(SLO)$/slideview.obj \
-            $(SLO)$/smilfunctionparser.obj \
-            $(SLO)$/soundplayer.obj \
-            $(SLO)$/tools.obj \
-            $(SLO)$/unoviewcontainer.obj \
-            $(SLO)$/usereventqueue.obj \
-            $(SLO)$/waitsymbol.obj \
-            $(SLO)$/wakeupevent.obj \
-            $(SLO)$/debug.obj
-
-.IF "$(debug)"!="" || "$(DEBUG)"!=""
-SLOFILES +=  $(SLO)$/sp_debug.obj
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/slideshow/source/engine/shapes/makefile.mk b/slideshow/source/engine/shapes/makefile.mk
deleted file mode 100644
index 1d40c16..0000000
--- a/slideshow/source/engine/shapes/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=slideshow
-TARGET=shapes
-ENABLE_EXCEPTIONS=TRUE
-PRJINC=..$/..
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Common ----------------------------------------------------------
-
-SLOFILES =	$(SLO)$/appletshape.obj \
-            $(SLO)$/backgroundshape.obj \
-            $(SLO)$/drawinglayeranimation.obj \
-            $(SLO)$/drawshape.obj \
-            $(SLO)$/drawshapesubsetting.obj \
-            $(SLO)$/externalshapebase.obj \
-            $(SLO)$/gdimtftools.obj \
-            $(SLO)$/intrinsicanimationactivity.obj \
-            $(SLO)$/mediashape.obj \
-            $(SLO)$/shapeimporter.obj \
-            $(SLO)$/viewappletshape.obj \
-            $(SLO)$/viewbackgroundshape.obj \
-            $(SLO)$/viewmediashape.obj \
-            $(SLO)$/viewshape.obj
-
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/slideshow/source/engine/slide/makefile.mk b/slideshow/source/engine/slide/makefile.mk
deleted file mode 100644
index 953307d..0000000
--- a/slideshow/source/engine/slide/makefile.mk
+++ /dev/null
@@ -1,51 +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=slideshow
-TARGET=slide
-ENABLE_EXCEPTIONS=TRUE
-PRJINC=..$/..
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Common ----------------------------------------------------------
-
-SLOFILES =	$(SLO)$/layer.obj \
-            $(SLO)$/layermanager.obj \
-            $(SLO)$/shapemanagerimpl.obj \
-            $(SLO)$/slideanimations.obj \
-            $(SLO)$/slideimpl.obj  \
-            $(SLO)$/userpaintoverlay.obj
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/slideshow/source/engine/transitions/makefile.mk b/slideshow/source/engine/transitions/makefile.mk
deleted file mode 100644
index a5fbd56..0000000
--- a/slideshow/source/engine/transitions/makefile.mk
+++ /dev/null
@@ -1,73 +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=slideshow
-TARGET=transitions
-ENABLE_EXCEPTIONS=TRUE
-PRJINC=..$/..
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :      settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Common ----------------------------------------------------------
-
-SLOFILES = \
-        $(SLO)$/barwipepolypolygon.obj \
-        $(SLO)$/boxwipe.obj \
-        $(SLO)$/clippingfunctor.obj \
-        $(SLO)$/combtransition.obj \
-        $(SLO)$/fourboxwipe.obj \
-        $(SLO)$/barndoorwipe.obj \
-        $(SLO)$/iriswipe.obj \
-        $(SLO)$/veewipe.obj \
-        $(SLO)$/ellipsewipe.obj \
-        $(SLO)$/checkerboardwipe.obj \
-        $(SLO)$/randomwipe.obj \
-        $(SLO)$/waterfallwipe.obj \
-        $(SLO)$/clockwipe.obj \
-        $(SLO)$/fanwipe.obj \
-        $(SLO)$/pinwheelwipe.obj \
-        $(SLO)$/snakewipe.obj \
-        $(SLO)$/spiralwipe.obj \
-        $(SLO)$/sweepwipe.obj \
-        $(SLO)$/figurewipe.obj \
-        $(SLO)$/doublediamondwipe.obj \
-        $(SLO)$/zigzagwipe.obj \
-        $(SLO)$/parametricpolypolygonfactory.obj \
-        $(SLO)$/shapetransitionfactory.obj \
-        $(SLO)$/slidetransitionfactory.obj \
-        $(SLO)$/transitionfactorytab.obj \
-        $(SLO)$/transitiontools.obj \
-        $(SLO)$/slidechangebase.obj
-
-# ==========================================================================
-
-.INCLUDE :      target.mk
diff --git a/slideshow/test/makefile.mk b/slideshow/test/makefile.mk
deleted file mode 100644
index d5a7089..0000000
--- a/slideshow/test/makefile.mk
+++ /dev/null
@@ -1,104 +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=slideshow
-PRJINC=$(PRJ)$/source
-TARGET=tests
-TARGETTYPE=GUI
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-# --- Common ----------------------------------------------------------
-
-# BEGIN target1 -------------------------------------------------------
-SHL1OBJS=  \
-    $(SLO)$/views.obj	  \
-    $(SLO)$/slidetest.obj \
-    $(SLO)$/testshape.obj \
-    $(SLO)$/testview.obj
-
-SHL1TARGET= tests
-SHL1STDLIBS= 	$(SALLIB)		 \
-                $(BASEGFXLIB)	 \
-                $(CPPUHELPERLIB) \
-                $(CPPULIB)		 \
-                $(CPPUNITLIB)	 \
-                $(UNOTOOLSLIB)	 \
-                $(VCLLIB)
-
-.IF "$(OS)"=="WNT"
-    SHL1STDLIBS+=$(LIBPRE) islideshowtest.lib
-.ELSE
-    SHL1STDLIBS+=-lslideshowtest$(DLLPOSTFIX)
-.ENDIF
-
-SHL1IMPLIB= i$(SHL1TARGET)
-
-DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map
-SHL1RPATH = NONE
-
-# END target1 ----------------------------------------------------------
-
-# BEGIN target2 --------------------------------------------------------
-APP2OBJS=  \
-    $(SLO)$/demoshow.obj
-
-APP2TARGET= demoshow
-APP2STDLIBS=$(TOOLSLIB) 		\
-            $(COMPHELPERLIB)	\
-            $(CPPCANVASLIB)		\
-            $(CPPULIB)			\
-            $(CPPUHELPERLIB)	\
-            $(UCBHELPERLIB)		\
-            $(SALLIB)			\
-            $(VCLLIB)			\
-            $(BASEGFXLIB)
-
-.IF "$(GUI)"!="UNX"
-APP2DEF=	$(MISC)$/$(TARGET).def
-.ENDIF
-# END target2 ----------------------------------------------------------------
-
-#------------------------------- All object files ----------------------------
-
-# do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
diff --git a/slideshow/test/slidetest.cxx b/slideshow/test/slidetest.cxx
index c8589cc..f43c284 100644
--- a/slideshow/test/slidetest.cxx
+++ b/slideshow/test/slidetest.cxx
@@ -26,10 +26,7 @@
  *
  ************************************************************************/
 
-#include <cppunit/TestAssert.h>
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include "cppunit/plugin/TestPlugIn.h"
+#include <sal/cppunit.h>
 
 #include <cppuhelper/compbase1.hxx>
 #include <comphelper/broadcasthelper.hxx>
diff --git a/slideshow/util/makefile.mk b/slideshow/util/makefile.mk
deleted file mode 100644
index 9d9bee1..0000000
--- a/slideshow/util/makefile.mk
+++ /dev/null
@@ -1,112 +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=slideshow
-TARGET=slideshow
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Common ----------------------------------------------------------
-
-.IF "$(VERBOSE)"=="TRUE"
-CDEFS+=-DVERBOSE
-.ENDIF
-
-SHL1DLLPRE=
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1FILES=\
-    $(SLB)$/transitions.lib	\
-    $(SLB)$/activities.lib	\
-    $(SLB)$/animationnodes.lib	\
-    $(SLB)$/shapes.lib \
-    $(SLB)$/slide.lib \
-    $(SLB)$/engine.lib
-
-SHL1TARGET=$(TARGET).uno
-
-SHL1STDLIBS= $(TOOLSLIB) \
-             $(CPPULIB) \
-             $(SALLIB) \
-             $(VCLLIB) \
-             $(COMPHELPERLIB) \
-             $(CPPUHELPERLIB) \
-             $(BASEGFXLIB) \
-             $(CANVASTOOLSLIB) \
-             $(CPPCANVASLIB) \
-             $(UNOTOOLSLIB) \
-             $(SVTOOLLIB) \
-             $(AVMEDIALIB)
-
-SHL1IMPLIB=i$(TARGET)
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-# ==========================================================================
-
-TARGET2=slideshowtest
-LIB2TARGET=$(SLB)$/$(TARGET2).lib
-LIB2FILES=$(LIB1FILES)
-
-SHL2TARGET=$(TARGET2)$(DLLPOSTFIX)
-SHL2IMPLIB=i$(TARGET2)
-SHL2STDLIBS= $(SHL1STDLIBS)
-
-SHL2DEF=$(MISC)$/$(SHL2TARGET).def
-SHL2LIBS=$(SLB)$/$(TARGET2).lib
-
-DEF2NAME	=$(SHL2TARGET)
-DEF2LIBNAME = $(TARGET2)
-DEF2DEPN	=$(MISC)$/$(SHL2TARGET).flt
-
-DEF2DES		=SlideShowTest
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
-
-$(MISC)$/$(SHL2TARGET).flt: makefile.mk \
-                            $(TARGET2).flt
-    +$(TYPE) $(TARGET2).flt > $@
-
-
-ALLTAR : $(MISC)/slideshow.component
-
-$(MISC)/slideshow.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        slideshow.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt slideshow.component
commit 1bc4081f0e3bd5dbf2b3ad10744792ef9d04ae82
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Apr 20 08:59:00 2011 +0200

    gbuildize sd

diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
new file mode 100644
index 0000000..68a5c6b
--- /dev/null
+++ b/sd/AllLangResTarget_sd.mk
@@ -0,0 +1,110 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,sd))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,sd,sd))
+
+$(eval $(call gb_AllLangResTarget_add_srs,sd,\
+    sd/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,sd/res))
+
+$(eval $(call gb_SrsTarget_set_include,sd/res,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/sd/inc) \
+    -I$(realpath $(SRCDIR)/sd/source/ui/inc) \
+    -I$(realpath $(SRCDIR)/sd/source/ui/slidesorter/inc) \
+    -I$(WORKDIR)/inc/sd \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,sd/res,\
+    sd/source/core/glob.src \
+    sd/source/filter/html/pubdlg.src \
+    sd/source/ui/accessibility/accessibility.src \
+    sd/source/ui/animations/CustomAnimationCreateDialog.src \
+    sd/source/ui/animations/CustomAnimationDialog.src \
+    sd/source/ui/animations/CustomAnimationPane.src \
+    sd/source/ui/animations/CustomAnimation.src \
+    sd/source/ui/animations/SlideTransitionPane.src \
+    sd/source/ui/annotations/annotations.src \
+    sd/source/ui/app/app.src \
+    sd/source/ui/app/popup.src \
+    sd/source/ui/app/res_bmp.src \
+    sd/source/ui/app/sdstring.src \
+    sd/source/ui/app/strings.src \
+    sd/source/ui/app/toolbox.src \
+    sd/source/ui/dlg/animobjs.src \
+    sd/source/ui/dlg/brkdlg.src \
+    sd/source/ui/dlg/copydlg.src \
+    sd/source/ui/dlg/custsdlg.src \
+    sd/source/ui/dlg/dlgass.src \
+    sd/source/ui/dlg/dlg_char.src \
+    sd/source/ui/dlg/dlgfield.src \
+    sd/source/ui/dlg/dlgolbul.src \
+    sd/source/ui/dlg/dlgpage.src \
+    sd/source/ui/dlg/dlgsnap.src \
+    sd/source/ui/dlg/headerfooterdlg.src \
+    sd/source/ui/dlg/inspagob.src \
+    sd/source/ui/dlg/ins_paste.src \
+    sd/source/ui/dlg/LayerDialog.src \
+    sd/source/ui/dlg/layeroptionsdlg.src \
+    sd/source/ui/dlg/masterlayoutdlg.src \
+    sd/source/ui/dlg/morphdlg.src \
+    sd/source/ui/dlg/navigatr.src \
+    sd/source/ui/dlg/PaneDockingWindow.src \
+    sd/source/ui/dlg/paragr.src \
+    sd/source/ui/dlg/present.src \
+    sd/source/ui/dlg/prltempl.src \
+    sd/source/ui/dlg/prntopts.src \
+    sd/source/ui/dlg/sdpreslt.src \
+    sd/source/ui/dlg/tabtempl.src \
+    sd/source/ui/dlg/tpaction.src \
+    sd/source/ui/dlg/tpoption.src \
+    sd/source/ui/dlg/vectdlg.src \
+    sd/source/ui/notes/NotesChildWindow.src \
+    sd/source/ui/slideshow/slideshow.src \
+    sd/source/ui/slidesorter/view/SlsResource.src \
+    sd/source/ui/table/TableDesignPane.src \
+    sd/source/ui/view/DocumentRenderer.src \
+))
+
+$(eval $(call gb_SrsTarget_add_templates,sd/res,\
+    sd/source/ui/app/menuids2_tmpl.src \
+    sd/source/ui/app/menuids3_tmpl.src \
+    sd/source/ui/app/menuids4_tmpl.src \
+    sd/source/ui/app/menuids_tmpl.src \
+    sd/source/ui/app/menuportal_tmpl.src \
+    sd/source/ui/app/menu_tmpl.src \
+    sd/source/ui/app/popup2_tmpl.src \
+    sd/source/ui/app/tbxids_tmpl.src \
+    sd/source/ui/app/toolbox2_tmpl.src \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/sd/CppUnitTest_sd_uimpress.mk b/sd/CppUnitTest_sd_uimpress.mk
new file mode 100644
index 0000000..05467d7
--- /dev/null
+++ b/sd/CppUnitTest_sd_uimpress.mk
@@ -0,0 +1,93 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_CppunitTest_CppunitTest,sd_uimpress))
+
+$(eval $(call gb_CppunitTest_add_package_headers,sd_uimpress,sd_qa_unit))
+
+$(eval $(call gb_CppunitTest_set_include,sd_uimpress,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/sd/inc) \
+    -I$(realpath $(SRCDIR)/sd/inc/pch) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_CppunitTest_set_defs,sd_uimpress,\
+    $$(DEFS) \
+    -DSD_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_CppunitTest_add_library_objects,sd_uimpress,sd))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sd_uimpress,\
+    avmedia \
+    basegfx \
+    canvastools \
+    comphelper \
+    cppcanvas \
+    cppu \
+    cppuhelper \
+    drawinglayer \
+    editeng \
+    i18nisolang1 \
+    sal \
+    salhelper \
+    sb \
+    sfx \
+    sot \
+    svl \
+    svt \
+    svxcore \
+    svx \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    xo \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sd_uimpress,\
+    sd/qa/unit/uimpress \
+))
+
+$(eval $(call gb_CppunitTest_uses_ure,sd_uimpress))
+
+$(eval $(call gb_CppunitTest_set_args,sd_uimpress,\
+    --headless \
+    --invisible \
+    "-env:UNO_TYPES=$(foreach binrdb,udkapi.rdb types.rdb,\
+        file://$(if $(filter WNT,$(OS)),/)$(OUTDIR)/bin/$(binrdb))" \
+    "-env:UNO_SERVICES=$(foreach rdb,$(OUTDIR)/xml/ure/services.rdb $(WORKDIR)/CustomTarget/sd/qa/unit/services.rdb,\
+        file://$(if $(filter WNT,$(OS)),/)$(rdb))" \
+    $(foreach dir,URE_INTERNAL_LIB_DIR OOO_BASE_DIR BRAND_BASE_DIR,\
+        -env:$(dir)=file://$(if $(filter WNT,$(OS)),/$(OUTDIR)/bin,$(OUTDIR)/lib)) \
+))
+
+# vim: set noet sw=4:
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
new file mode 100644
index 0000000..daf2c36
--- /dev/null
+++ b/sd/Library_sd.mk
@@ -0,0 +1,525 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,sd))
+
+$(eval $(call gb_Library_add_precompiled_header,sd,$(SRCDIR)/sd/inc/pch/precompiled_sd))
+
+$(eval $(call gb_Library_add_sdi_headers,sd,\
+    sd/sdi/sdgslots \
+    sd/sdi/sdslots \
+))
+
+$(eval $(call gb_Library_set_include,sd,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/sd/inc) \
+    -I$(realpath $(SRCDIR)/sd/inc/pch) \
+    -I$(realpath $(SRCDIR)/sd/sdi) \
+    -I$(realpath $(SRCDIR)/sd/source/ui/inc) \
+    -I$(realpath $(SRCDIR)/sd/source/ui/slidesorter/inc) \
+    -I$(WORKDIR)/inc/sd \
+    -I$(WORKDIR)/SdiTarget/sd/sdi \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,sd,\
+    $$(DEFS) \
+    -DSD_DLLIMPLEMENTATION \
+))
+
+ifneq ($(strip $(dbg_anim_log)$(DBG_ANIM_LOG)),)
+$(eval $(call gb_Library_set_defs,sd,\
+    $$(DEFS) \
+    -DDBG_ANIM_LOG \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,sd,\
+    avmedia \
+    basegfx \
+    canvastools \
+    comphelper \
+    cppcanvas \
+    cppu \
+    cppuhelper \
+    drawinglayer \
+    editeng \
+    i18nisolang1 \
+    oox \
+    sal \
+    salhelper \
+    sax \
+    sb \
+    sfx \
+    sot \
+    svl \
+    svt \
+    svxcore \
+    svx \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,sd,sd/util/sd))
+
+$(eval $(call gb_Library_add_exception_objects,sd,\
+    sd/source/core/anminfo \
+    sd/source/core/annotations/Annotation \
+    sd/source/core/annotations/AnnotationEnumeration \
+    sd/source/core/cusshow \
+    sd/source/core/CustomAnimationCloner \
+    sd/source/core/CustomAnimationEffect \
+    sd/source/core/CustomAnimationPreset \
+    sd/source/core/drawdoc \
+    sd/source/core/drawdoc2 \
+    sd/source/core/drawdoc3 \
+    sd/source/core/drawdoc4 \
+    sd/source/core/drawdoc_animations \
+    sd/source/core/EffectMigration \
+    sd/source/core/PageListWatcher \
+    sd/source/core/pglink \
+    sd/source/core/sdattr \
+    sd/source/core/sdiocmpt \
+    sd/source/core/sdobjfac \
+    sd/source/core/sdpage \
+    sd/source/core/sdpage2 \
+    sd/source/core/sdpage_animations \
+    sd/source/core/shapelist \
+    sd/source/core/stlfamily \
+    sd/source/core/stlpool \
+    sd/source/core/stlsheet \
+    sd/source/core/text/textapi \
+    sd/source/core/TransitionPreset \
+    sd/source/core/typemap \
+    sd/source/core/undoanim \
+    sd/source/core/undo/undofactory \
+    sd/source/core/undo/undomanager \
+    sd/source/core/undo/undoobjects \
+    sd/source/filter/cgm/sdcgmfilter \
+    sd/source/filter/grf/sdgrffilter \
+    sd/source/filter/html/buttonset \
+    sd/source/filter/html/htmlex \
+    sd/source/filter/html/HtmlOptionsDialog \
+    sd/source/filter/html/sdhtmlfilter \
+    sd/source/filter/sdfilter \
+    sd/source/filter/sdpptwrp \
+    sd/source/filter/xml/sdtransform \
+    sd/source/filter/xml/sdxmlwrp \
+    sd/source/helper/simplereferencecomponent \
+    sd/source/ui/accessibility/AccessibleDocumentViewBase \
+    sd/source/ui/accessibility/AccessibleDrawDocumentView \
+    sd/source/ui/accessibility/AccessibleOutlineEditSource \
+    sd/source/ui/accessibility/AccessibleOutlineView \
+    sd/source/ui/accessibility/AccessiblePageShape \
+    sd/source/ui/accessibility/AccessiblePresentationGraphicShape \
+    sd/source/ui/accessibility/AccessiblePresentationOLEShape \
+    sd/source/ui/accessibility/AccessiblePresentationShape \
+    sd/source/ui/accessibility/AccessibleScrollPanel \
+    sd/source/ui/accessibility/AccessibleSlideSorterObject \
+    sd/source/ui/accessibility/AccessibleSlideSorterView \
+    sd/source/ui/accessibility/AccessibleTreeNode \
+    sd/source/ui/accessibility/AccessibleViewForwarder \
+    sd/source/ui/accessibility/SdShapeTypes \
+    sd/source/ui/animations/CustomAnimationCreateDialog \
+    sd/source/ui/animations/CustomAnimationDialog \
+    sd/source/ui/animations/CustomAnimationList \
+    sd/source/ui/animations/CustomAnimationPane \
+    sd/source/ui/animations/DialogListBox \
+    sd/source/ui/animations/motionpathtag \
+    sd/source/ui/animations/SlideTransitionPane \
+    sd/source/ui/animations/STLPropertySet \
+    sd/source/ui/annotations/annotationmanager \
+    sd/source/ui/annotations/annotationtag \
+    sd/source/ui/annotations/annotationwindow \
+    sd/source/ui/app/sddll \
+    sd/source/ui/app/sddll1 \
+    sd/source/ui/app/sddll2 \
+    sd/source/ui/app/sdmod \
+    sd/source/ui/app/sdmod1 \
+    sd/source/ui/app/sdmod2 \
+    sd/source/ui/app/sdpopup \
+    sd/source/ui/app/sdxfer \
+    sd/source/ui/app/tbxww \
+    sd/source/ui/app/tmplctrl \
+    sd/source/ui/controller/slidelayoutcontroller \
+    sd/source/ui/dlg/AnimationChildWindow \
+    sd/source/ui/dlg/animobjs \
+    sd/source/ui/dlg/assclass \
+    sd/source/ui/dlg/diactrl \
+    sd/source/ui/dlg/dlgctrls \
+    sd/source/ui/dlg/docprev \
+    sd/source/ui/dlg/filedlg \
+    sd/source/ui/dlg/gluectrl \
+    sd/source/ui/dlg/ins_paste \
+    sd/source/ui/dlg/LayerDialogChildWindow \
+    sd/source/ui/dlg/LayerDialogContent \
+    sd/source/ui/dlg/layeroptionsdlg \
+    sd/source/ui/dlg/LayerTabBar \
+    sd/source/ui/dlg/NavigatorChildWindow \
+    sd/source/ui/dlg/navigatr \
+    sd/source/ui/dlg/PaneChildWindows \
+    sd/source/ui/dlg/PaneDockingWindow \
+    sd/source/ui/dlg/PaneShells \
+    sd/source/ui/dlg/sdabstdlg \
+    sd/source/ui/dlg/sdtreelb \
+    sd/source/ui/dlg/SpellDialogChildWindow \
+    sd/source/ui/dlg/TemplateScanner \
+    sd/source/ui/dlg/unchss \
+    sd/source/ui/docshell/docshel2 \
+    sd/source/ui/docshell/docshel3 \
+    sd/source/ui/docshell/docshel4 \
+    sd/source/ui/docshell/docshell \
+    sd/source/ui/docshell/grdocsh \
+    sd/source/ui/docshell/sdclient \
+    sd/source/ui/framework/configuration/ChangeRequestQueue \
+    sd/source/ui/framework/configuration/ChangeRequestQueueProcessor \
+    sd/source/ui/framework/configuration/Configuration \
+    sd/source/ui/framework/configuration/ConfigurationClassifier \
+    sd/source/ui/framework/configuration/ConfigurationController \
+    sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster \
+    sd/source/ui/framework/configuration/ConfigurationControllerResourceManager \
+    sd/source/ui/framework/configuration/ConfigurationTracer \
+    sd/source/ui/framework/configuration/ConfigurationUpdater \
+    sd/source/ui/framework/configuration/GenericConfigurationChangeRequest \
+    sd/source/ui/framework/configuration/ResourceFactoryManager \
+    sd/source/ui/framework/configuration/ResourceId \
+    sd/source/ui/framework/configuration/UpdateRequest \
+    sd/source/ui/framework/factories/BasicPaneFactory \
+    sd/source/ui/framework/factories/BasicToolBarFactory \
+    sd/source/ui/framework/factories/BasicViewFactory \
+    sd/source/ui/framework/factories/ChildWindowPane \
+    sd/source/ui/framework/factories/FrameWindowPane \
+    sd/source/ui/framework/factories/FullScreenPane \
+    sd/source/ui/framework/factories/Pane \
+    sd/source/ui/framework/factories/PresentationFactory \
+    sd/source/ui/framework/factories/TaskPanelFactory \
+    sd/source/ui/framework/factories/ViewShellWrapper \
+    sd/source/ui/framework/module/CenterViewFocusModule \
+    sd/source/ui/framework/module/DrawModule \
+    sd/source/ui/framework/module/ImpressModule \
+    sd/source/ui/framework/module/ModuleController \
+    sd/source/ui/framework/module/PresentationModule \
+    sd/source/ui/framework/module/ReadOnlyModeObserver \
+    sd/source/ui/framework/module/ResourceManager \
+    sd/source/ui/framework/module/ShellStackGuard \
+    sd/source/ui/framework/module/SlideSorterModule \
+    sd/source/ui/framework/module/ToolBarModule \
+    sd/source/ui/framework/module/ToolPanelModule \
+    sd/source/ui/framework/module/ViewTabBarModule \
+    sd/source/ui/framework/tools/FrameworkHelper \
+    sd/source/ui/func/bulmaper \
+    sd/source/ui/func/fuarea \
+    sd/source/ui/func/fubullet \
+    sd/source/ui/func/fuchar \
+    sd/source/ui/func/fucon3d \
+    sd/source/ui/func/fuconarc \
+    sd/source/ui/func/fuconbez \
+    sd/source/ui/func/fuconcs \
+    sd/source/ui/func/fuconnct \
+    sd/source/ui/func/fuconrec \
+    sd/source/ui/func/fuconstr \
+    sd/source/ui/func/fuconuno \
+    sd/source/ui/func/fucopy \
+    sd/source/ui/func/fucushow \
+    sd/source/ui/func/fudraw \
+    sd/source/ui/func/fudspord \
+    sd/source/ui/func/fuediglu \
+    sd/source/ui/func/fuexpand \
+    sd/source/ui/func/fuformatpaintbrush \
+    sd/source/ui/func/fuhhconv \
+    sd/source/ui/func/fuinsert \
+    sd/source/ui/func/fuinsfil \
+    sd/source/ui/func/fuline \
+    sd/source/ui/func/fulinend \
+    sd/source/ui/func/fulink \
+    sd/source/ui/func/fumeasur \
+    sd/source/ui/func/fumorph \
+    sd/source/ui/func/fuoaprms \
+    sd/source/ui/func/fuolbull \
+    sd/source/ui/func/fuoltext \
+    sd/source/ui/func/fuoutl \
+    sd/source/ui/func/fupage \
+    sd/source/ui/func/fuparagr \
+    sd/source/ui/func/fupoor \
+    sd/source/ui/func/fuprlout \
+    sd/source/ui/func/fuprobjs \
+    sd/source/ui/func/fuscale \
+    sd/source/ui/func/fusearch \
+    sd/source/ui/func/fusel \
+    sd/source/ui/func/fusldlg \
+    sd/source/ui/func/fusnapln \
+    sd/source/ui/func/fusumry \
+    sd/source/ui/func/futempl \
+    sd/source/ui/func/futhes \
+    sd/source/ui/func/futransf \
+    sd/source/ui/func/futxtatt \
+    sd/source/ui/func/fuvect \
+    sd/source/ui/func/fuzoom \
+    sd/source/ui/func/sdundo \
+    sd/source/ui/func/sdundogr \
+    sd/source/ui/func/smarttag \
+    sd/source/ui/func/undoback \
+    sd/source/ui/func/undoheaderfooter \
+    sd/source/ui/func/undolayer \
+    sd/source/ui/func/undopage \
+    sd/source/ui/func/unmovss \
+    sd/source/ui/func/unoaprms \
+    sd/source/ui/func/unprlout \
+    sd/source/ui/presenter/CanvasUpdateRequester \
+    sd/source/ui/presenter/PresenterCanvas \
+    sd/source/ui/presenter/PresenterHelper \
+    sd/source/ui/presenter/PresenterPreviewCache \
+    sd/source/ui/presenter/PresenterTextView \
+    sd/source/ui/presenter/SlideRenderer \
+    sd/source/ui/slideshow/PaneHider \
+    sd/source/ui/slideshow/showwin \
+    sd/source/ui/slideshow/slideshow \
+    sd/source/ui/slideshow/slideshowimpl \
+    sd/source/ui/slideshow/SlideShowRestarter \
+    sd/source/ui/slideshow/slideshowviewimpl \
+    sd/source/ui/slidesorter/cache/SlsBitmapCache \
+    sd/source/ui/slidesorter/cache/SlsBitmapCompressor \
+    sd/source/ui/slidesorter/cache/SlsBitmapFactory \
+    sd/source/ui/slidesorter/cache/SlsCacheCompactor \
+    sd/source/ui/slidesorter/cache/SlsCacheConfiguration \
+    sd/source/ui/slidesorter/cache/SlsGenericPageCache \
+    sd/source/ui/slidesorter/cache/SlsPageCache \
+    sd/source/ui/slidesorter/cache/SlsPageCacheManager \
+    sd/source/ui/slidesorter/cache/SlsQueueProcessor \
+    sd/source/ui/slidesorter/cache/SlsRequestFactory \
+    sd/source/ui/slidesorter/cache/SlsRequestQueue \
+    sd/source/ui/slidesorter/controller/SlideSorterController \
+    sd/source/ui/slidesorter/controller/SlsAnimationFunction \
+    sd/source/ui/slidesorter/controller/SlsAnimator \
+    sd/source/ui/slidesorter/controller/SlsClipboard \
+    sd/source/ui/slidesorter/controller/SlsCurrentSlideManager \
+    sd/source/ui/slidesorter/controller/SlsDragAndDropContext \
+    sd/source/ui/slidesorter/controller/SlsFocusManager \
+    sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler \
+    sd/source/ui/slidesorter/controller/SlsListener \
+    sd/source/ui/slidesorter/controller/SlsPageSelector \
+    sd/source/ui/slidesorter/controller/SlsProperties \
+    sd/source/ui/slidesorter/controller/SlsScrollBarManager \
+    sd/source/ui/slidesorter/controller/SlsSelectionCommand \
+    sd/source/ui/slidesorter/controller/SlsSelectionFunction \
+    sd/source/ui/slidesorter/controller/SlsSelectionManager \
+    sd/source/ui/slidesorter/controller/SlsSelectionObserver \
+    sd/source/ui/slidesorter/controller/SlsSlotManager \
+    sd/source/ui/slidesorter/controller/SlsTransferable \
+    sd/source/ui/slidesorter/controller/SlsVisibleAreaManager \
+    sd/source/ui/slidesorter/model/SlideSorterModel \
+    sd/source/ui/slidesorter/model/SlsPageDescriptor \
+    sd/source/ui/slidesorter/model/SlsPageEnumeration \
+    sd/source/ui/slidesorter/model/SlsPageEnumerationProvider \
+    sd/source/ui/slidesorter/model/SlsVisualState \
+    sd/source/ui/slidesorter/shell/SlideSorter \
+    sd/source/ui/slidesorter/shell/SlideSorterService \
+    sd/source/ui/slidesorter/shell/SlideSorterViewShell \
+    sd/source/ui/slidesorter/view/SlideSorterView \
+    sd/source/ui/slidesorter/view/SlsButtonBar \
+    sd/source/ui/slidesorter/view/SlsFontProvider \
+    sd/source/ui/slidesorter/view/SlsFramePainter \
+    sd/source/ui/slidesorter/view/SlsInsertAnimator \
+    sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay \
+    sd/source/ui/slidesorter/view/SlsLayeredDevice \
+    sd/source/ui/slidesorter/view/SlsLayouter \
+    sd/source/ui/slidesorter/view/SlsPageObjectLayouter \
+    sd/source/ui/slidesorter/view/SlsPageObjectPainter \
+    sd/source/ui/slidesorter/view/SlsTheme \
+    sd/source/ui/slidesorter/view/SlsToolTip \
+    sd/source/ui/slidesorter/view/SlsViewCacheContext \
+    sd/source/ui/table/TableDesignPane \
+    sd/source/ui/table/tablefunction \
+    sd/source/ui/table/tableobjectbar \
+    sd/source/ui/toolpanel/ControlContainer \
+    sd/source/ui/toolpanel/controls/AllMasterPagesSelector \
+    sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector \
+    sd/source/ui/toolpanel/controls/CustomAnimationPanel \
+    sd/source/ui/toolpanel/controls/DocumentHelper \
+    sd/source/ui/toolpanel/controls/MasterPageContainer \
+    sd/source/ui/toolpanel/controls/MasterPageContainerFiller \
+    sd/source/ui/toolpanel/controls/MasterPageContainerProviders \
+    sd/source/ui/toolpanel/controls/MasterPageContainerQueue \
+    sd/source/ui/toolpanel/controls/MasterPageDescriptor \
+    sd/source/ui/toolpanel/controls/MasterPageObserver \
+    sd/source/ui/toolpanel/controls/MasterPagesPanel \
+    sd/source/ui/toolpanel/controls/MasterPagesSelector \
+    sd/source/ui/toolpanel/controls/PreviewValueSet \
+    sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages \
+    sd/source/ui/toolpanel/controls/RecentMasterPagesSelector \
+    sd/source/ui/toolpanel/controls/SlideTransitionPanel \
+    sd/source/ui/toolpanel/controls/TableDesignPanel \
+    sd/source/ui/toolpanel/LayoutMenu \
+    sd/source/ui/toolpanel/ScrollPanel \
+    sd/source/ui/toolpanel/SlideSorterCacheDisplay \
+    sd/source/ui/toolpanel/SubToolPanel \
+    sd/source/ui/toolpanel/TaskPaneControlFactory \
+    sd/source/ui/toolpanel/TaskPaneFocusManager \
+    sd/source/ui/toolpanel/TaskPaneShellManager \
+    sd/source/ui/toolpanel/TaskPaneTreeNode \
+    sd/source/ui/toolpanel/TestMenu \
+    sd/source/ui/toolpanel/TestPanel \
+    sd/source/ui/toolpanel/TitleBar \
+    sd/source/ui/toolpanel/TitledControl \
+    sd/source/ui/toolpanel/ToolPanel \
+    sd/source/ui/toolpanel/ToolPanelFactory \
+    sd/source/ui/toolpanel/ToolPanelUIElement \
+    sd/source/ui/toolpanel/ToolPanelViewShell \
+    sd/source/ui/tools/AsynchronousCall \
+    sd/source/ui/tools/ConfigurationAccess \
+    sd/source/ui/tools/EventMultiplexer \
+    sd/source/ui/tools/IconCache \
+    sd/source/ui/tools/IdleDetection \
+    sd/source/ui/tools/PreviewRenderer \
+    sd/source/ui/tools/PropertySet \
+    sd/source/ui/tools/SdGlobalResourceContainer \
+    sd/source/ui/tools/SlotStateListener \
+    sd/source/ui/tools/TimerBasedTaskExecution \
+    sd/source/ui/unoidl/DrawController \
+    sd/source/ui/unoidl/facreg \
+    sd/source/ui/unoidl/randomnode \
+    sd/source/ui/unoidl/SdUnoDrawView \
+    sd/source/ui/unoidl/SdUnoOutlineView \
+    sd/source/ui/unoidl/SdUnoSlideView \
+    sd/source/ui/unoidl/unocpres \
+    sd/source/ui/unoidl/unodoc \
+    sd/source/ui/unoidl/UnoDocumentSettings \
+    sd/source/ui/unoidl/unokywds \
+    sd/source/ui/unoidl/unolayer \
+    sd/source/ui/unoidl/unomodel \
+    sd/source/ui/unoidl/unomodule \
+    sd/source/ui/unoidl/unoobj \
+    sd/source/ui/unoidl/unopage \
+    sd/source/ui/unoidl/unopback \
+    sd/source/ui/unoidl/unopool \
+    sd/source/ui/unoidl/unosrch \
+    sd/source/ui/view/clview \
+    sd/source/ui/view/DocumentRenderer \
+    sd/source/ui/view/drawview \
+    sd/source/ui/view/drbezob \
+    sd/source/ui/view/drtxtob \
+    sd/source/ui/view/drtxtob1 \
+    sd/source/ui/view/drviews1 \
+    sd/source/ui/view/drviews2 \
+    sd/source/ui/view/drviews3 \
+    sd/source/ui/view/drviews4 \
+    sd/source/ui/view/drviews5 \
+    sd/source/ui/view/drviews6 \
+    sd/source/ui/view/drviews7 \
+    sd/source/ui/view/drviews8 \
+    sd/source/ui/view/drviews9 \
+    sd/source/ui/view/drviewsa \
+    sd/source/ui/view/drviewsb \
+    sd/source/ui/view/drviewsc \
+    sd/source/ui/view/drviewsd \
+    sd/source/ui/view/drviewse \
+    sd/source/ui/view/drviewsf \
+    sd/source/ui/view/drviewsg \
+    sd/source/ui/view/drviewsh \
+    sd/source/ui/view/drviewsi \
+    sd/source/ui/view/drviewsj \
+    sd/source/ui/view/drvwshrg \
+    sd/source/ui/view/FormShellManager \
+    sd/source/ui/view/frmview \
+    sd/source/ui/view/GraphicObjectBar \
+    sd/source/ui/view/GraphicViewShellBase \
+    sd/source/ui/view/grviewsh \
+    sd/source/ui/view/ImpressViewShellBase \
+    sd/source/ui/view/MediaObjectBar \
+    sd/source/ui/view/Outliner \
+    sd/source/ui/view/OutlinerIterator \
+    sd/source/ui/view/OutlineViewShellBase \
+    sd/source/ui/view/outlnvs2 \
+    sd/source/ui/view/outlnvsh \
+    sd/source/ui/view/outlview \
+    sd/source/ui/view/PresentationViewShellBase \
+    sd/source/ui/view/presvish \
+    sd/source/ui/view/sdruler \
+    sd/source/ui/view/sdview \
+    sd/source/ui/view/sdview2 \
+    sd/source/ui/view/sdview3 \
+    sd/source/ui/view/sdview4 \
+    sd/source/ui/view/sdview5 \
+    sd/source/ui/view/sdwindow \
+    sd/source/ui/view/SlideSorterViewShellBase \
+    sd/source/ui/view/tabcontr \
+    sd/source/ui/view/ToolBarManager \
+    sd/source/ui/view/unmodpg \
+    sd/source/ui/view/UpdateLockManager \
+    sd/source/ui/view/ViewClipboard \
+    sd/source/ui/view/viewoverlaymanager \
+    sd/source/ui/view/viewshe2 \
+    sd/source/ui/view/viewshe3 \
+    sd/source/ui/view/viewshel \
+    sd/source/ui/view/ViewShellBase \
+    sd/source/ui/view/ViewShellHint \
+    sd/source/ui/view/ViewShellImplementation \
+    sd/source/ui/view/ViewShellManager \
+    sd/source/ui/view/ViewTabBar \
+    sd/source/ui/view/WindowUpdater \
+    sd/source/ui/view/zoomlist \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,sd,\
+    sd/source/ui/app/sdresid \
+))
+
+ifeq ($(strip $(GUI)),WNT)
+$(eval $(call gb_Library_add_cxxobjects,sd,\
+    sd/source/ui/app/optsitem \
+    sd/source/ui/func/futext \
+    , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+$(eval $(call gb_Library_add_exception_objects,sd,\
+    sd/source/ui/app/optsitem \
+    sd/source/ui/func/futext \
+))
+endif
+
+ifeq ($(strip $(COM)),GCC)
+$(eval $(call gb_Library_add_cxxobjects,sd,\
+    sd/source/ui/unoidl/unowcntr \
+    , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+$(eval $(call gb_Library_add_exception_objects,sd,\
+    sd/source/ui/unoidl/unowcntr \
+))
+endif
+
+$(WORKDIR)/inc/sd/sduilib.hxx :
+	echo \#define DLL_NAME \"$(if $(filter UNX,$(GUI)),lib)sdui$(DLLPOSTFIX)$(DLLPOST)\" > $@
+
+$(call gb_CxxObject_get_target,sd/source/ui/dlg/sdabstdlg) : $(WORKDIR)/inc/sd/sduilib.hxx
+
+# vim: set noet ts=4 sw=4:
diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk
new file mode 100644
index 0000000..894e399
--- /dev/null
+++ b/sd/Library_sdd.mk
@@ -0,0 +1,63 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,sdd))
+
+$(eval $(call gb_Library_add_precompiled_header,sdd,$(SRCDIR)/sd/inc/pch/precompiled_sd))
+
+$(eval $(call gb_Library_set_include,sdd,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/sd/inc) \
+    -I$(realpath $(SRCDIR)/sd/inc/pch) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sdd,\
+    cppu \
+    cppuhelper \
+    sal \
+    sfx \
+    sot \
+    svl \
+    svt \
+    svxcore \
+    tl \
+    ucbhelper \
+    utl \
+    vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,sdd,sd/util/sdd))
+
+$(eval $(call gb_Library_add_exception_objects,sdd,\
+    sd/source/ui/unoidl/detreg \
+    sd/source/ui/unoidl/sddetect \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
new file mode 100644
index 0000000..b1bb3de
--- /dev/null
+++ b/sd/Library_sdfilt.mk
@@ -0,0 +1,105 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list