Port main/avmedia to gbuild.

Patch by: me

35 files changed, 677 insertions, 608 deletions

diff --git a/Module_ooo.mk b/Module_ooo.mk
index 1becb22dabaa..3fa6f02adb54 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_Module_Module,ooo))
 $(eval $(call gb_Module_add_moduledirs,ooo,\
     MathMLDTD \
     animations \
+    avmedia \
     basebmp \
     basegfx \
     binaryurp \
diff --git a/Repository.mk b/Repository.mk
index bb34bc5c305f..2ad882066788 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -46,6 +46,10 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     agg \
     animcore \
     avmedia \
+    avmediagst \
+    avmediaMacAVF \
+    avmediaQuickTime \
+    avmediawin \
     basebmp \
     basegfx \
     canvastools \
diff --git a/avmedia/source/framework/makefile.mk b/avmedia/AllLangResTarget_avmedia.mk
index 2b57e0085101..050867400697 100644
--- a/avmedia/source/framework/makefile.mk
+++ b/avmedia/AllLangResTarget_avmedia.mk
@@ -21,34 +21,21 @@
 
 
 
-PRJ=..$/..
-PRJNAME=avmedia
-TARGET=framework
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,avmedia))
 
-# --- Settings ----------------------------------
+$(eval $(call gb_AllLangResTarget_add_srs,avmedia,avmedia/res))
 
-.INCLUDE :  settings.mk
+$(eval $(call gb_SrsTarget_SrsTarget,avmedia/res))
 
-# --- Resources ---------------------------------
+$(eval $(call gb_SrsTarget_set_include,avmedia/res,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/avmedia/inc \
+))
 
-SRS1NAME=$(TARGET)
-SRC1FILES =\
-        mediacontrol.src
+# add src files here (complete path relative to repository root)
+$(eval $(call gb_SrsTarget_add_files,avmedia/res,\
+	avmedia/source/framework/mediacontrol.src \
+	avmedia/source/viewer/mediawindow.src \
+))
 
