summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2011-09-04 00:17:06 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2011-09-04 00:17:06 +0000
commite83e1ea1fcc871825dd1f5dcbce125674b9732fb (patch)
treee53eced47ec811a246d9ff18a5108f66d10b1e94
parent999e3bf306e5aae2c1e5bbf5beb512e50e924265 (diff)
generic module can now be built-in as static module.
also removed sole left-overs of previous disable of vlc engine. SVN revision: 63141
Diffstat (limited to '')
-rw-r--r--legacy/emotion/configure.ac2
-rw-r--r--legacy/emotion/m4/emotion_check.m42
-rw-r--r--legacy/emotion/src/lib/Makefile.am16
-rw-r--r--legacy/emotion/src/lib/emotion_smart.c7
-rw-r--r--legacy/emotion/src/modules/generic/emotion_generic.c2
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}"
296echo " Gstreamer..........: ${enable_gstreamer}" 296echo " Gstreamer..........: ${enable_gstreamer}"
297echo " Generic............: ${enable_generic}" 297echo " Generic............: ${enable_generic}"
298 298
299if test "x${enable_generic}" = "xyes"; then 299if test "x${enable_generic}" = "xyes" || test "x${enable_generic}" = "xstatic"; then
300echo 300echo
301echo " Generic Players:" 301echo " Generic Players:"
302echo " VLC................: ${enable_generic_vlc}" 302echo " 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,
172 ], 172 ],
173 [enable_module="auto"]) 173 [enable_module="auto"])
174 174
175if test "x${enable_generic}" != "xyes"; then 175if test "x${enable_generic}" != "xyes" && test "x${enable_generic}" != "xstatic"; then
176 if test "x${enable_module}" = "xyes"; then 176 if test "x${enable_module}" = "xyes"; then
177 AC_MSG_WARN([Generic module is disabled, force disable of Generic Player $1]) 177 AC_MSG_WARN([Generic module is disabled, force disable of Generic Player $1])
178 fi 178 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
21AM_CPPFLAGS += @GSTREAMER_CFLAGS@ 21AM_CPPFLAGS += @GSTREAMER_CFLAGS@
22endif 22endif
23 23
24#if EMOTION_STATIC_BUILD_VLC
25#AM_CPPFLAGS += @VLC_CFLAGS@
26#endif
27
28lib_LTLIBRARIES = libemotion.la 24lib_LTLIBRARIES = libemotion.la
29includes_HEADERS = Emotion.h 25includes_HEADERS = Emotion.h
30includesdir = $(includedir)/emotion-@VMAJ@ 26includesdir = $(includedir)/emotion-@VMAJ@
@@ -43,10 +39,10 @@ $(top_srcdir)/src/modules/gstreamer/emotion_gstreamer.c \
43$(top_srcdir)/src/modules/gstreamer/emotion_sink.c 39$(top_srcdir)/src/modules/gstreamer/emotion_sink.c
44endif 40endif
45 41
46#if EMOTION_STATIC_BUILD_VLC 42if EMOTION_STATIC_BUILD_GENERIC
47#libemotion_la_SOURCES += \ 43libemotion_la_SOURCES += \
48#$(top_srcdir)/src/modules/vlc/emotion_vlc.c 44$(top_srcdir)/src/modules/generic/emotion_generic.c
49#endif 45endif
50 46
51libemotion_la_LIBADD = @EMOTION_LIBS@ @EIO_LIBS@ @EEZE_LIBS@ 47libemotion_la_LIBADD = @EMOTION_LIBS@ @EIO_LIBS@ @EEZE_LIBS@
52 48
@@ -58,10 +54,6 @@ if EMOTION_STATIC_BUILD_GSTREAMER
58libemotion_la_LIBADD += @GSTREAMER_LIBS@ 54libemotion_la_LIBADD += @GSTREAMER_LIBS@
59endif 55endif
60 56
61#if EMOTION_STATIC_BUILD_VLC
62#libemotion_la_LIBADD += @VLC_LIBS@
63#endif
64
65libemotion_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ 57libemotion_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
66 58
67EXTRA_DIST = emotion_private.h 59EXTRA_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;
121static const char *_backend_priority[] = { 121static const char *_backend_priority[] = {
122 "gstreamer", 122 "gstreamer",
123 "xine", 123 "xine",
124 "vlc",
125 "generic" 124 "generic"
126}; 125};
127 126
@@ -1508,6 +1507,9 @@ Eina_Bool xine_module_init(void);
1508#ifdef EMOTION_STATIC_BUILD_GSTREAMER 1507#ifdef EMOTION_STATIC_BUILD_GSTREAMER
1509Eina_Bool gstreamer_module_init(void); 1508Eina_Bool gstreamer_module_init(void);
1510#endif 1509#endif
1510#ifdef EMOTION_STATIC_BUILD_GENERIC
1511Eina_Bool generic_module_init(void);
1512#endif
1511 1513
1512static void 1514static void
1513_smart_init(void) 1515_smart_init(void)
@@ -1557,6 +1559,9 @@ _smart_init(void)
1557#ifdef EMOTION_STATIC_BUILD_GSTREAMER 1559#ifdef EMOTION_STATIC_BUILD_GSTREAMER
1558 gstreamer_module_init(); 1560 gstreamer_module_init();
1559#endif 1561#endif
1562#ifdef EMOTION_STATIC_BUILD_GENERIC
1563 generic_module_init();
1564#endif
1560 1565
1561 static Evas_Smart_Class sc = 1566 static Evas_Smart_Class sc =
1562 EVAS_SMART_CLASS_INIT_NAME_VERSION(E_OBJ_NAME); 1567 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)
1148} 1148}
1149 1149
1150 1150
1151static Eina_Bool 1151Eina_Bool
1152generic_module_init(void) 1152generic_module_init(void)
1153{ 1153{
1154 if (!pfx) 1154 if (!pfx)