* enable static build of modules

 * clean up autotools
 * remove some warnings

issues:
 * vlc backend can not be built on my computer(API change
   in libvlc, it seems)
  * when i build xine *and* gstreamer as static, i get a
    multiple defined of __eina_module_init and __eina_module_shutdown


SVN revision: 44884

14 files changed, 152 insertions, 105 deletions

diff --git a/legacy/emotion/src/bin/Makefile.am b/legacy/emotion/src/bin/Makefile.am
index a90d5987b3..bc016d3ff0 100644
--- a/legacy/emotion/src/bin/Makefile.am
+++ b/legacy/emotion/src/bin/Makefile.am
@@ -7,16 +7,13 @@ AM_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@EVAS_CFLAGS@ \
-@ECORE_CFLAGS@ \
-@EDJE_CFLAGS@
+@EMOTION_CPPFLAGS@ \
+@EMOTION_BIN_CFLAGS@ \
+@ECORE_X_CFLAGS@ \
+@ECORE_FB_CFLAGS@
 
-bin_PROGRAMS = \
-emotion_test
+bin_PROGRAMS = emotion_test
 
-emotion_test_SOURCES = \
-emotion_test_main.c
+emotion_test_SOURCES = emotion_test_main.c
 
-emotion_test_LDADD = \
-@EVAS_LIBS@ @ECORE_LIBS@ @EDJE_LIBS@ \
-$(top_builddir)/src/lib/libemotion.la
+emotion_test_LDADD = @ECORE_X_CFLAGS@ @ECORE_FB_CFLAGS@ @EMOTION_BIN_LIBS@ $(top_builddir)/src/lib/libemotion.la
diff --git a/legacy/emotion/src/bin/emotion_test_main.c b/legacy/emotion/src/bin/emotion_test_main.c
index edccfe6569..c824090e3b 100644
--- a/legacy/emotion/src/bin/emotion_test_main.c
+++ b/legacy/emotion/src/bin/emotion_test_main.c
@@ -3,14 +3,14 @@
 #include <stdio.h>
 #include <string.h>
 
-#if defined(HAVE_ECORE_X_H) || defined(HAVE_ECORE_FB_H)
+#if defined(EMOTION_HAVE_ECORE_X) || defined(EMOTION_HAVE_ECORE_FB)
 
 #include <Evas.h>
 #include <Ecore.h>
-#ifndef FB_ONLY
-#include <Ecore_X.h>
+#ifdef EMOTION_HAVE_ECORE_X
+# include <Ecore_X.h>
 #else
-#include <Ecore_Fb.h>
+# include <Ecore_Fb.h>
 #endif
 #include <Ecore_Evas.h>
 #include <Edje.h>
@@ -64,7 +64,7 @@ main_start(int argc, char **argv)
    edje_frametime_set(1.0 / 30.0);
 
    if (!ecore_evas_init()) return -1;
-#ifndef FB_ONLY
+#ifdef EMOTION_HAVE_ECORE_X
      {
         int i;
 
@@ -112,20 +112,22 @@ main_start(int argc, char **argv)
      }
    if (mode == 4)
      ecore_evas = ecore_evas_new(NULL, 0, 0, startw, starth, NULL);
-#if HAVE_ECORE_EVAS_X
+# if HAVE_EVAS_SOFWARE_X11
    if (mode == 0)
      ecore_evas = ecore_evas_software_x11_new(NULL, 0,  0, 0, startw, starth);
-#endif
-#if HAVE_ECORE_EVAS_X11_GL
+# endif
+# if HAVE_EVAS_OPENGL_X11
    if (mode == 1)
      ecore_evas = ecore_evas_gl_x11_new(NULL, 0, 0, 0, startw, starth);
-#endif
-#if HAVE_ECORE_EVAS_FB
+# endif
+# if HAVE_EVAS_FB
    if (mode == 2)
      ecore_evas = ecore_evas_fb_new(NULL, 0, startw, starth);
-#endif
+# endif
+# if HAVE_EVAS_XRENDER_X11
    if (mode == 3)
      ecore_evas = ecore_evas_xrender_x11_new(NULL, 0, 0, 0, startw, starth);