-# --- Files -------------------------------------
-
-SLOFILES= \
-        $(SLO)$/mediaitem.obj	 \
-        $(SLO)$/mediamisc.obj 	 \
-        $(SLO)$/mediacontrol.obj \
-        $(SLO)$/mediatoolbox.obj \
-        $(SLO)$/mediaplayer.obj  \
-        $(SLO)$/soundhandler.obj  
-
-EXCEPTIONSFILES = \
-        $(SLO)$/mediatoolbox.obj \
-        $(SLO)$/soundhandler.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/avmedia/Jar_avmedia.mk b/avmedia/Jar_avmedia.mk
new file mode 100644
index 000000000000..5ac927211dfa
--- /dev/null
+++ b/avmedia/Jar_avmedia.mk
@@ -0,0 +1,52 @@
+###############################################################
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+###############################################################
+
+
+
+$(eval $(call gb_Jar_Jar,avmedia,SRCDIR))
+
+$(eval $(call gb_Jar_add_jars,avmedia,\
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/unoil.jar \
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/juh.jar \
+	$(OUTDIR)/bin/java_uno.jar \
+	$(OUTDIR)/bin/jmf.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,avmedia,*.class x11))
+
+$(eval $(call gb_Jar_set_manifest,avmedia,$(SRCDIR)/avmedia/source/java/manifest))
+
+$(eval $(call gb_Jar_add_sourcefiles,avmedia,\
+	avmedia/source/java/Manager \
+	avmedia/source/java/Player \
+	avmedia/source/java/PlayerWindow \
+	avmedia/source/java/WindowAdapter \
+	avmedia/source/java/MediaUno \
+	avmedia/source/java/FrameGrabber \
+	avmedia/source/java/MediaUno \
+	avmedia/source/x11/SystemWindowAdapter
+))
+
+$(eval $(call gb_Jar_set_componentfile,avmedia,avmedia/source/java/avmedia.jar,URE))
+
+# vim: set noet sw=4 ts=4:
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
new file mode 100644
index 000000000000..006721121f11
--- /dev/null
+++ b/avmedia/Library_avmedia.mk
@@ -0,0 +1,77 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,avmedia))
+
+$(eval $(call gb_Library_add_package_headers,avmedia,avmedia_inc))
+
+$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
+
+$(eval $(call gb_Library_set_include,avmedia,\
+        $$(INCLUDE) \
+	-I$(SRCDIR)/avmedia/inc \
+	-I$(SRCDIR)/avmedia/source/inc \
+))
+
+$(eval $(call gb_Library_add_defs,avmedia,\
+	-DAVMEDIA_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_api,avmedia,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,avmedia,\
+	comphelper \
+	cppuhelper \
+	cppu \
+	sal \
+	sfx \
+	stl \
+	svl \
+	svt \
+	tl \
+	utl \
+	vcl \
+	vos3 \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,avmedia,\
+	avmedia/source/framework/mediaitem \
+	avmedia/source/framework/mediamisc \
+	avmedia/source/framework/mediacontrol \
+	avmedia/source/framework/mediaplayer \
+	avmedia/source/viewer/mediaevent_impl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,avmedia,\
+	avmedia/source/framework/mediatoolbox \
+	avmedia/source/framework/soundhandler \
+	avmedia/source/viewer/mediawindow \
+	avmedia/source/viewer/mediawindowbase_impl \
+	avmedia/source/viewer/mediawindow_impl \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/avmedia/Library_avmediaMacAVF.mk b/avmedia/Library_avmediaMacAVF.mk
new file mode 100644
index 000000000000..235611086962
--- /dev/null
+++ b/avmedia/Library_avmediaMacAVF.mk
@@ -0,0 +1,68 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,avmediaMacAVF))
+
+$(eval $(call gb_Library_add_package_headers,avmediaMacAVF,avmedia_inc))
+
+$(eval $(call gb_Library_set_componentfile,avmediaMacAVF,avmedia/source/macavf/avmediaMacAVF))
+
+$(eval $(call gb_Library_set_include,avmediaMacAVF,\
+        $$(INCLUDE) \
+	-I$(SRCDIR)/avmedia/inc \
+	-I$(SRCDIR)/avmedia/source/inc \
+))
+
+$(eval $(call gb_Library_add_api,avmediaMacAVF,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,avmediaMacAVF,\
+	comphelper \
+	cppuhelper \
+	cppu \
+	sal \
+	tl \
+	vcl \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_libs,avmediaMacAVF,\
+	-framework Cocoa \
+	-framework AVFoundation \
+	-framework CoreMedia \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,avmediaMacAVF,\
+	avmedia/source/macavf/macavf_manager \
+	avmedia/source/macavf/macavf_player \
+	avmedia/source/macavf/macavf_window \
+))
+
+$(eval $(call gb_Library_add_exception_objects,avmediaMacAVF,\
+	avmedia/source/macavf/macavf_framegrabber \
+	avmedia/source/macavf/macavf_uno \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk
new file mode 100644
index 000000000000..ba9649a388ae
--- /dev/null
+++ b/avmedia/Library_avmediaQuickTime.mk
@@ -0,0 +1,68 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,avmediaQuickTime))
+
+$(eval $(call gb_Library_add_package_headers,avmediaQuickTime,avmedia_inc))
+
+$(eval $(call gb_Library_set_componentfile,avmediaQuickTime,avmedia/source/quicktime/avmediaQuickTime))
+
+$(eval $(call gb_Library_set_include,avmediaQuickTime,\
+        $$(INCLUDE) \
+	-I$(SRCDIR)/avmedia/inc \
+	-I$(SRCDIR)/avmedia/source/inc \
+))
+
+$(eval $(call gb_Library_add_api,avmediaQuickTime,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,avmediaQuickTime,\
+	comphelper \
+	cppuhelper \
+	cppu \
+	sal \
+	tl \
+	vcl \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_libs,avmediaQuickTime,\
+	-framework Cocoa \
+	-framework QTKit \
+	-framework QuickTime \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,avmediaQuickTime,\
+	avmedia/source/quicktime/qt_manager \
+	avmedia/source/quicktime/qt_player \
+	avmedia/source/quicktime/qt_window \
+))
+
+$(eval $(call gb_Library_add_exception_objects,avmediaQuickTime,\
+	avmedia/source/quicktime/qt_framegrabber \
+	avmedia/source/quicktime/qt_uno \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
new file mode 100644
index 000000000000..7ceecd13747d
--- /dev/null
+++ b/avmedia/Library_avmediagst.mk
@@ -0,0 +1,71 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,avmediagst))
+
+$(eval $(call gb_Library_add_package_headers,avmediagst,avmedia_inc))
+
+$(eval $(call gb_Library_set_componentfile,avmediagst,avmedia/source/gstreamer/avmediagst))
+
+$(eval $(call gb_Library_set_include,avmediagst,\
+        $$(INCLUDE) \
+	-I$(SRCDIR)/avmedia/inc \
+	-I$(SRCDIR)/avmedia/source/inc \
+	$(filter -I%,$(GTK_CFLAGS)) \
+	$(shell pkg-config --cflags-only-I gstreamer-0.10 gstreamer-interfaces-0.10) \
+))
+
+$(eval $(call gb_Library_add_cflags,avmediagst,\
+	$(filter-out -I%,$(GTK_CFLAGS)) \
+))
+
+$(eval $(call gb_Library_add_api,avmediagst,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,avmediagst,\
+	comphelper \
+	cppuhelper \
+	cppu \
+	sal \
+	stl \
+	tl \
+	vcl \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_libs,avmediagst,\
+	$(GTK_LIBS) \
+	$(shell pkg-config --libs gstreamer-0.10 gstreamer-interfaces-0.10) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,avmediagst,\
+	avmedia/source/gstreamer/gstuno \
+	avmedia/source/gstreamer/gstmanager \
+	avmedia/source/gstreamer/gstwindow \
+	avmedia/source/gstreamer/gstplayer \
+	avmedia/source/gstreamer/gstframegrabber \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk
new file mode 100644
index 000000000000..260ca39d6ab0
--- /dev/null
+++ b/avmedia/Library_avmediawin.mk
@@ -0,0 +1,80 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,avmediawin))
+
+$(eval $(call gb_Library_add_package_headers,avmediawin,avmedia_inc))
+
+$(eval $(call gb_Library_set_componentfile,avmediawin,avmedia/source/win/avmediawin))
+
+$(eval $(call gb_Library_set_include,avmediawin,\
+        $$(INCLUDE) \
+	-I$(SRCDIR)/avmedia/inc \
+	-I$(SRCDIR)/avmedia/source/inc \
+))
+
+$(eval $(call gb_Library_add_api,avmediawin,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,avmediawin,\
+	comphelper \
+	cppuhelper \
+	cppu \
+	sal \
+	stl \
+	tl \
+	utl \
+	vcl \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,avmediawin,\
+	gdi32 \
+	ole32 \
+	oleaut32 \
+))
+
+ifeq ($(COM),GCC)
+$(eval $(call gb_Library_add_linked_libs,avmediawin,\
+	$(PSDK_HOME)/lib/strmiids \
+))
+else
+$(eval $(call gb_Library_add_linked_libs,avmediawin,\
+	strmiids \
+))
+endif
+
+$(eval $(call gb_Library_add_noexception_objects,avmediawin,\
+	avmedia/source/win/manager \
+	avmedia/source/win/player \
+	avmedia/source/win/window \
+))
+
+$(eval $(call gb_Library_add_exception_objects,avmediawin,\
+	avmedia/source/win/framegrabber \
+	avmedia/source/win/winuno \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/avmedia/Makefile b/avmedia/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/avmedia/Makefile
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the 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/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
new file mode 100644
index 000000000000..bc92331e2a5d
--- /dev/null
+++ b/avmedia/Module_avmedia.mk
@@ -0,0 +1,68 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,avmedia))
+
+$(eval $(call gb_Module_add_targets,avmedia,\
+	AllLangResTarget_avmedia \
+	Library_avmedia \
+	Package_inc \
+	Package_avmedia_jar \
+))
+
+ifeq ($(ENABLE_GSTREAMER),TRUE)
+ifeq ($(GUI),UNX)
+ifneq ($(GUIBASE),aqua)
+$(eval $(call gb_Module_add_targets,avmedia,\
+        Library_avmediagst \
+))
+endif
+endif
+endif
+
+# Seems obsolete, "javamedia" is not found anywhere else in the project,
+# and avmedia.jar is delivered from the pre-existing avmedia.jar in
+# main/avmedia/source/java. This is not tested:
+ifeq ($(GUIBASE),javamedia)
+$(eval $(call gb_Module_add_targets,avmedia,\
+	Jar_avmedia \
+))
+endif
+
+ifeq ($(GUI),WNT)
+ifneq ($(strip $(ENABLE_DIRECTX)),)
+$(eval $(call gb_Module_add_targets,avmedia,\
+	Library_avmediawin \
+))
+endif
+endif
+
+ifeq ($(GUIBASE),aqua)
+$(eval $(call gb_Module_add_targets,avmedia,\
+	Library_avmediaMacAVF \
+	Library_avmediaQuickTime \
+))
+endif
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/avmedia/Package_avmedia_jar.mk b/avmedia/Package_avmedia_jar.mk
new file mode 100644
index 000000000000..20f51e686b7f
--- /dev/null
+++ b/avmedia/Package_avmedia_jar.mk
@@ -0,0 +1,27 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Package_Package,avmedia_jar,$(SRCDIR)/avmedia/source/java))
+
+$(eval $(call gb_Package_add_file,avmedia_jar,bin/avmedia.jar,avmedia.jar))
+$(eval $(call gb_Package_add_file,avmedia_jar,xml/component/avmedia/source/java/avmedia.jar.component,avmedia.jar.component))
diff --git a/avmedia/Package_inc.mk b/avmedia/Package_inc.mk
new file mode 100644
index 000000000000..afeb256b64ff
--- /dev/null
+++ b/avmedia/Package_inc.mk
@@ -0,0 +1,30 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Package_Package,avmedia_inc,$(SRCDIR)/avmedia/inc))
+
+$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/avmediadllapi.h,avmedia/avmediadllapi.h))
+$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/mediawindow.hxx,avmedia/mediawindow.hxx))
+$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/mediaitem.hxx,avmedia/mediaitem.hxx))
+$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/mediaplayer.hxx,avmedia/mediaplayer.hxx))
+$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/mediatoolbox.hxx,avmedia/mediatoolbox.hxx))
diff --git a/avmedia/inc/avmedia/avmediadllapi.h b/avmedia/inc/avmedia/avmediadllapi.h
new file mode 100644
index 000000000000..197ce41002af
--- /dev/null
+++ b/avmedia/inc/avmedia/avmediadllapi.h
@@ -0,0 +1,39 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#ifndef INCLUDED_AVMEDIADLLAPI_H
+#define INCLUDED_AVMEDIADLLAPI_H
+
+#ifndef _SAL_TYPES_H_
+#include "sal/types.h"
+#endif
+
+#if defined(AVMEDIA_DLLIMPLEMENTATION)
+#define AVMEDIA_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
+#else
+#define AVMEDIA_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
+#endif
+#define AVMEDIA_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif /* INCLUDED_AVMEDIADLLAPI_H */
+
diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
index dcfabf12418a..459a4f477e52 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -29,6 +29,7 @@
 #include <svl/poolitem.hxx>
 #endif
 #include <com/sun/star/media/ZoomLevel.hpp>
