summaryrefslogtreecommitdiff
path: root/legacy/evas/src/modules/engines/software_generic
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2009-06-16 13:01:36 +0000
committerCedric BAIL <cedric.bail@free.fr>2009-06-16 13:01:36 +0000
commit575b0579cde450b6cd4849a5085c9da500ad8b86 (patch)
treec43bd69c4d65e7b0e24a5ea025e8302c06878812 /legacy/evas/src/modules/engines/software_generic
parente0c6b0df8da8d6f14294767e02117cb0ddc69059 (diff)
* evas: Move to Eina module and make it possible to build a libevas with
everything in it. Note: This patch break the module API, so make sure you recompile and install every thing. SVN revision: 41055
Diffstat (limited to 'legacy/evas/src/modules/engines/software_generic')
-rw-r--r--legacy/evas/src/modules/engines/software_generic/Makefile.am14
-rw-r--r--legacy/evas/src/modules/engines/software_generic/evas_engine.c25
2 files changed, 30 insertions, 9 deletions
diff --git a/legacy/evas/src/modules/engines/software_generic/Makefile.am b/legacy/evas/src/modules/engines/software_generic/Makefile.am
index 3c4a5e547e..de7f9826d5 100644
--- a/legacy/evas/src/modules/engines/software_generic/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_generic/Makefile.am
@@ -11,12 +11,24 @@ AM_CPPFLAGS = \
11 11
12AM_CFLAGS = @WIN32_CFLAGS@ 12AM_CFLAGS = @WIN32_CFLAGS@
13 13
14SOFTWARE_GENERIC_SOURCES = evas_engine.c
15
14pkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH) 16pkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH)
15 17
18if !EVAS_STATIC_BUILD_SOFTWARE_GENERIC
19
16pkg_LTLIBRARIES = module.la 20pkg_LTLIBRARIES = module.la
17 21
18module_la_SOURCES = evas_engine.c 22module_la_SOURCES = $(SOFTWARE_GENERIC_SOURCES)
19 23
20module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la 24module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la
21module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 25module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
22module_la_LIBTOOLFLAGS = --tag=disable-static 26module_la_LIBTOOLFLAGS = --tag=disable-static
27
28else
29
30noinst_LTLIBRARIES = libevas_engine_software_generic.la
31
32libevas_engine_software_generic_la_SOURCES = $(SOFTWARE_GENERIC_SOURCES)
33
34endif
diff --git a/legacy/evas/src/modules/engines/software_generic/evas_engine.c b/legacy/evas/src/modules/engines/software_generic/evas_engine.c
index 566dddaba0..5dc7a0302b 100644
--- a/legacy/evas/src/modules/engines/software_generic/evas_engine.c
+++ b/legacy/evas/src/modules/engines/software_generic/evas_engine.c
@@ -1121,7 +1121,7 @@ static Evas_Func func =
1121 ***** 1121 *****
1122 */ 1122 */
1123 1123
1124EAPI int 1124static int
1125module_open(Evas_Module *em) 1125module_open(Evas_Module *em)
1126{ 1126{
1127 if (!em) return 0; 1127 if (!em) return 0;
@@ -1130,15 +1130,24 @@ module_open(Evas_Module *em)
1130 return 1; 1130 return 1;
1131} 1131}
1132 1132
1133EAPI void 1133static void
1134module_close(void) 1134module_close(Evas_Module *em)
1135{ 1135{
1136} 1136}
1137 1137
1138EAPI Evas_Module_Api evas_modapi = 1138static Evas_Module_Api evas_modapi =
1139{ 1139{
1140 EVAS_MODULE_API_VERSION, 1140 EVAS_MODULE_API_VERSION,
1141 EVAS_MODULE_TYPE_ENGINE, 1141 "software_generic",
1142 "software_generic", 1142 "none",
1143 "none" 1143 {
1144 module_open,
1145 module_close
1146 }
1144}; 1147};
1148
1149EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_generic);
1150
1151#ifndef EVAS_STATIC_BUILD_SOFTWARE_GENERIC
1152EVAS_EINA_MODULE_DEFINE(engine, software_generic);
1153#endif