5 files changed, 13 insertions, 16 deletions

diff --git a/legacy/emotion/configure.ac b/legacy/emotion/configure.ac
index c67b4838ee..d431700411 100644
--- a/legacy/emotion/configure.ac
+++ b/legacy/emotion/configure.ac
@@ -296,7 +296,7 @@ echo "    Xine...............: ${enable_xine}"
 echo "    Gstreamer..........: ${enable_gstreamer}"
 echo "    Generic............: ${enable_generic}"
 
-if test "x${enable_generic}" = "xyes"; then
+if test "x${enable_generic}" = "xyes" || test "x${enable_generic}" = "xstatic"; then
 echo
 echo "  Generic Players:"
 echo "    VLC................: ${enable_generic_vlc}"
diff --git a/legacy/emotion/m4/emotion_check.m4 b/legacy/emotion/m4/emotion_check.m4
index 4509c254ac..8c0114ce9a 100644
--- a/legacy/emotion/m4/emotion_check.m4
+++ b/legacy/emotion/m4/emotion_check.m4
@@ -172,7 +172,7 @@ AC_ARG_ENABLE(generic-[]DOWN,
    ],
    [enable_module="auto"])
 
-if test "x${enable_generic}" != "xyes"; then
+if test "x${enable_generic}" != "xyes" && test "x${enable_generic}" != "xstatic"; then
    if test "x${enable_module}" = "xyes"; then
       AC_MSG_WARN([Generic module is disabled, force disable of Generic Player $1])
    fi
diff --git a/legacy/emotion/src/lib/Makefile.am b/legacy/emotion/src/lib/Makefile.am
index 0f48f11738..a2d2198683 100644
--- a/legacy/emotion/src/lib/Makefile.am
+++ b/legacy/emotion/src/lib/Makefile.am
@@ -21,10 +21,6 @@ if EMOTION_STATIC_BUILD_GSTREAMER
 AM_CPPFLAGS += @GSTREAMER_CFLAGS@
 endif
 
-#if EMOTION_STATIC_BUILD_VLC
-#AM_CPPFLAGS += @VLC_CFLAGS@
-#endif
-
 lib_LTLIBRARIES      = libemotion.la
 includes_HEADERS      = Emotion.h
 includesdir = $(includedir)/emotion-@VMAJ@
@@ -43,10 +39,10 @@ $(top_srcdir)/src/modules/gstreamer/emotion_gstreamer.c \
 $(top_srcdir)/src/modules/gstreamer/emotion_sink.c
 endif
 
-#if EMOTION_STATIC_BUILD_VLC
-#libemotion_la_SOURCES += \
-#$(top_srcdir)/src/modules/vlc/emotion_vlc.c
-#endif
+if EMOTION_STATIC_BUILD_GENERIC
+libemotion_la_SOURCES += \
+$(top_srcdir)/src/modules/generic/emotion_generic.c
+endif
 
 libemotion_la_LIBADD = @EMOTION_LIBS@ @EIO_LIBS@ @EEZE_LIBS@
 
@@ -58,10 +54,6 @@ if EMOTION_STATIC_BUILD_GSTREAMER
 libemotion_la_LIBADD += @GSTREAMER_LIBS@
 endif
 
-#if EMOTION_STATIC_BUILD_VLC
-#libemotion_la_LIBADD += @VLC_LIBS@
-#endif
-
 libemotion_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
 
 EXTRA_DIST = emotion_private.h
diff --git a/legacy/emotion/src/lib/emotion_smart.c b/legacy/emotion/src/lib/emotion_smart.c
index be68d0fe24..3fbcbea5f5 100644
--- a/legacy/emotion/src/lib/emotion_smart.c
+++ b/legacy/emotion/src/lib/emotion_smart.c
@@ -121,7 +121,6 @@ static int _log_domain = -1;
 static const char *_backend_priority[] = {
   "gstreamer",
   "xine",
-  "vlc",
   "generic"
 };
 
@@ -1508,6 +1507,9 @@ Eina_Bool xine_module_init(void);
 #ifdef EMOTION_STATIC_BUILD_GSTREAMER
 Eina_Bool gstreamer_module_init(void);
 #endif
+#ifdef EMOTION_STATIC_BUILD_GENERIC
+Eina_Bool generic_module_init(void);
+#endif
 
 static void
 _smart_init(void)
@@ -1557,6 +1559,9 @@ _smart_init(void)
 #ifdef EMOTION_STATIC_BUILD_GSTREAMER
         gstreamer_module_init();
 #endif
+#ifdef EMOTION_STATIC_BUILD_GENERIC
+        generic_module_init();
+#endif
 
         static Evas_Smart_Class sc =
           EVAS_SMART_CLASS_INIT_NAME_VERSION(E_OBJ_NAME);
diff --git a/legacy/emotion/src/modules/generic/emotion_generic.c b/legacy/emotion/src/modules/generic/emotion_generic.c
index aac4696212..747d88eb1b 100644
--- a/legacy/emotion/src/modules/generic/emotion_generic.c
+++ b/legacy/emotion/src/modules/generic/emotion_generic.c
@@ -1148,7 +1148,7 @@ static void module_close(Emotion_Video_Module *module __UNUSED__, void *video)
 }
 
 
-static Eina_Bool
+Eina_Bool
 generic_module_init(void)
 {
    if (!pfx)