10 files changed, 18 insertions, 3 deletions
diff --git a/avmedia/AllLangMoTarget_avmedia.mk b/avmedia/AllLangMoTarget_avmedia.mk
index 564b9ab94b43..df2886b0aa1a 100644
--- a/avmedia/AllLangMoTarget_avmedia.mk
+++ b/avmedia/AllLangMoTarget_avmedia.mk
@@ -6,6 +6,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+ifeq ($(USE_AVMEDIA_DUMMY),FALSE)
 $(eval $(call gb_AllLangMoTarget_AllLangMoTarget,avmedia))
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 334ea70da3d2..ad253dd0eb27 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -9,8 +9,6 @@
 
 $(eval $(call gb_Library_Library,avmedia))
 
-$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
-
 $(eval $(call gb_Library_set_include,avmedia,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/avmedia/inc \
@@ -25,6 +23,7 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\
 ))
 
 else
+$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
 
 
 $(eval $(call gb_Library_add_defs,avmedia,\
diff --git a/avmedia/Library_avmediaMacAVF.mk b/avmedia/Library_avmediaMacAVF.mk
index 877efd97ac36..acd6717bc769 100644
--- a/avmedia/Library_avmediaMacAVF.mk
+++ b/avmedia/Library_avmediaMacAVF.mk
@@ -7,6 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+ifeq ($(USE_AVMEDIA_DUMMY),FALSE)
 $(eval $(call gb_Library_Library,avmediaMacAVF))
 
 $(eval $(call gb_Library_set_componentfile,avmediaMacAVF,avmedia/source/macavf/avmediaMacAVF))
@@ -42,5 +43,6 @@ $(eval $(call gb_Library_add_objcxxobjects,avmediaMacAVF,\
 	avmedia/source/macavf/player \
 	avmedia/source/macavf/window \
 ))
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk
index 85eca192eb9a..a593d78f5cf0 100644
--- a/avmedia/Library_avmediaQuickTime.mk
+++ b/avmedia/Library_avmediaQuickTime.mk
@@ -7,6 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+ifeq ($(USE_AVMEDIA_DUMMY),FALSE)
 $(eval $(call gb_Library_Library,avmediaQuickTime))
 
 $(eval $(call gb_Library_set_componentfile,avmediaQuickTime,avmedia/source/quicktime/avmediaQuickTime))
@@ -41,5 +42,6 @@ $(eval $(call gb_Library_add_objcxxobjects,avmediaQuickTime,\
 	avmedia/source/quicktime/quicktimeuno \
 	avmedia/source/quicktime/window \
 ))
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
index 9b9622b7edc5..998e90f1aa5d 100644
--- a/avmedia/Library_avmediagst.mk
+++ b/avmedia/Library_avmediagst.mk
@@ -7,6 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+ifeq ($(USE_AVMEDIA_DUMMY),FALSE)
 $(eval $(call gb_Library_Library,avmediagst))
 
 $(eval $(call gb_Library_set_componentfile,avmediagst,avmedia/source/gstreamer/avmediagstreamer))
@@ -53,5 +54,6 @@ $(eval $(call gb_Library_add_exception_objects,avmediagst,\
 	avmedia/source/gstreamer/gstwindow \
 	avmedia/source/gstreamer/gstframegrabber \
 ))
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/avmedia/Library_avmediagst_0_10.mk b/avmedia/Library_avmediagst_0_10.mk
index 16f2d5db1440..6658cc51f64f 100644
--- a/avmedia/Library_avmediagst_0_10.mk
+++ b/avmedia/Library_avmediagst_0_10.mk
@@ -7,6 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+ifeq ($(USE_AVMEDIA_DUMMY),FALSE)
 $(eval $(call gb_Library_Library,avmediagst_0_10))
 
 $(eval $(call gb_Library_set_componentfile,avmediagst_0_10,avmedia/source/gstreamer/avmediagstreamer_0_10))
@@ -42,5 +43,6 @@ $(eval $(call gb_Library_add_libs,avmediagst_0_10,\
 $(eval $(call gb_Library_add_exception_objects,avmediagst_0_10,\
 	avmedia/source/gstreamer/gst_0_10 \
 ))
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/avmedia/Library_avmediaogl.mk b/avmedia/Library_avmediaogl.mk
index eae3efab1e64..2418093b09e8 100644
--- a/avmedia/Library_avmediaogl.mk
+++ b/avmedia/Library_avmediaogl.mk
@@ -7,6 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+ifeq ($(USE_AVMEDIA_DUMMY),FALSE)
 $(eval $(call gb_Library_Library,avmediaogl))
 
 $(eval $(call gb_Library_set_componentfile,avmediaogl,avmedia/source/opengl/avmediaogl))
@@ -41,5 +42,6 @@ $(eval $(call gb_Library_add_exception_objects,avmediaogl,\
     avmedia/source/opengl/ogluno \
     avmedia/source/opengl/oglwindow \
 ))
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/avmedia/Library_avmediavlc.mk b/avmedia/Library_avmediavlc.mk
index 0ee5cd2d0d46..91f3f0f68e93 100644
--- a/avmedia/Library_avmediavlc.mk
+++ b/avmedia/Library_avmediavlc.mk
@@ -7,6 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+ifeq ($(USE_AVMEDIA_DUMMY),FALSE)
 $(eval $(call gb_Library_Library,avmediavlc))
 
 $(eval $(call gb_Library_set_componentfile,avmediavlc,avmedia/source/vlc/avmediavlc))
@@ -51,5 +52,6 @@ $(eval $(call gb_Library_add_exception_objects,avmediavlc,\
     avmedia/source/vlc/wrapper/EventHandler \
     avmedia/source/vlc/wrapper/Common \
 ))
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk
index 09453d6c77ba..a16d8ecc5596 100644
--- a/avmedia/Library_avmediawin.mk
+++ b/avmedia/Library_avmediawin.mk
@@ -7,6 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+ifeq ($(USE_AVMEDIA_DUMMY),FALSE)
 $(eval $(call gb_Library_Library,avmediawin))
 
 $(eval $(call gb_Library_set_componentfile,avmediawin,avmedia/source/win/avmediawin))
@@ -44,5 +45,6 @@ $(eval $(call gb_Library_add_exception_objects,avmediawin,\
 	avmedia/source/win/window \
 	avmedia/source/win/winuno \
 ))
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index 8e1bd011d5e8..6af64efbad75 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,avmedia,\
 	Library_avmedia \
 ))
 
-ifneq ($(USE_AVMEDIA_DUMMY),TRUE)
+ifeq ($(USE_AVMEDIA_DUMMY),FALSE)
 $(eval $(call gb_Module_add_l10n_targets,avmedia,\
     AllLangMoTarget_avmedia \
 ))