+# endif
 
 #else
    startw = 240;
@@ -902,6 +904,7 @@ main(int argc, char **argv)
 }
 
 #else
+# warning "EMOTION_HAVE_ECORE_X and EMOTION_HAVE_ECORE_FB not defined !"
 int main()
 {
         puts("Could not find Ecore_X.h or Ecore_Fb.h so test is disabled");
diff --git a/legacy/emotion/src/lib/Makefile.am b/legacy/emotion/src/lib/Makefile.am
index d2bb4adc78..76e69ab52f 100644
--- a/legacy/emotion/src/lib/Makefile.am
+++ b/legacy/emotion/src/lib/Makefile.am
@@ -7,16 +7,62 @@ AM_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@EVAS_CFLAGS@ \
-@ECORE_CFLAGS@ \
+@EMOTION_CPPFLAGS@ \
+@EMOTION_CFLAGS@ \
 @EFL_EMOTION_BUILD@
 
+if EMOTION_STATIC_BUILD_XINE
+AM_CPPFLAGS += @XINE_CFLAGS@
+endif
+
+if EMOTION_STATIC_BUILD_GSTREAMER
+AM_CPPFLAGS += @GSTREAMER_CFLAGS@
+endif
+
+if EMOTION_STATIC_BUILD_VLC
+AM_CPPFLAGS += @VLC_CFLAGS@
+endif
+
 lib_LTLIBRARIES      = libemotion.la
 include_HEADERS      = Emotion.h
-libemotion_la_SOURCES  = \
-emotion_smart.c \
-emotion_private.h
+libemotion_la_SOURCES = emotion_smart.c
+
+if EMOTION_STATIC_BUILD_XINE
+libemotion_la_SOURCES += \
+$(top_srcdir)/src/modules/xine/emotion_xine.c \
+$(top_srcdir)/src/modules/xine/emotion_xine_vo_out.c
+endif
+
+if EMOTION_STATIC_BUILD_GSTREAMER
+libemotion_la_SOURCES += \
+$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer.c \
+$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline.c \
+$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_cdda.c \
+$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c \
+$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_file.c \
+$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_uri.c \
+$(top_srcdir)/src/modules/gstreamer/emotion_gstreamer_pipeline_v4l.c
+endif
+
+if EMOTION_STATIC_BUILD_VLC
+libemotion_la_SOURCES += \
+$(top_srcdir)/src/modules/vlc/emotion_vlc.c
+endif
+
+libemotion_la_LIBADD = @EMOTION_LIBS@
+
+if EMOTION_STATIC_BUILD_XINE
+libemotion_la_LIBADD += @XINE_LIBS@
+endif
+
+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@
 
-libemotion_la_LIBADD       = @EVAS_LIBS@ @ECORE_LIBS@
-libemotion_la_DEPENDENCIES = $(top_builddir)/config.h
-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_private.h b/legacy/emotion/src/lib/emotion_private.h
index 1fb6166391..adf1f255d2 100644
--- a/legacy/emotion/src/lib/emotion_private.h
+++ b/legacy/emotion/src/lib/emotion_private.h
@@ -1,18 +1,19 @@
 #ifndef EMOTION_PRIVATE_H
 #define EMOTION_PRIVATE_H
 
-#include <Evas.h>
-#include <Ecore.h>
-#include <Ecore_Job.h>
-#include <Ecore_Data.h>
-#include <Ecore_Str.h>
-#include <Emotion.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
-#include "config.h"
+#include <Evas.h>
+#include <Ecore.h>
+#include <Ecore_Job.h>
+#include <Ecore_Str.h>
+#include <Emotion.h>
 
 #define META_TRACK_TITLE 1
 #define META_TRACK_ARTIST 2
diff --git a/legacy/emotion/src/lib/emotion_smart.c b/legacy/emotion/src/lib/emotion_smart.c
index e3c54b417f..ba733f2fbb 100644
--- a/legacy/emotion/src/lib/emotion_smart.c
+++ b/legacy/emotion/src/lib/emotion_smart.c
@@ -119,7 +119,7 @@ _emotion_module_open(const char *name, Evas_Object *obj, Emotion_Video_Module **
 {
    Eina_Emotion_Plugins *plugin;
    Smart_Data *sd;
-   int index = 0;
+   unsigned int index = 0;
 
    E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0);
    if (!_backends)
@@ -1028,7 +1028,7 @@ _emotion_spu_button_set(Evas_Object *obj, int button)
 /****************************/
 
 static void
-_mouse_move(void *data, Evas *ev, Evas_Object *obj, void *event_info)
+_mouse_move(void *data, Evas *ev __UNUSED__, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Mouse_Move *e;
    Smart_Data *sd;
@@ -1048,7 +1048,7 @@ _mouse_move(void *data, Evas *ev, Evas_Object *obj, void *event_info)
 }
 
 static void
-_mouse_down(void *data, Evas *ev, Evas_Object *obj, void *event_info)
+_mouse_down(void *data, Evas *ev __UNUSED__, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Mouse_Down *e;
    Smart_Data *sd;
diff --git a/legacy/emotion/src/modules/gstreamer/Makefile.am b/legacy/emotion/src/modules/gstreamer/Makefile.am
index 533ab0c35c..2056ea33af 100644
--- a/legacy/emotion/src/modules/gstreamer/Makefile.am
+++ b/legacy/emotion/src/modules/gstreamer/Makefile.am
@@ -1,4 +1,3 @@
-
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
@@ -7,19 +6,18 @@ AM_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+@EMOTION_CPPFLAGS@ \
 @EFL_EMOTION_BUILD@ \
-@EVAS_CFLAGS@ \
-@ECORE_CFLAGS@ \
-@GST_CFLAGS@
+@GSTREAMER_CFLAGS@
 
-if BUILD_GSTREAMER_MODULE
+if EMOTION_BUILD_GSTREAMER
+if !EMOTION_STATIC_BUILD_GSTREAMER
 
 pkgdir = $(libdir)/emotion
 
 pkg_LTLIBRARIES = gstreamer.la
 gstreamer_la_SOURCES = \
 emotion_gstreamer.c \
-emotion_gstreamer.h \
 emotion_gstreamer_pipeline.c \
 emotion_gstreamer_pipeline.h \
 emotion_gstreamer_pipeline_cdda.c \
@@ -27,9 +25,12 @@ emotion_gstreamer_pipeline_dvd.c \
 emotion_gstreamer_pipeline_file.c \
 emotion_gstreamer_pipeline_uri.c \
 emotion_gstreamer_pipeline_v4l.c
-gstreamer_la_LIBADD  = @EVAS_LIBS@ @ECORE_LIBS@ @GST_LIBS@ $(top_builddir)/src/lib/libemotion.la
+gstreamer_la_LIBADD  = @GSTREAMER_LIBS@ $(top_builddir)/src/lib/libemotion.la
 gstreamer_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 gstreamer_la_LIBTOOLFLAGS = --tag=disable-static
 gstreamer_la_DEPENDENCIES = $(top_builddir)/config.h
 
 endif
+endif
+
+EXTRA_DIST = emotion_gstreamer.h
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
index 0de2cb029d..5340612255 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
@@ -236,7 +236,7 @@ static Emotion_Video_Module em_module =
 static unsigned char
 em_init(Evas_Object  *obj,
         void        **emotion_video,
-        Emotion_Module_Options *opt)
+        Emotion_Module_Options *opt __UNUSED__)
 {
    Emotion_Gstreamer_Video *ev;
    GError                  *error;
@@ -494,7 +494,7 @@ em_file_close(void *video)
 
 static void
 em_play(void   *video,
-        double  pos)
+        double  pos __UNUSED__)
 {
    Emotion_Gstreamer_Video *ev;
 
@@ -714,7 +714,7 @@ em_vis_get(void *video)
 }
 
 static Eina_Bool
-em_vis_supported(void *ef, Emotion_Vis vis)
+em_vis_supported(void *ef __UNUSED__, Emotion_Vis vis)
 {
    const char *name;
    GstElementFactory *factory;
@@ -899,7 +899,7 @@ em_bgra_data_get(void *video, unsigned char **bgra_data)
 }
 
 static void
-em_event_feed(void *video, int event)
+em_event_feed(void *video, int event __UNUSED__)
 {
    Emotion_Gstreamer_Video *ev;
 
@@ -907,7 +907,7 @@ em_event_feed(void *video, int event)
 }
 
 static void
-em_event_mouse_button_feed(void *video, int button, int x, int y)
+em_event_mouse_button_feed(void *video, int button __UNUSED__, int x __UNUSED__, int y __UNUSED__)
 {
    Emotion_Gstreamer_Video *ev;
 
@@ -915,7 +915,7 @@ em_event_mouse_button_feed(void *video, int button, int x, int y)
 }
 
 static void
-em_event_mouse_move_feed(void *video, int x, int y)
+em_event_mouse_move_feed(void *video, int x __UNUSED__, int y __UNUSED__)
 {
    Emotion_Gstreamer_Video *ev;
 
@@ -957,7 +957,7 @@ em_video_channel_get(void *video)
 
 static const char *
 em_video_channel_name_get(void *video,
-                          int   channel)
+                          int   channel __UNUSED__)
 {
    Emotion_Gstreamer_Video *ev;
 
@@ -1023,7 +1023,7 @@ em_audio_channel_get(void *video)
 
 static const char *
 em_audio_channel_name_get(void *video,
-                          int   channel)
+                          int   channel __UNUSED__)
 {
    Emotion_Gstreamer_Video *ev;
 
@@ -1109,7 +1109,7 @@ em_spu_channel_count(void *video)
 }
 
 static void
-em_spu_channel_set(void *video, int channel)
+em_spu_channel_set(void *video, int channel __UNUSED__)
 {
    Emotion_Gstreamer_Video *ev;
 
@@ -1127,7 +1127,7 @@ em_spu_channel_get(void *video)
 }
 
 static const char *
-em_spu_channel_name_get(void *video, int channel)
+em_spu_channel_name_get(void *video, int channel __UNUSED__)
 {
    Emotion_Gstreamer_Video *ev;
 
@@ -1136,7 +1136,7 @@ em_spu_channel_name_get(void *video, int channel)
 }
 
 static void
-em_spu_channel_mute_set(void *video, int mute)
+em_spu_channel_mute_set(void *video, int mute __UNUSED__)
 {
    Emotion_Gstreamer_Video *ev;
 
@@ -1163,7 +1163,7 @@ em_chapter_count(void *video)
 }
 
 static void
-em_chapter_set(void *video, int chapter)
+em_chapter_set(void *video, int chapter __UNUSED__)
 {
    Emotion_Gstreamer_Video *ev;
 
@@ -1181,7 +1181,7 @@ em_chapter_get(void *video)
 }
 
 static const char *
-em_chapter_name_get(void *video, int chapter)
+em_chapter_name_get(void *video, int chapter __UNUSED__)
 {
    Emotion_Gstreamer_Video *ev;
 
@@ -1191,7 +1191,7 @@ em_chapter_name_get(void *video, int chapter)
 }
 
 static void
-em_speed_set(void *video, double speed)
+em_speed_set(void *video, double speed __UNUSED__)
 {
    Emotion_Gstreamer_Video *ev;
 
@@ -1274,7 +1274,7 @@ module_open(Evas_Object           *obj,
 }
 
 static void
-module_close(Emotion_Video_Module *module,
+module_close(Emotion_Video_Module *module __UNUSED__,
              void                 *video)
 {
    em_module.shutdown(video);
@@ -1434,7 +1434,7 @@ _free_metadata(Emotion_Gstreamer_Metadata *m)
 }
 
 static void
-_em_buffer_read(void *data, void *buf, unsigned int nbyte)
+_em_buffer_read(void *data, void *buf, unsigned int nbyte __UNUSED__)
 {
    Emotion_Gstreamer_Video *ev;
    Emotion_Video_Sink      *vsink;
@@ -1444,7 +1444,11 @@ _em_buffer_read(void *data, void *buf, unsigned int nbyte)
    buffer = *((GstBuffer **)buf);
    _emotion_frame_new(ev->obj);
    vsink = (Emotion_Video_Sink *)eina_list_nth(ev->video_sinks, ev->video_sink_nbr);
-   if (vsink) _emotion_video_pos_update(ev->obj, ev->position, vsink->length_time);
+   if (vsink)
+     {
+       _emotion_video_pos_update(ev->obj, ev->position, vsink->length_time);
+       _emotion_frame_resize(ev->obj, vsink->width, vsink->height, ev->ratio);
+     }
 }
 
 static int
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline.c
index 6513b91c20..ccfe04e3aa 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline.c
@@ -33,7 +33,7 @@ emotion_pipeline_pause(GstElement *pipeline)
 
 /* Send the video frame to the evas object */
 void
-cb_handoff(GstElement *fakesrc,
+cb_handoff(GstElement *fakesrc __UNUSED__,
            GstBuffer  *buffer,
            GstPad     *pad,
            gpointer    user_data)
@@ -74,9 +74,9 @@ cb_handoff(GstElement *fakesrc,
 }
 
 void
-file_new_decoded_pad_cb(GstElement *decodebin,
+file_new_decoded_pad_cb(GstElement *decodebin __UNUSED__,
                         GstPad     *new_pad,
-                        gboolean    last,
+                        gboolean    last __UNUSED__,
                         gpointer    user_data)
 {
    Emotion_Gstreamer_Video *ev;
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c
index 48b9f00dde..465c2bbcb5 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer_pipeline_dvd.c
@@ -144,7 +144,7 @@ failure_dvdreadsrc:
 }
 
 static void
-dvd_pad_added_cb(GstElement *dvddemuxer,
+dvd_pad_added_cb(GstElement *dvddemuxer __UNUSED__,
                  GObject    *new_pad,
                  gpointer    user_data)
 {
@@ -239,8 +239,8 @@ dvd_pad_added_cb(GstElement *dvddemuxer,
 }
 
 static void
-dvd_no_more_pads_cb(GstElement *dvddemuxer,
-                    gpointer    user_data)
+dvd_no_more_pads_cb(GstElement *dvddemuxer __UNUSED__,
+                    gpointer    user_data __UNUSED__)
 {
   no_more_pads = 1;
 }
diff --git a/legacy/emotion/src/modules/vlc/Makefile.am b/legacy/emotion/src/modules/vlc/Makefile.am
index f165d684a5..9e706ff4de 100644
--- a/legacy/emotion/src/modules/vlc/Makefile.am
+++ b/legacy/emotion/src/modules/vlc/Makefile.am
@@ -1,4 +1,3 @@
-
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
@@ -8,22 +7,22 @@ AM_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@EVAS_CFLAGS@ \
-@ECORE_CFLAGS@ \
+@EMOTION_CPPFLAGS@ \
 @VLC_CFLAGS@
 
-if BUILD_VLC_MODULE
+if EMOTION_BUILD_VLC
+if !EMOTION_STATIC_BUILD_VLC
 
 pkgdir = $(libdir)/emotion
 
 pkg_LTLIBRARIES = vlc.la
 
-vlc_la_SOURCES      = \
+vlc_la_SOURCES = \
 emotion_vlc.c \
 emotion_vlc.h
-vlc_la_LIBADD       = @EVAS_LIBS@ @ECORE_LIBS@ @VLC_LIBS@ $(top_builddir)/src/lib/libemotion.la -lpthread
-vlc_la_LDFLAGS      = -no-undefined @lt_enable_auto_import@ -module -avoid-version
+vlc_la_LIBADD = @VLC_LIBS@ $(top_builddir)/src/lib/libemotion.la -lpthread
+vlc_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 vlc_la_LIBTOOLFLAGS = --tag=disable-static
-vlc_la_DEPENDENCIES = $(top_builddir)/config.h
 
 endif
+endif
diff --git a/legacy/emotion/src/modules/vlc/emotion_vlc.c b/legacy/emotion/src/modules/vlc/emotion_vlc.c
index 7f641802a9..bf0c9ccbad 100644
--- a/legacy/emotion/src/modules/vlc/emotion_vlc.c
+++ b/legacy/emotion/src/modules/vlc/emotion_vlc.c
@@ -3,8 +3,8 @@
  * code@ife-sit.info
  */
 
-#ifndef EMOTION_VLC_C
-#define EMOTION_VLC_C
+#include <sys/types.h>
+#include <unistd.h>
 
 #include "Emotion.h"
 #include "emotion_private.h"
@@ -1241,6 +1241,3 @@ EINA_MODULE_SHUTDOWN(vlc_module_shutdown);
 
 #endif
 
-
-#endif /* EMOTION_VLC_C */
-
diff --git a/legacy/emotion/src/modules/xine/Makefile.am b/legacy/emotion/src/modules/xine/Makefile.am
index 3dfcba7584..a716243c03 100644
--- a/legacy/emotion/src/modules/xine/Makefile.am
+++ b/legacy/emotion/src/modules/xine/Makefile.am
@@ -1,4 +1,3 @@
-
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
@@ -8,23 +7,23 @@ AM_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@EVAS_CFLAGS@ \
-@ECORE_CFLAGS@ \
+@EMOTION_CPPFLAGS@ \
 @XINE_CFLAGS@
 
-if BUILD_XINE_MODULE
+if EMOTION_BUILD_XINE
+if !EMOTION_STATIC_BUILD_XINE
 
 pkgdir = $(libdir)/emotion
 
 pkg_LTLIBRARIES = xine.la
 
-xine_la_SOURCES      = \
+xine_la_SOURCES = \
 emotion_xine.c \
 emotion_xine.h \
 emotion_xine_vo_out.c
-xine_la_LIBADD       = @EVAS_LIBS@ @ECORE_LIBS@ @XINE_LIBS@ $(top_builddir)/src/lib/libemotion.la -lpthread
-xine_la_LDFLAGS      = -no-undefined @lt_enable_auto_import@ -module -avoid-version
+xine_la_LIBADD = @XINE_LIBS@ $(top_builddir)/src/lib/libemotion.la -lpthread
+xine_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 xine_la_LIBTOOLFLAGS = --tag=disable-static
-xine_la_DEPENDENCIES = $(top_builddir)/config.h
 
 endif
+endif
diff --git a/legacy/emotion/src/modules/xine/emotion_xine.c b/legacy/emotion/src/modules/xine/emotion_xine.c
index 15d1556843..99b3139c85 100644
--- a/legacy/emotion/src/modules/xine/emotion_xine.c
+++ b/legacy/emotion/src/modules/xine/emotion_xine.c
@@ -439,7 +439,7 @@ em_shutdown(void *ef)
 }
 
 static unsigned char
-em_file_open(const char *file, Evas_Object *obj, void *ef)
+em_file_open(const char *file, Evas_Object *obj __UNUSED__, void *ef)
 {
    Emotion_Xine_Video *ev;
 
@@ -573,7 +573,7 @@ em_vis_get(void *ef)
 }
 
 static Eina_Bool
-em_vis_supported(void *ef, Emotion_Vis vis)
+em_vis_supported(void *ef __UNUSED__, Emotion_Vis vis __UNUSED__)
 {
    return EINA_FALSE;
 }
@@ -665,7 +665,7 @@ em_video_data_size_get(void *ef, int *w, int *h)
 }
 
 static int
-em_yuv_rows_get(void *ef, int w, int h, unsigned char **yrows, unsigned char **urows, unsigned char **vrows)
+em_yuv_rows_get(void *ef, int w __UNUSED__, int h, unsigned char **yrows, unsigned char **urows, unsigned char **vrows)
 {
    Emotion_Xine_Video *ev;
    volatile Emotion_Xine_Video_Frame *fr;
@@ -808,7 +808,7 @@ em_event_feed(void *ef, int event)
 }
 
 static void
-em_event_mouse_button_feed(void *ef, int button, int x, int y)
+em_event_mouse_button_feed(void *ef, int button __UNUSED__, int x, int y)
 {
    Emotion_Xine_Video *ev;
    xine_event_t xine_event;
@@ -883,7 +883,7 @@ em_video_channel_get(void *ef)
 }
 
 static const char *
-em_video_channel_name_get(void *ef, int channel)
+em_video_channel_name_get(void *ef, int channel __UNUSED__)
 {
    Emotion_Xine_Video *ev;
    
@@ -1072,7 +1072,7 @@ em_chapter_count(void *ef)
 }
 
 static void
-em_chapter_set(void *ef, int chapter)
+em_chapter_set(void *ef, int chapter __UNUSED__)
 {
    Emotion_Xine_Video *ev;
    
@@ -1089,7 +1089,7 @@ em_chapter_get(void *ef)
 }
 
 static const char *
-em_chapter_name_get(void *ef, int chapter)
+em_chapter_name_get(void *ef, int chapter __UNUSED__)
 {
    Emotion_Xine_Video *ev;
    
@@ -1098,7 +1098,7 @@ em_chapter_name_get(void *ef, int chapter)
 }
 
 static void
-em_speed_set(void *ef, double speed)
+em_speed_set(void *ef, double speed __UNUSED__)
 {
    Emotion_Xine_Video *ev;
    
@@ -1540,7 +1540,7 @@ module_open(Evas_Object *obj, const Emotion_Video_Module **module, void **video,
 }
 
 static void
-module_close(Emotion_Video_Module *module, void *video)
+module_close(Emotion_Video_Module *module __UNUSED__, void *video)
 {
    em_module.shutdown(video);
 }
diff --git a/legacy/emotion/src/modules/xine/emotion_xine_vo_out.c b/legacy/emotion/src/modules/xine/emotion_xine_vo_out.c
index e3bf7d59e5..92f66ebf29 100644
--- a/legacy/emotion/src/modules/xine/emotion_xine_vo_out.c
+++ b/legacy/emotion/src/modules/xine/emotion_xine_vo_out.c
@@ -111,7 +111,7 @@ plugin_info_t emotion_xine_plugin_info[] =
 
 /***************************************************************************/
 static void *
-_emotion_class_init(xine_t *xine, void *visual)
+_emotion_class_init(xine_t *xine, void *visual __UNUSED__)
 {
    Emotion_Class *cl;
    
@@ -225,7 +225,7 @@ _emotion_capabilities_get(vo_driver_t *vo_driver)
 
 /***************************************************************************/
 static int
-_emotion_gui_data_exchange(vo_driver_t *vo_driver, int data_type, void *data)
+_emotion_gui_data_exchange(vo_driver_t *vo_driver, int data_type, void *data __UNUSED__)
 {
    Emotion_Driver *dv;
    
@@ -292,7 +292,7 @@ _emotion_property_get(vo_driver_t *vo_driver, int property)
 }
 
 static void
-_emotion_property_min_max_get(vo_driver_t *vo_driver, int property, int *min, int *max)
+_emotion_property_min_max_get(vo_driver_t *vo_driver, int property __UNUSED__, int *min, int *max)
 {
    Emotion_Driver *dv;
    
@@ -339,7 +339,7 @@ _emotion_frame_dispose(vo_frame_t *vo_frame)
 }
 
 static void
-_emotion_frame_format_update(vo_driver_t *vo_driver, vo_frame_t *vo_frame, uint32_t width, uint32_t height, double ratio, int format, int flags)
+_emotion_frame_format_update(vo_driver_t *vo_driver, vo_frame_t *vo_frame, uint32_t width, uint32_t height, double ratio, int format, int flags __UNUSED__)
 {
    Emotion_Driver *dv;
    Emotion_Frame *fr;
@@ -468,7 +468,7 @@ _emotion_frame_display(vo_driver_t *vo_driver, vo_frame_t *vo_frame)
 }
 
 static void
-_emotion_frame_field(vo_frame_t *vo_frame, int which_field)
+_emotion_frame_field(vo_frame_t *vo_frame, int which_field __UNUSED__)
 {
    Emotion_Frame *fr;
    
@@ -510,7 +510,7 @@ _emotion_frame_data_unlock(Emotion_Frame *fr)
 
 /***************************************************************************/
 static void
-_emotion_overlay_begin(vo_driver_t *vo_driver, vo_frame_t *vo_frame, int changed)
+_emotion_overlay_begin(vo_driver_t *vo_driver, vo_frame_t *vo_frame, int changed __UNUSED__)
 {
    Emotion_Driver *dv;
    Emotion_Frame *fr;