gbuildize slideshow

20 files changed, 506 insertions, 867 deletions

diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk
new file mode 100644
index 000000000000..3105f9091eed
--- /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@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 000000000000..6c54ff5bad01
--- /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@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 000000000000..4a94e9c9d48d
--- /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@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 000000000000..3823474b2976
--- /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@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/source/engine/slide/makefile.mk b/slideshow/Makefile
index 953307d621c1..c898975e5277 100644
--- a/slideshow/source/engine/slide/makefile.mk
+++ b/slideshow/Makefile
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -25,27 +25,14 @@
 #
 #*************************************************************************
 
-PRJ=..$/..$/..
-
-PRJNAME=slideshow
-TARGET=slide
-ENABLE_EXCEPTIONS=TRUE
-PRJINC=..$/..
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Common ----------------------------------------------------------
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-SLOFILES =	$(SLO)$/layer.obj \
-            $(SLO)$/layermanager.obj \
-            $(SLO)$/shapemanagerimpl.obj \
-            $(SLO)$/slideanimations.obj \
-            $(SLO)$/slideimpl.obj  \
-            $(SLO)$/userpaintoverlay.obj
+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)))
 
-.INCLUDE :	target.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 000000000000..0c39701a18ad
--- /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@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/prj/build.lst b/slideshow/prj/build.lst
index 25ecb52922f5..30c3d3af070f 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 f6707c2491f4..e69de29bb2d1 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/inc/makefile.mk b/slideshow/prj/makefile.mk
index ac68ba08033d..e312a7ccab65 100644..100755
--- a/slideshow/inc/makefile.mk
+++ b/slideshow/prj/makefile.mk
@@ -24,24 +24,17 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..
-
-PRJNAME=slideshow
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
 
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
+PRJ=..
+TARGET=prj
 
-.INCLUDE :  target.mk
+.INCLUDE : settings.mk
 
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(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 aaaedb9598dd..000000000000
--- 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 31066e34a997..000000000000
--- 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"
-@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 7da37872368d..000000000000
--- 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"
-@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 fc24b4042265..000000000000
--- 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 fc1c80352703..000000000000
--- 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 fdc99cd1ad9f..000000000000
--- 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 1d40c165707c..000000000000
--- 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/transitions/makefile.mk b/slideshow/source/engine/transitions/makefile.mk
deleted file mode 100644
index a5fbd567721c..000000000000
--- 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 d5a70898eade..000000000000
--- 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 df3fc0f4f6a6..cfc5f60fcf85 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 9d9bee14a198..000000000000
--- 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