+#include <avmedia/avmediadllapi.h>
 
 #define AVMEDIA_SETMASK_NONE        ((sal_uInt32)(0x00000000))
 #define AVMEDIA_SETMASK_STATE       ((sal_uInt32)(0x00000001))
@@ -62,7 +63,7 @@ enum MediaState
 // - MediaItem -
 // -------------
 
-class MediaItem : public SfxPoolItem
+class AVMEDIA_DLLPUBLIC MediaItem : public SfxPoolItem
 {
 public:
                             TYPEINFO();
diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/avmedia/inc/avmedia/mediaplayer.hxx
index be6f699b02f4..01a06e156944 100644
--- a/avmedia/inc/avmedia/mediaplayer.hxx
+++ b/avmedia/inc/avmedia/mediaplayer.hxx
@@ -27,6 +27,7 @@
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/dockwin.hxx>
 #include <tools/urlobj.hxx>
+#include <avmedia/avmediadllapi.h>
 
 // -----------
 // - Defines -
@@ -45,7 +46,7 @@ namespace avmedia
 // - MediaPlayer -
 // ---------------
 
-class MediaPlayer : public SfxChildWindow
+class AVMEDIA_DLLPUBLIC MediaPlayer : public SfxChildWindow
 {
 public:
                         MediaPlayer( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
@@ -60,7 +61,7 @@ public:
 
 class MediaWindow;
 
-class MediaFloater : public SfxDockingWindow
+class AVMEDIA_DLLPUBLIC MediaFloater : public SfxDockingWindow
 {
 public:
 
diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/avmedia/inc/avmedia/mediatoolbox.hxx
index ffe21698b9a1..96c0377d6ce3 100644
--- a/avmedia/inc/avmedia/mediatoolbox.hxx
+++ b/avmedia/inc/avmedia/mediatoolbox.hxx
@@ -26,6 +26,7 @@
 
 #include <svl/lstner.hxx>
 #include <sfx2/tbxctrl.hxx>
+#include <avmedia/avmediadllapi.h>
 
 namespace avmedia
 {
@@ -36,7 +37,7 @@ namespace avmedia
 
 class MediaItem;
 
-class MediaToolBoxControl : public SfxToolBoxControl
+class AVMEDIA_DLLPUBLIC MediaToolBoxControl : public SfxToolBoxControl
 {
      friend class MediaToolBoxControl_Impl;
 
diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx
index bc7bd68ce2bc..69b7c7a07cdc 100644
--- a/avmedia/inc/avmedia/mediawindow.hxx
+++ b/avmedia/inc/avmedia/mediawindow.hxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/media/XPlayer.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
+#include <avmedia/avmediadllapi.h>
 
 // -----------
 // - Defines -
@@ -67,7 +68,7 @@ namespace avmedia
     // - MediaWindow -
     // ---------------
 
-    class MediaWindow
+    class AVMEDIA_DLLPUBLIC MediaWindow
     {
     public:
                             MediaWindow( Window* parent, bool bInternalMediaControl );
diff --git a/avmedia/prj/build.lst b/avmedia/prj/build.lst
index 6b4ba9c8e762..49956ca3be75 100644
--- a/avmedia/prj/build.lst
+++ b/avmedia/prj/build.lst
@@ -1,12 +1,2 @@
 av	avmedia	:    L10N:l10n tools sfx2 LIBXSLT:libxslt NULL
-av	avmedia                 	usr1	-	all	av_mkout												NULL
-av	avmedia\prj					get		-	all	av_prj													NULL
-av	avmedia\inc					get		-	all	av_inv													NULL
-av  avmedia\source\viewer		nmake	-	all	av_viewer	        									NULL
-av  avmedia\source\framework	nmake	-	all	av_framework	        								NULL
-av  avmedia\source\win	    	nmake	-	all	av_win	            									NULL
-av	avmedia\source\java			nmake	-	all	av_java	            									NULL
-av	avmedia\source\quicktime	nmake	-	all	av_quicktime											NULL
-av	avmedia\source\macavf	nmake	-	all	av_macavf											NULL
-av	avmedia\source\gstreamer	nmake	-	all	av_gstreamer	            							NULL
-av	avmedia\util				nmake	-	all	av_util av_viewer av_framework av_win av_java av_quicktime av_gstreamer	NULL
+av	avmedia\prj                 	nmake	-	all	av_prj												NULL
diff --git a/avmedia/prj/d.lst b/avmedia/prj/d.lst
index 86c61195d68b..e69de29bb2d1 100644
--- a/avmedia/prj/d.lst
+++ b/avmedia/prj/d.lst
@@ -1,25 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %COMMON_DEST%\res%_EXT%
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\avmedia*.dll %_DEST%\bin%_EXT%\avmedia*.dll
-..\source\java\avmedia.jar %_DEST%\bin%_EXT%\avmedia.jar
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\bin\avmedia*.res %_DEST%\bin%_EXT%\avmedia*.res
-
-mkdir: %_DEST%\inc%_EXT%\avmedia
-
-..\inc\avmedia\mediawindow.hxx %_DEST%\inc%_EXT%\avmedia\mediawindow.hxx
-..\inc\avmedia\mediaitem.hxx %_DEST%\inc%_EXT%\avmedia\mediaitem.hxx
-..\inc\avmedia\mediaplayer.hxx %_DEST%\inc%_EXT%\avmedia\mediaplayer.hxx
-..\inc\avmedia\mediatoolbox.hxx %_DEST%\inc%_EXT%\avmedia\mediatoolbox.hxx
-
-..\%__SRC%\class\avmedia.jar %_DEST%\bin%_EXT%\avmedia.jar
-..\%__SRC%\misc\avmedia.component %_DEST%\xml%_EXT%\avmedia.component
-..\%__SRC%\misc\avmedia.jar.component %_DEST%\xml%_EXT%\avmedia.jar.component
-..\%__SRC%\misc\avmediaQuickTime.component %_DEST%\xml%_EXT%\avmediaQuickTime.component
-..\%__SRC%\misc\avmediaMacAVF.component %_DEST%\xml%_EXT%\avmediaMacAVF.component
-..\%__SRC%\misc\avmediagst.component %_DEST%\xml%_EXT%\avmediagst.component
-..\%__SRC%\misc\avmediawin.component %_DEST%\xml%_EXT%\avmediawin.component
-
diff --git a/avmedia/source/viewer/makefile.mk b/avmedia/prj/makefile.mk
index 11c3937d3ba9..c62c6a657d16 100644
--- a/avmedia/source/viewer/makefile.mk
+++ b/avmedia/prj/makefile.mk
@@ -21,33 +21,24 @@
 
 
 
-PRJ=..$/..
-PRJNAME=avmedia
-TARGET=viewer
-
-# --- Settings ----------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Resources ---------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
-        mediawindow.src					
-
-# --- Files -------------------------------------
-
-SLOFILES= \
-        $(SLO)$/mediaevent_impl.obj     	\
-        $(SLO)$/mediawindowbase_impl.obj 	\
-        $(SLO)$/mediawindow_impl.obj 		\
-        $(SLO)$/mediawindow.obj         	
-
-EXCEPTIONSFILES= \
-        $(SLO)$/mediawindow.obj         	\
-        $(SLO)$/mediawindowbase_impl.obj 	\
-        $(SLO)$/mediawindow_impl.obj
-        
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index aec4efa09830..941a9072b429 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -488,7 +488,7 @@ IMPL_LINK( SoundHandler, implts_PlayerNotify, void*, EMPTYARG )
 // - component_getImplementationEnvironment -
 // ------------------------------------------
 
-extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
        *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
@@ -497,7 +497,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char
 // - component_getFactory -
 // ------------------------
 
-extern "C" void* SAL_CALL component_getFactory(const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/ )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/ )
 {
     void* pReturn = NULL;
     if  (pServiceManager !=  NULL )
diff --git a/avmedia/source/gstreamer/exports.dxp b/avmedia/source/gstreamer/exports.dxp
deleted file mode 100644
index f0e1c69934bc..000000000000
--- a/avmedia/source/gstreamer/exports.dxp
+++ /dev/null
@@ -1,2 +0,0 @@
-component_getImplementationEnvironment
-component_getFactory
diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx
index 1cf05ce1b0ea..21c0f0b7121b 100644
--- a/avmedia/source/gstreamer/gstuno.cxx
+++ b/avmedia/source/gstreamer/gstuno.cxx
@@ -39,7 +39,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno:
 // - component_getImplementationEnvironment -
 // ------------------------------------------
 
-extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
@@ -48,7 +48,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char
 // - component_getFactory -
 // ------------------------
 
-extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
 {
     uno::Reference< lang::XSingleServiceFactory > xFactory;
     void*                                   pRet = 0;
diff --git a/avmedia/source/gstreamer/makefile.mk b/avmedia/source/gstreamer/makefile.mk
deleted file mode 100644
index de0f572cbf0d..000000000000
--- a/avmedia/source/gstreamer/makefile.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..
-PRJNAME=avmediagst
-TARGET=avmediagst
-
-# --- Settings ----------------------------------
-
-.INCLUDE :  	settings.mk
-
-.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
-CDEFS+= -DVERBOSE
-.ENDIF
-
-# --- Files ----------------------------------
-
-.IF "$(GUI)" == "UNX"  && "$(GUIBASE)"!="aqua" && "$(ENABLE_GSTREAMER)" != ""
-
-PKGCONFIG_MODULES=gtk+-2.0 gstreamer-0.10 gstreamer-interfaces-0.10
-.INCLUDE : pkg_config.mk
-
-SLOFILES= \
-        $(SLO)$/gstuno.obj		\
-        $(SLO)$/gstmanager.obj		\
-        $(SLO)$/gstwindow.obj		\
-        $(SLO)$/gstplayer.obj		\
-        $(SLO)$/gstframegrabber.obj
-
-EXCEPTIONSFILES= \
-        $(SLO)$/gstuno.obj		\
-        $(SLO)$/gstplayer.obj		\
-        $(SLO)$/gstframegrabber.obj
-
-SHL1TARGET=$(TARGET)
-SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(TOOLSLIB) $(VCLLIB)
-SHL1STDLIBS+=$(PKGCONFIG_LIBS)
-SHL1IMPLIB=i$(TARGET)
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-# on Solaris checkdll does not work: LD_LIBRARY_PATH breaks the 2 libxml2.so.2
-SHL1NOCHECK=t
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-.ENDIF
-
-.INCLUDE :  	target.mk
-
-ALLTAR : $(MISC)/avmediagst.component
-
-$(MISC)/avmediagst.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        avmediagst.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt avmediagst.component
diff --git a/avmedia/source/java/makefile.mk b/avmedia/source/java/makefile.mk
deleted file mode 100644
index 6497ac973d30..000000000000
--- a/avmedia/source/java/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#**************************************************************
-#
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#
-#**************************************************************
-
-
-
-# Builds the Java Canvas implementation.
-
-PRJNAME = avmedia
-PRJ     = ..$/..
-TARGET  = avmedia
-PACKAGE = avmedia
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: settings.mk
-
-.IF "$(GUIBASE)"=="javamedia"
-
-JAVAFILES  = \
-    Manager.java            \
-    Player.java             \
-    PlayerWindow.java       \
-    WindowAdapter.java      \
-    MediaUno.java           \
-    FrameGrabber.java       \
-    x11$/SystemWindowAdapter.java   
-
-JARFILES        = jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar jmf.jar
-JAVACLASSFILES  = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java//).class)
-
-JARTARGET               = $(TARGET).jar
-JARCOMPRESS             = TRUE
-CUSTOMMANIFESTFILE      = manifest
-
-.ENDIF     # "$(GUIBASE)"=="javamedia" 
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE: target.mk
-
-ALLTAR : $(MISC)/avmedia.jar.component
-
-$(MISC)/avmedia.jar.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt avmedia.jar.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_JAVA)avmedia.jar' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt avmedia.jar.component
diff --git a/avmedia/source/macavf/macavf_macavfuno.cxx b/avmedia/source/macavf/macavf_macavfuno.cxx
index 470f95c8daa4..421d220c1817 100644
--- a/avmedia/source/macavf/macavf_macavfuno.cxx
+++ b/avmedia/source/macavf/macavf_macavfuno.cxx
@@ -36,7 +36,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno:
 // - component_getImplementationEnvironment -
 // ------------------------------------------
 
-extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
@@ -45,7 +45,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char
 // - component_getFactory -
 // ------------------------
 
-extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
 {
     uno::Reference< lang::XSingleServiceFactory > xFactory;
     void*                                   pRet = 0;
diff --git a/avmedia/source/macavf/makefile.mk b/avmedia/source/macavf/makefile.mk
deleted file mode 100644
index ed70a350329e..000000000000
--- a/avmedia/source/macavf/makefile.mk
+++ /dev/null
@@ -1,89 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-PRJ=..$/..
-PRJNAME=avmedia
-TARGET=avmediaMacAVF
-
-.IF "$(GUIBASE)" != "aqua"
-dummy:
-    @echo " Nothing to build for GUIBASE=$(GUIBASE)"
-.ELSE
-
-# --- Settings ----------------------------------
-
-.INCLUDE :  	settings.mk
-
-.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
-CDEFS+= -DVERBOSE
-.ENDIF
-
-# --- Files ----------------------------------
-
-CFLAGSCXX+=$(OBJCXXFLAGS)
-
-SLOFILES= \
-        $(SLO)$/macavf_uno.obj           \
-        $(SLO)$/macavf_framegrabber.obj  \
-        $(SLO)$/macavf_manager.obj       \
-        $(SLO)$/macavf_window.obj        \
-        $(SLO)$/macavf_player.obj
-
-EXCEPTIONSFILES= \
-        $(SLO)$/macavf_framegrabber.obj \
-        $(SLO)$/macavf_uno.obj
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
-             $(CPPULIB) \
-             $(SALLIB)  \
-             $(COMPHELPERLIB) \
-             $(CPPUHELPERLIB) \
-             $(TOOLSLIB) \
-             $(VCLLIB) 
-
-SHL1STDLIBS+= \
-             -framework Cocoa \
-             -framework AVFoundation \
-             -framework CoreMedia
-
-# build DLL
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1IMPLIB=i$(TARGET)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.ENDIF
-
-ALLTAR : $(MISC)/avmediaMacAVF.component
-
-$(MISC)/avmediaMacAVF.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt avmediaMacAVF.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt avmediaMacAVF.component
-
diff --git a/avmedia/source/quicktime/makefile.mk b/avmedia/source/quicktime/makefile.mk
deleted file mode 100644
index a45a8b3c22ff..000000000000
--- a/avmedia/source/quicktime/makefile.mk
+++ /dev/null
@@ -1,92 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..
-PRJNAME=avmedia
-TARGET=avmediaQuickTime
-
-# the QuickTime API has been deprecated since OSX 10.5 and has been removed in the OSX SDK 10.7
-.IF "$(GUIBASE)" != "aqua"
-dummy:
-    @echo " Nothing to build for GUIBASE=$(GUIBASE) and OSX$(MACOSX_DEPLOYMENT_TARGET)"
-.ELSE
-
-# --- Settings ----------------------------------
-
-.INCLUDE :  	settings.mk
-
-.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
-CDEFS+= -DVERBOSE
-.ENDIF
-
-# --- Files ----------------------------------
-
-CFLAGSCXX+=$(OBJCXXFLAGS)
-
-SLOFILES= \
-        $(SLO)$/qt_uno.obj  \
-        $(SLO)$/qt_framegrabber.obj        \
-        $(SLO)$/qt_manager.obj       \
-        $(SLO)$/qt_window.obj        \
-        $(SLO)$/qt_player.obj
-
-EXCEPTIONSFILES= \
-        $(SLO)$/qt_framegrabber.obj        \
-        $(SLO)$/qt_uno.obj
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
-             $(CPPULIB) \
-             $(SALLIB)  \
-             $(COMPHELPERLIB) \
-             $(CPPUHELPERLIB) \
-             $(TOOLSLIB) \
-             $(VCLLIB) 
-
-SHL1STDLIBS+= \
-             -framework Cocoa \
-             -framework QTKit \
-             -framework QuickTime
-
-# build DLL
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1IMPLIB=i$(TARGET)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.ENDIF
-
-ALLTAR : $(MISC)/avmediaQuickTime.component
-
-$(MISC)/avmediaQuickTime.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component
-
diff --git a/avmedia/source/quicktime/qt_uno.cxx b/avmedia/source/quicktime/qt_uno.cxx
index 62a73bf8756c..a4262e04e2eb 100644
--- a/avmedia/source/quicktime/qt_uno.cxx
+++ b/avmedia/source/quicktime/qt_uno.cxx
@@ -36,7 +36,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno:
 // - component_getImplementationEnvironment -
 // ------------------------------------------
 
-extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
@@ -45,7 +45,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char
 // - component_getFactory -
 // ------------------------
 
-extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
 {
     uno::Reference< lang::XSingleServiceFactory > xFactory;
     void*                                   pRet = 0;
diff --git a/avmedia/source/win/exports.dxp b/avmedia/source/win/exports.dxp
deleted file mode 100644
index 926e49f5f1a5..000000000000
--- a/avmedia/source/win/exports.dxp
+++ /dev/null
@@ -1,3 +0,0 @@
-component_getImplementationEnvironment
-component_getFactory
-
diff --git a/avmedia/source/win/makefile.mk b/avmedia/source/win/makefile.mk
deleted file mode 100644
index c94f56907ab9..000000000000
--- a/avmedia/source/win/makefile.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..
-PRJNAME=avmedia
-TARGET=avmediawin
-
-# --- Settings ----------------------------------
-
-.INCLUDE :  	settings.mk
-
-.IF "$(ENABLE_DIRECTX)" != ""
-
-.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
-CDEFS+= -DVERBOSE
-.ENDIF
-
-# --- Files ----------------------------------
-
-.IF "$(GUI)" == "WNT"
-
-SLOFILES= \
-        $(SLO)$/winuno.obj      \
-        $(SLO)$/manager.obj     \
-        $(SLO)$/window.obj      \
-        $(SLO)$/player.obj      \
-        $(SLO)$/framegrabber.obj    
-
-
-EXCEPTIONSFILES= \
-        $(SLO)$/winuno.obj      \
-        $(SLO)$/framegrabber.obj    
-
-SHL1TARGET=$(TARGET)
-SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(UNOTOOLSLIB) $(TOOLSLIB) $(VCLLIB) 
-SHL1IMPLIB=i$(TARGET)
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-SHL1STDLIBS += $(OLE32LIB)
-SHL1STDLIBS += $(OLEAUT32LIB)
-SHL1STDLIBS += $(GDI32LIB)
-
-.IF "$(COM)"=="GCC"
-SHL1STDLIBS += $(PSDK_HOME)$/lib$/strmiids.lib
-.ELSE
-SHL1STDLIBS += strmiids.lib
-.ENDIF
-
-.ENDIF
-.ENDIF
-
-.INCLUDE :  	target.mk
-
-ALLTAR : $(MISC)/avmediawin.component
-
-$(MISC)/avmediawin.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        avmediawin.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt avmediawin.component
diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx
index 3a9ec5e874ea..475fa3f152b1 100644
--- a/avmedia/source/win/winuno.cxx
+++ b/avmedia/source/win/winuno.cxx
@@ -39,7 +39,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno:
 // - component_getImplementationEnvironment -
 // ------------------------------------------
 
-extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
@@ -48,7 +48,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char
 // - component_getFactory -
 // ------------------------
 
-extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* )
 {
     uno::Reference< lang::XSingleServiceFactory > xFactory;
     void*                                   pRet = 0;
diff --git a/avmedia/util/makefile.mk b/avmedia/util/makefile.mk
deleted file mode 100644
index 0b3ff99942cb..000000000000
--- a/avmedia/util/makefile.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..
-PRJNAME=avmedia
-TARGET=avmedia
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE :  	settings.mk
-
-# --- Resources ---------------------------------
-
-RESLIB1NAME=$(TARGET)
-RESLIB1IMAGES=$(PRJ)$/res	
-RESLIB1SRSFILES=			\
-    $(SRS)$/viewer.srs		\
-    $(SRS)$/framework.srs
-
-# --- Files -------------------------------------
-
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1FILES=\
-    $(SLB)$/viewer.lib		\
-    $(SLB)$/framework.lib	
-
-# ==========================================================================
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-SHL1IMPLIB=i$(TARGET)
-SHL1STDLIBS=$(UNOTOOLSLIB) $(TOOLSLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(SVTOOLLIB) $(SVLLIB) $(SFXLIB) $(VOSLIB)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-
-DEF1NAME=$(SHL1TARGET)
-DEF1DEPN=$(MISC)$/$(SHL1TARGET).flt $(LIB1TARGET)
-DEF1DES=Avmedia
-DEFLIB1NAME	=$(TARGET)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(depend)"==""
-$(MISC)$/$(SHL1TARGET).flt: makefile.mk
-    @echo ------------------------------
-    @echo Making: $@
-    @echo _Impl>$@
-    @echo WEP>>$@
-    @echo LIBMAIN>>$@
-    @echo LibMain>>$@
-    @echo CT>>$@
-.ENDIF
-
-ALLTAR : $(MISC)/avmedia.component
-
-$(MISC)/avmedia.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        avmedia.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt avmedia.component
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 82665e7bf876..7029637d34e1 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -47,7 +47,6 @@ my_components = \
     stocservices \
     abp \
     analysis \
-    avmedia \
     basctl \
     basprov \
     bib \
@@ -58,6 +57,7 @@ my_components = \
     charttools \
     chartview \
     component/animations/source/animcore/animcore \
+    component/avmedia/util/avmedia \
     component/binaryurp/source/binaryurp \
     component/canvas/source/factory/canvasfactory \
     component/canvas/source/simplecanvas/simplecanvas \
@@ -315,8 +315,8 @@ my_components += \
 
 .IF "$(OS)" == "MACOSX"
 my_components += \
-    avmediaQuickTime \
-    avmediaMacAVF \
+    component/avmedia/source/macavf/avmediaMacAVF \
+    component/avmedia/source/quicktime/avmediaQuickTime \
     fps_aqua \
     macab1 \
     macbe1 \
@@ -352,7 +352,7 @@ my_components += \
 
 .IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != ""
 my_components += \
-    avmediawin \
+    component/avmedia/source/win/avmediawin \
     component/canvas/source/directx/directx9canvas \
     component/canvas/source/directx/gdipluscanvas
 .END
@@ -387,11 +387,11 @@ my_components += evoab
 .END
 
 .IF "$(OS)" != "WNT" && "$(ENABLE_GSTREAMER)" != ""
-my_components += avmediagst
+my_components += component/avmedia/source/gstreamer/avmediagst
 .END
 
 .IF "$(OS)" != "WNT" && "$(SOLAR_JAVA)" == "TRUE"
-my_components += avmedia.jar
+my_components += component/avmedia/source/java/avmedia.jar
 .END
 
 my_ooo_components = mailmerge