summaryrefslogtreecommitdiff
path: root/legacy/evas/src/modules/engines
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
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')
-rw-r--r--legacy/evas/src/modules/engines/Makefile.am82
-rw-r--r--legacy/evas/src/modules/engines/buffer/Makefile.am20
-rw-r--r--legacy/evas/src/modules/engines/buffer/evas_engine.c26
-rw-r--r--legacy/evas/src/modules/engines/cairo_x11/Makefile.am24
-rw-r--r--legacy/evas/src/modules/engines/cairo_x11/evas_engine.c24
-rw-r--r--legacy/evas/src/modules/engines/direct3d/Makefile.am25
-rw-r--r--legacy/evas/src/modules/engines/direct3d/evas_engine.c25
-rw-r--r--legacy/evas/src/modules/engines/directfb/Makefile.am19
-rw-r--r--legacy/evas/src/modules/engines/directfb/evas_engine.c25
-rw-r--r--legacy/evas/src/modules/engines/fb/Makefile.am25
-rw-r--r--legacy/evas/src/modules/engines/fb/evas_engine.c25
-rw-r--r--legacy/evas/src/modules/engines/gl_glew/Makefile.am25
-rw-r--r--legacy/evas/src/modules/engines/gl_glew/evas_engine.c23
-rw-r--r--legacy/evas/src/modules/engines/gl_x11/Makefile.am25
-rw-r--r--legacy/evas/src/modules/engines/gl_x11/evas_engine.c24
-rw-r--r--legacy/evas/src/modules/engines/quartz/Makefile.am20
-rw-r--r--legacy/evas/src/modules/engines/quartz/evas_engine.c23
-rw-r--r--legacy/evas/src/modules/engines/software_16/Makefile.am18
-rw-r--r--legacy/evas/src/modules/engines/software_16/evas_engine.c21
-rw-r--r--legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am27
-rw-r--r--legacy/evas/src/modules/engines/software_16_ddraw/evas_engine.c23
-rw-r--r--legacy/evas/src/modules/engines/software_16_sdl/Makefile.am20
-rw-r--r--legacy/evas/src/modules/engines/software_16_sdl/evas_engine.c25
-rw-r--r--legacy/evas/src/modules/engines/software_16_wince/Makefile.am27
-rw-r--r--legacy/evas/src/modules/engines/software_16_wince/evas_engine.c21
-rw-r--r--legacy/evas/src/modules/engines/software_16_x11/Makefile.am25
-rw-r--r--legacy/evas/src/modules/engines/software_16_x11/evas_engine.c26
-rw-r--r--legacy/evas/src/modules/engines/software_ddraw/Makefile.am25
-rw-r--r--legacy/evas/src/modules/engines/software_ddraw/evas_engine.c21
-rw-r--r--legacy/evas/src/modules/engines/software_gdi/Makefile.am25
-rw-r--r--legacy/evas/src/modules/engines/software_gdi/evas_engine.c21
-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
-rw-r--r--legacy/evas/src/modules/engines/software_qtopia/Makefile.am25
-rw-r--r--legacy/evas/src/modules/engines/software_qtopia/evas_engine.c23
-rw-r--r--legacy/evas/src/modules/engines/software_sdl/Makefile.am20
-rw-r--r--legacy/evas/src/modules/engines/software_sdl/evas_engine.c23
-rw-r--r--legacy/evas/src/modules/engines/software_x11/Makefile.am29
-rw-r--r--legacy/evas/src/modules/engines/software_x11/evas_engine.c24
-rw-r--r--legacy/evas/src/modules/engines/xrender_x11/Makefile.am31
-rw-r--r--legacy/evas/src/modules/engines/xrender_x11/evas_engine.c24
41 files changed, 749 insertions, 274 deletions
diff --git a/legacy/evas/src/modules/engines/Makefile.am b/legacy/evas/src/modules/engines/Makefile.am
index 3ddd1f3873..7a20c88408 100644
--- a/legacy/evas/src/modules/engines/Makefile.am
+++ b/legacy/evas/src/modules/engines/Makefile.am
@@ -1,25 +1,65 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3SUBDIRS = \ 3SUBDIRS =
4software_generic \ 4
5buffer \ 5if !EVAS_STATIC_BUILD_SOFTWARE_GENERIC
6directfb \ 6SUBDIRS += software_generic
7fb \ 7endif
8gl_common \ 8if !EVAS_STATIC_BUILD_BUFFER
9gl_x11 \ 9SUBDIRS += buffer
10gl_glew \ 10endif
11software_gdi \ 11if !EVAS_STATIC_BUILD_DIRECT3D
12software_ddraw \ 12SUBDIRS += direct3d
13software_x11 \ 13endif
14xrender_x11 \ 14if !EVAS_STATIC_BUILD_DIRECTFB
15software_sdl \ 15SUBDIRS += directfb
16software_16 \ 16endif
17software_16_x11 \ 17if !EVAS_STATIC_BUILD_FB
18direct3d \ 18SUBDIRS += fb
19software_16_ddraw \ 19endif
20software_16_wince \ 20if !EVAS_STATIC_BUILD_GL_GLEW
21software_16_sdl \ 21SUBDIRS += gl_common gl_glew
22quartz 22endif
23if !EVAS_STATIC_BUILD_GL_X11
24SUBDIRS += gl_common gl_x11
25endif
26if !EVAS_STATIC_BUILD_QUARTZ
27SUBDIRS += quartz
28endif
29if !EVAS_STATIC_BUILD_SOFTWARE_16
30SUBDIRS += software_16
31endif
32if !EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW
33SUBDIRS += software_16_ddraw
34endif
35if !EVAS_STATIC_BUILD_SOFTWARE_16_WINCE
36SUBDIRS += software_16_wince
37endif
38if !EVAS_STATIC_BUILD_SOFTWARE_16_X11
39SUBDIRS += software_16_x11
40endif
41if !EVAS_STATIC_BUILD_SOFTWARE_SDL
42SUBDIRS += software_16_sdl software_sdl
43endif
44if !EVAS_STATIC_BUILD_SOFTWARE_DDRAW
45SUBDIRS += software_ddraw
46endif
47if !EVAS_STATIC_BUILD_SOFTWARE_GDI
48SUBDIRS += software_gdi
49endif
50if !EVAS_STATIC_BUILD_SOFTWARE_X11
51SUBDIRS += software_x11
52endif
53if !EVAS_STATIC_BUILD_XRENDER_X11
54SUBDIRS += xrender_x11
55endif
56
57
58#if !EVAS_STATIC_BUILD_CAIRO_X11
59#SUBDIRS +=
23#cairo_common 60#cairo_common
24#cairo_x11 61#cairo_x11
25#software_qtopia 62#endif
63#if !EVAS_STATIC_BUILD_SOFTWARE_QTOPIA
64#SUBDIRS += software_qtopia
65#endif
diff --git a/legacy/evas/src/modules/engines/buffer/Makefile.am b/legacy/evas/src/modules/engines/buffer/Makefile.am
index 7d9b7c9a9b..371eabd4a0 100644
--- a/legacy/evas/src/modules/engines/buffer/Makefile.am
+++ b/legacy/evas/src/modules/engines/buffer/Makefile.am
@@ -13,20 +13,30 @@ AM_CFLAGS = @WIN32_CFLAGS@
13 13
14if BUILD_ENGINE_BUFFER 14if BUILD_ENGINE_BUFFER
15 15
16BUFFER_SOURCES = \
17evas_engine.c \
18evas_outbuf.c
19
16pkgdir = $(libdir)/evas/modules/engines/buffer/$(MODULE_ARCH) 20pkgdir = $(libdir)/evas/modules/engines/buffer/$(MODULE_ARCH)
17 21
18pkg_LTLIBRARIES = module.la 22include_HEADERS = Evas_Engine_Buffer.h
19 23
20module_la_SOURCES = \ 24if !EVAS_STATIC_BUILD_BUFFER
21evas_engine.c \
22evas_outbuf.c
23 25
26pkg_LTLIBRARIES = module.la
27
28module_la_SOURCES = $(BUFFER_SOURCES)
24module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ 29module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@
25module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 30module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
26module_la_LIBTOOLFLAGS = --tag=disable-static 31module_la_LIBTOOLFLAGS = --tag=disable-static
27 32
28include_HEADERS = Evas_Engine_Buffer.h 33else
29 34
35noinst_LTLIBRARIES = libevas_engine_buffer.la
36
37libevas_engine_buffer_la_SOURCES = $(BUFFER_SOURCES)
38
39endif
30endif 40endif
31 41
32EXTRA_DIST = evas_engine.h 42EXTRA_DIST = evas_engine.h
diff --git a/legacy/evas/src/modules/engines/buffer/evas_engine.c b/legacy/evas/src/modules/engines/buffer/evas_engine.c
index e5af0ccf6c..5343f1cfed 100644
--- a/legacy/evas/src/modules/engines/buffer/evas_engine.c
+++ b/legacy/evas/src/modules/engines/buffer/evas_engine.c
@@ -323,7 +323,7 @@ eng_output_idle_flush(void *data)
323} 323}
324 324
325/* module advertising code */ 325/* module advertising code */
326EAPI int 326static int
327module_open(Evas_Module *em) 327module_open(Evas_Module *em)
328{ 328{
329 if (!em) return 0; 329 if (!em) return 0;
@@ -351,15 +351,25 @@ module_open(Evas_Module *em)
351 return 1; 351 return 1;
352} 352}
353 353
354EAPI void 354static void
355module_close(void) 355module_close(Evas_Module *em)
356{ 356{
357} 357}
358 358
359EAPI Evas_Module_Api evas_modapi = 359static Evas_Module_Api evas_modapi =
360{ 360{
361 EVAS_MODULE_API_VERSION, 361 EVAS_MODULE_API_VERSION,
362 EVAS_MODULE_TYPE_ENGINE, 362 "buffer",
363 "buffer", 363 "none",
364 "none" 364 {
365 module_open,
366 module_close
367 }
365}; 368};
369
370EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, buffer);
371
372#ifndef EVAS_STATIC_BUILD_BUFFER
373EVAS_EINA_MODULE_DEFINE(engine, buffer);
374#endif
375
diff --git a/legacy/evas/src/modules/engines/cairo_x11/Makefile.am b/legacy/evas/src/modules/engines/cairo_x11/Makefile.am
index e1dcc4d9d5..e861db2d94 100644
--- a/legacy/evas/src/modules/engines/cairo_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/cairo_x11/Makefile.am
@@ -12,20 +12,34 @@ AM_CPPFLAGS = \
12 12
13if BUILD_ENGINE_CAIRO_X11 13if BUILD_ENGINE_CAIRO_X11
14 14
15CAIRO_X11_SOURCES = \
16evas_engine.c \
17evas_x_main.c
18
19CAIRO_X11_LIBADD = @evas_engine_cairo_x11_libs@ $(top_builddir)/src/modules/engines/cairo_common/libevas_engine_cairo_common.la
20
15pkgdir = $(libdir)/evas/modules/engines/cairo_x11/$(MODULE_ARCH) 21pkgdir = $(libdir)/evas/modules/engines/cairo_x11/$(MODULE_ARCH)
16 22
23include_HEADERS = Evas_Engine_Cairo_X11.h
24
25if !EVAS_STATIC_BUILD_CAIRO_X11
26
17pkg_LTLIBRARIES = module.la 27pkg_LTLIBRARIES = module.la
18 28
19module_la_SOURCES = \ 29module_la_SOURCES = $(CAIRO_X11_SOURCES)
20evas_engine.c \
21evas_x_main.c
22 30
23module_la_LIBADD = @EINA_LIBS@ @evas_engine_cairo_x11_libs@ $(top_builddir)/src/modules/engines/cairo_common/libevas_engine_cairo_common.la $(top_builddir)/src/lib/libevas.la 31module_la_LIBADD = @EINA_LIBS@ $(CAIRO_X11_SOURCES) $(top_builddir)/src/lib/libevas.la
24module_la_LDFLAGS = -module -avoid-version 32module_la_LDFLAGS = -module -avoid-version
25module_la_LIBTOOLFLAGS = --tag=disable-static 33module_la_LIBTOOLFLAGS = --tag=disable-static
26 34
27include_HEADERS = Evas_Engine_Cairo_X11.h 35else
28 36
37noinst_LTLIBRARIES = libevas_engine_cairo_x11.la
38
39libevas_engine_cairo_x11_la_SOURCES = $(CAIRO_X11_SOURCES)
40libevas_engine_cairo_x11_la_LIBADD = $(CAIRO_X11_LIBADD)
41
42endif
29endif 43endif
30 44
31EXTRA_DIST = evas_engine.h 45EXTRA_DIST = evas_engine.h
diff --git a/legacy/evas/src/modules/engines/cairo_x11/evas_engine.c b/legacy/evas/src/modules/engines/cairo_x11/evas_engine.c
index 57c3b9ff42..768cffb9e8 100644
--- a/legacy/evas/src/modules/engines/cairo_x11/evas_engine.c
+++ b/legacy/evas/src/modules/engines/cairo_x11/evas_engine.c
@@ -1478,7 +1478,7 @@ eng_font_hinting_can_hint(void *data, int hinting)
1478 re = (Render_Engine *)data; 1478 re = (Render_Engine *)data;
1479} 1479}
1480 1480
1481EAPI int 1481static int
1482module_open(Evas_Module *em) 1482module_open(Evas_Module *em)
1483{ 1483{
1484 if (!em) return 0; 1484 if (!em) return 0;
@@ -1486,16 +1486,24 @@ module_open(Evas_Module *em)
1486 return 1; 1486 return 1;
1487} 1487}
1488 1488
1489EAPI void 1489static void
1490module_close(void) 1490module_close(Evas_Module *em)
1491{ 1491{
1492
1493} 1492}
1494 1493
1495EAPI Evas_Module_Api evas_modapi = 1494static Evas_Module_Api evas_modapi =
1496{ 1495{
1497 EVAS_MODULE_API_VERSION, 1496 EVAS_MODULE_API_VERSION,
1498 EVAS_MODULE_TYPE_ENGINE, 1497 "cairo_x11",
1499 "cairo_x11", 1498 "none",
1500 "none" 1499 {
1500 module_open,
1501 module_close
1502 }
1501}; 1503};
1504
1505EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, cairo_x11);
1506
1507#ifndef EVAS_STATIC_BUILD_CAIRO_X11
1508EVAS_EINA_MODULE_DEFINE(engine, cairo_x11);
1509#endif
diff --git a/legacy/evas/src/modules/engines/direct3d/Makefile.am b/legacy/evas/src/modules/engines/direct3d/Makefile.am
index fda6fac1b9..26ec71f8e3 100644
--- a/legacy/evas/src/modules/engines/direct3d/Makefile.am
+++ b/legacy/evas/src/modules/engines/direct3d/Makefile.am
@@ -12,10 +12,7 @@ AM_CPPFLAGS = \
12 12
13if BUILD_ENGINE_DIRECT3D 13if BUILD_ENGINE_DIRECT3D
14 14
15pkgdir = $(libdir)/evas/modules/engines/direct3d/$(MODULE_ARCH) 15DIRECT3D_SOURCES = \
16
17pkg_LTLIBRARIES = module.la
18module_la_SOURCES = \
19evas_engine.c \ 16evas_engine.c \
20evas_direct3d_context.cpp \ 17evas_direct3d_context.cpp \
21evas_direct3d_device.cpp \ 18evas_direct3d_device.cpp \
@@ -30,13 +27,29 @@ evas_direct3d_scene.cpp \
30evas_direct3d_shader_pack.cpp \ 27evas_direct3d_shader_pack.cpp \
31evas_direct3d_vertex_buffer_cache.cpp 28evas_direct3d_vertex_buffer_cache.cpp
32 29
30DIRECT3D_LIBADD = @evas_engine_direct3d_libs@
31
32pkgdir = $(libdir)/evas/modules/engines/direct3d/$(MODULE_ARCH)
33
34include_HEADERS = Evas_Engine_Direct3D.h
35
36if !EVAS_STATIC_BUILD_DIRECT3D
37
38pkg_LTLIBRARIES = module.la
39module_la_SOURCES = $(DIRECT3D_SOURCES)
33module_la_CXXFLAGS = -fno-exceptions 40module_la_CXXFLAGS = -fno-exceptions
34module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ @evas_engine_direct3d_libs@ 41module_la_LIBADD = $(top_builddir)/src/lib/libevas.la $(DIRECT3D_LIBADD) @EINA_LIBS@
35module_la_LDFLAGS = -no-undefined -module -avoid-version 42module_la_LDFLAGS = -no-undefined -module -avoid-version
36module_la_LIBTOOLFLAGS = --tag=disable-static 43module_la_LIBTOOLFLAGS = --tag=disable-static
37 44
38include_HEADERS = Evas_Engine_Direct3D.h 45else
39 46
47noinst_LTLIBRARIES = libevas_engine_direct3d.la
48
49libevas_engine_direct3d_la_SOURCES = $(DIRECT3D_SOURCES)
50libevas_engine_direct3d_la_LIBADD = $(DIRECT3D_LIBADD)
51
52endif
40endif 53endif
41 54
42EXTRA_DIST = \ 55EXTRA_DIST = \
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_engine.c b/legacy/evas/src/modules/engines/direct3d/evas_engine.c
index 6ff9021582..736d3b7e96 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_engine.c
+++ b/legacy/evas/src/modules/engines/direct3d/evas_engine.c
@@ -527,7 +527,7 @@ eng_gradient2_radial_draw(void *data, void *context, void *surface, void *radial
527 527
528 528
529/* module advertising code */ 529/* module advertising code */
530EAPI int 530static int
531module_open(Evas_Module *em) 531module_open(Evas_Module *em)
532{ 532{
533 if (!em) return 0; 533 if (!em) return 0;
@@ -600,15 +600,24 @@ module_open(Evas_Module *em)
600 return 1; 600 return 1;
601} 601}
602 602
603EAPI void 603static void
604module_close(void) 604module_close(Evas_Module *em)
605{ 605{
606} 606}
607 607
608EAPI Evas_Module_Api evas_modapi = 608static Evas_Module_Api evas_modapi =
609{ 609{
610 EVAS_MODULE_API_VERSION, 610 EVAS_MODULE_API_VERSION,
611 EVAS_MODULE_TYPE_ENGINE, 611 "direct3d",
612 "direct3d", 612 "none",
613 "none" 613 {
614 module_open,
615 module_close
616 }
614}; 617};
618
619EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, direct3d);
620
621#ifndef EVAS_STATIC_BUILD_DIRECT3D
622EVAS_EINA_MODULE_DEFINE(engine, direct3d);
623#endif
diff --git a/legacy/evas/src/modules/engines/directfb/Makefile.am b/legacy/evas/src/modules/engines/directfb/Makefile.am
index a6bee077cb..c4b7a5e0c2 100644
--- a/legacy/evas/src/modules/engines/directfb/Makefile.am
+++ b/legacy/evas/src/modules/engines/directfb/Makefile.am
@@ -14,18 +14,31 @@ AM_CFLAGS = @WIN32_CFLAGS@
14 14
15if BUILD_ENGINE_DIRECTFB 15if BUILD_ENGINE_DIRECTFB
16 16
17DIRECTFB_SOURCES = evas_engine.c polygon.c
18DIRECTFB_LIBADD = @evas_engine_directfb_libs@
19
17pkgdir = $(libdir)/evas/modules/engines/directfb/$(MODULE_ARCH) 20pkgdir = $(libdir)/evas/modules/engines/directfb/$(MODULE_ARCH)
18 21
22include_HEADERS = Evas_Engine_DirectFB.h
23
24if !EVAS_STATIC_BUILD_DIRECTFB
25
19pkg_LTLIBRARIES = module.la 26pkg_LTLIBRARIES = module.la
20 27
21module_la_SOURCES = evas_engine.c polygon.c 28module_la_SOURCES = $(DIRECTFB_SOURCES)
22 29
23module_la_LIBADD = @EINA_LIBS@ @evas_engine_directfb_libs@ $(top_builddir)/src/lib/libevas.la 30module_la_LIBADD = @EINA_LIBS@ $(DIRECTFB_LIBADD) $(top_builddir)/src/lib/libevas.la
24module_la_LDFLAGS = -module -avoid-version 31module_la_LDFLAGS = -module -avoid-version
25module_la_LIBTOOLFLAGS = --tag=disable-static 32module_la_LIBTOOLFLAGS = --tag=disable-static
26 33
27include_HEADERS = Evas_Engine_DirectFB.h 34else
35
36noinst_LTLIBRARIES = libevas_engine_directfb.la
28 37
38libevas_engine_directfb_la_SOURCES = $(DIRECTFB_SOURCES)
39libevas_engine_directfb_la_LIBADD = $(DIRECTFB_LIBADD)
40
41endif
29endif 42endif
30 43
31EXTRA_DIST = evas_engine.h 44EXTRA_DIST = evas_engine.h
diff --git a/legacy/evas/src/modules/engines/directfb/evas_engine.c b/legacy/evas/src/modules/engines/directfb/evas_engine.c
index aff909bd10..6a41d78947 100644
--- a/legacy/evas/src/modules/engines/directfb/evas_engine.c
+++ b/legacy/evas/src/modules/engines/directfb/evas_engine.c
@@ -1611,7 +1611,7 @@ evas_engine_dfb_image_scale_hint_get(void *data __UNUSED__, void *image)
1611 return EVAS_IMAGE_SCALE_HINT_NONE; 1611 return EVAS_IMAGE_SCALE_HINT_NONE;
1612} 1612}
1613 1613
1614EAPI int 1614static int
1615module_open(Evas_Module *em) 1615module_open(Evas_Module *em)
1616{ 1616{
1617 if (!em) return 0; 1617 if (!em) return 0;
@@ -1666,15 +1666,24 @@ module_open(Evas_Module *em)
1666 return 1; 1666 return 1;
1667} 1667}
1668 1668
1669EAPI void 1669static void
1670module_close(void) 1670module_close(Evas_Module *em)
1671{ 1671{
1672} 1672}
1673 1673
1674EAPI Evas_Module_Api evas_modapi = 1674static Evas_Module_Api evas_modapi =
1675{ 1675{
1676 EVAS_MODULE_API_VERSION, 1676 EVAS_MODULE_API_VERSION,
1677 EVAS_MODULE_TYPE_ENGINE, 1677 "directfb",
1678 "directfb", 1678 "ProFUSION embedded systems",
1679 "ProFUSION embedded systems" 1679 {
1680 module_open,
1681 module_close
1682 }
1680}; 1683};
1684
1685EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, directfb);
1686
1687#ifndef EVAS_STATIC_BUILD_DIRECTFB
1688EVAS_EINA_MODULE_DEFINE(engine, directfb);
1689#endif
diff --git a/legacy/evas/src/modules/engines/fb/Makefile.am b/legacy/evas/src/modules/engines/fb/Makefile.am
index 327e96faaa..677977387d 100644
--- a/legacy/evas/src/modules/engines/fb/Makefile.am
+++ b/legacy/evas/src/modules/engines/fb/Makefile.am
@@ -12,20 +12,33 @@ AM_CPPFLAGS = \
12 12
13if BUILD_ENGINE_FB 13if BUILD_ENGINE_FB
14 14
15pkgdir = $(libdir)/evas/modules/engines/fb/$(MODULE_ARCH) 15FB_SOURCES = \
16
17pkg_LTLIBRARIES = module.la
18module_la_SOURCES = \
19evas_engine.c \ 16evas_engine.c \
20evas_fb_main.c \ 17evas_fb_main.c \
21evas_outbuf.c 18evas_outbuf.c
22 19
23module_la_LIBADD = @EINA_LIBS@ @evas_engine_fb_libs@ $(top_builddir)/src/lib/libevas.la 20FB_LIBADD = @evas_engine_fb_libs@
21
22pkgdir = $(libdir)/evas/modules/engines/fb/$(MODULE_ARCH)
23
24include_HEADERS = Evas_Engine_FB.h
25
26if !EVAS_STATIC_BUILD_FB
27
28pkg_LTLIBRARIES = module.la
29module_la_SOURCES = $(FB_SOURCES)
30module_la_LIBADD = @EINA_LIBS@ $(FB_LIBADD) $(top_builddir)/src/lib/libevas.la
24module_la_LDFLAGS = -module -avoid-version 31module_la_LDFLAGS = -module -avoid-version
25module_la_LIBTOOLFLAGS = --tag=disable-static 32module_la_LIBTOOLFLAGS = --tag=disable-static
26 33
27include_HEADERS = Evas_Engine_FB.h 34else
28 35
36noinst_LTLIBRARIES = libevas_engine_fb.la
37
38libevas_engine_fb_la_SOURCES = $(FB_SOURCES)
39libevas_engine_fb_la_LIBADD = $(FB_LIBADD)
40
41endif
29endif 42endif
30 43
31EXTRA_DIST = \ 44EXTRA_DIST = \
diff --git a/legacy/evas/src/modules/engines/fb/evas_engine.c b/legacy/evas/src/modules/engines/fb/evas_engine.c
index 3307611be5..58d684b4c2 100644
--- a/legacy/evas/src/modules/engines/fb/evas_engine.c
+++ b/legacy/evas/src/modules/engines/fb/evas_engine.c
@@ -248,7 +248,7 @@ eng_output_idle_flush(void *data)
248} 248}
249 249
250/* module advertising code */ 250/* module advertising code */
251EAPI int 251static int
252module_open(Evas_Module *em) 252module_open(Evas_Module *em)
253{ 253{
254 if (!em) return 0; 254 if (!em) return 0;
@@ -276,15 +276,24 @@ module_open(Evas_Module *em)
276 return 1; 276 return 1;
277} 277}
278 278
279EAPI void 279static void
280module_close(void) 280module_close(Evas_Module *em)
281{ 281{
282} 282}
283 283
284EAPI Evas_Module_Api evas_modapi = 284static Evas_Module_Api evas_modapi =
285{ 285{
286 EVAS_MODULE_API_VERSION, 286 EVAS_MODULE_API_VERSION,
287 EVAS_MODULE_TYPE_ENGINE, 287 "fb",
288 "fb", 288 "none",
289 "none" 289 {
290 module_open,
291 module_close
292 }
290}; 293};
294
295EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, fb);
296
297#ifndef EVAS_STATIC_BUILD_FB
298EVAS_EINA_MODULE_DEFINE(engine, fb);
299#endif
diff --git a/legacy/evas/src/modules/engines/gl_glew/Makefile.am b/legacy/evas/src/modules/engines/gl_glew/Makefile.am
index 1cf4585b6b..47461a4fc4 100644
--- a/legacy/evas/src/modules/engines/gl_glew/Makefile.am
+++ b/legacy/evas/src/modules/engines/gl_glew/Makefile.am
@@ -12,20 +12,33 @@ AM_CPPFLAGS = \
12 12
13if BUILD_ENGINE_GL_GLEW 13if BUILD_ENGINE_GL_GLEW
14 14
15GL_GLEW_SOURCES = \
16evas_engine.c \
17evas_glew_main.c
18
19GL_GLEW_LIBADD = @evas_engine_gl_glew_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la
20
15pkgdir = $(libdir)/evas/modules/engines/gl_glew/$(MODULE_ARCH) 21pkgdir = $(libdir)/evas/modules/engines/gl_glew/$(MODULE_ARCH)
16 22
17pkg_LTLIBRARIES = module.la 23include_HEADERS = Evas_Engine_GL_Glew.h
18 24
19module_la_SOURCES = \ 25if !EVAS_STATIC_BUILD_GL_GLEW
20evas_engine.c \ 26
21evas_glew_main.c 27pkg_LTLIBRARIES = module.la
22 28
23module_la_LIBADD = $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la $(top_builddir)/src/lib/libevas.la @evas_engine_gl_glew_libs@ 29module_la_SOURCES = $(GL_GLEW_SOURCES)
30module_la_LIBADD = $(GL_GLEW_LIBADD) $(top_builddir)/src/lib/libevas.la
24module_la_LDFLAGS = -no-undefined -module -avoid-version 31module_la_LDFLAGS = -no-undefined -module -avoid-version
25module_la_LIBTOOLFLAGS = --tag=disable-static 32module_la_LIBTOOLFLAGS = --tag=disable-static
26 33
27include_HEADERS = Evas_Engine_GL_Glew.h 34else
28 35
36noinst_LTLIBRARIES = libevas_engine_gl_glew.la
37
38libevas_engine_gl_glew_la_SOURCES = $(GL_GLEW_SOURCES)
39libevas_engine_gl_glew_la_LIBADD = $(GL_GLEW_LIBADD)
40
41endif
29endif 42endif
30 43
31EXTRA_DIST = evas_engine.h 44EXTRA_DIST = evas_engine.h
diff --git a/legacy/evas/src/modules/engines/gl_glew/evas_engine.c b/legacy/evas/src/modules/engines/gl_glew/evas_engine.c
index c2425766e9..6386e365a6 100644
--- a/legacy/evas/src/modules/engines/gl_glew/evas_engine.c
+++ b/legacy/evas/src/modules/engines/gl_glew/evas_engine.c
@@ -922,8 +922,7 @@ eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y
922 } 922 }
923} 923}
924 924
925 925static int
926EAPI int
927module_open(Evas_Module *em) 926module_open(Evas_Module *em)
928{ 927{
929 if (!em) return 0; 928 if (!em) return 0;
@@ -1004,16 +1003,24 @@ module_open(Evas_Module *em)
1004 return 1; 1003 return 1;
1005} 1004}
1006 1005
1007EAPI void 1006static void
1008module_close(void) 1007module_close(Evas_Module *em)
1009{ 1008{
1010
1011} 1009}
1012 1010
1013EAPI Evas_Module_Api evas_modapi = 1011static Evas_Module_Api evas_modapi =
1014{ 1012{
1015 EVAS_MODULE_API_VERSION, 1013 EVAS_MODULE_API_VERSION,
1016 EVAS_MODULE_TYPE_ENGINE,
1017 "gl_glew", 1014 "gl_glew",
1018 "none" 1015 "none",
1016 {
1017 module_open,
1018 module_close
1019 }
1019}; 1020};
1021
1022EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, gl_glew);
1023
1024#ifndef EVAS_STATIC_BUILD_GL_GLEW
1025EVAS_EINA_MODULE_DEFINE(engine, gl_glew);
1026#endif
diff --git a/legacy/evas/src/modules/engines/gl_x11/Makefile.am b/legacy/evas/src/modules/engines/gl_x11/Makefile.am
index d69f6bf183..01bf394284 100644
--- a/legacy/evas/src/modules/engines/gl_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/gl_x11/Makefile.am
@@ -12,20 +12,33 @@ AM_CPPFLAGS = \
12 12
13if BUILD_ENGINE_GL_X11 13if BUILD_ENGINE_GL_X11
14 14
15GL_X11_SOURCES = \
16evas_engine.c \
17evas_x_main.c
18
19GL_X11_LIBADD = @evas_engine_gl_x11_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la
20
15pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH) 21pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH)
16 22
17pkg_LTLIBRARIES = module.la 23include_HEADERS = Evas_Engine_GL_X11.h
18 24
19module_la_SOURCES = \ 25if !EVAS_STATIC_BUILD_GL_X11
20evas_engine.c \ 26
21evas_x_main.c 27pkg_LTLIBRARIES = module.la
22 28
23module_la_LIBADD = @EINA_LIBS@ @evas_engine_gl_x11_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la $(top_builddir)/src/lib/libevas.la 29module_la_SOURCES = $(GL_X11_SOURCES)
30module_la_LIBADD = @EINA_LIBS@ $(GL_X11_LIBADD) $(top_builddir)/src/lib/libevas.la
24module_la_LDFLAGS = -module -avoid-version 31module_la_LDFLAGS = -module -avoid-version
25module_la_LIBTOOLFLAGS = --tag=disable-static 32module_la_LIBTOOLFLAGS = --tag=disable-static
26 33
27include_HEADERS = Evas_Engine_GL_X11.h 34else
28 35
36noinst_LTLIBRARIES = libevas_engine_gl_x11.la
37
38libevas_engine_gl_x11_la_SOURCES = $(GL_X11_SOURCES)
39libevas_engine_gl_x11_la_LIBADD = $(GL_X11_LIBADD)
40
41endif
29endif 42endif
30 43
31EXTRA_DIST = evas_engine.h 44EXTRA_DIST = evas_engine.h
diff --git a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
index 8934e2d01e..8eb5576966 100644
--- a/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
+++ b/legacy/evas/src/modules/engines/gl_x11/evas_engine.c
@@ -1086,7 +1086,7 @@ eng_best_depth_get(Display *disp, int screen)
1086 return _evas_gl_x11_vi->depth; 1086 return _evas_gl_x11_vi->depth;
1087} 1087}
1088 1088
1089EAPI int 1089static int
1090module_open(Evas_Module *em) 1090module_open(Evas_Module *em)
1091{ 1091{
1092 if (!em) return 0; 1092 if (!em) return 0;
@@ -1189,16 +1189,24 @@ module_open(Evas_Module *em)
1189 return 1; 1189 return 1;
1190} 1190}
1191 1191
1192EAPI void 1192static void
1193module_close(void) 1193module_close(Evas_Module *em)
1194{ 1194{
1195
1196} 1195}
1197 1196
1198EAPI Evas_Module_Api evas_modapi = 1197static Evas_Module_Api evas_modapi =
1199{ 1198{
1200 EVAS_MODULE_API_VERSION, 1199 EVAS_MODULE_API_VERSION,
1201 EVAS_MODULE_TYPE_ENGINE, 1200 "gl_x11",
1202 "gl_x11", 1201 "none",
1203 "none" 1202 {
1203 module_open,
1204 module_close
1205 }
1204}; 1206};
1207
1208EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, gl_x11);
1209
1210#ifndef EVAS_STATIC_BUILD_GL_X11
1211EVAS_EINA_MODULE_DEFINE(engine, gl_x11);
1212#endif
diff --git a/legacy/evas/src/modules/engines/quartz/Makefile.am b/legacy/evas/src/modules/engines/quartz/Makefile.am
index fd5926039d..597e45498a 100644
--- a/legacy/evas/src/modules/engines/quartz/Makefile.am
+++ b/legacy/evas/src/modules/engines/quartz/Makefile.am
@@ -11,18 +11,30 @@ AM_CPPFLAGS = \
11 11
12if BUILD_ENGINE_QUARTZ 12if BUILD_ENGINE_QUARTZ
13 13
14QUARTZ_SOURCES = evas_engine.c
15QUARTZ_LIBADD = @evas_engine_quartz_libs@
16
14pkgdir = $(libdir)/evas/modules/engines/quartz/$(MODULE_ARCH) 17pkgdir = $(libdir)/evas/modules/engines/quartz/$(MODULE_ARCH)
15 18
16pkg_LTLIBRARIES = module.la 19include_HEADERS = Evas_Engine_Quartz.h
17 20
18module_la_SOURCES = evas_engine.c 21if !EVAS_STATIC_BUILD_QUARTZ
22
23pkg_LTLIBRARIES = module.la
19 24
20module_la_LIBADD = @EINA_LIBS@ @evas_engine_quartz_libs@ $(top_builddir)/src/lib/libevas.la 25module_la_SOURCES = $(QUARTZ_SOURCES)
26module_la_LIBADD = @EINA_LIBS@ $(QUARTZ_LIBADD) $(top_builddir)/src/lib/libevas.la
21module_la_LDFLAGS = -module -avoid-version 27module_la_LDFLAGS = -module -avoid-version
22module_la_LIBTOOLFLAGS = --tag=disable-static 28module_la_LIBTOOLFLAGS = --tag=disable-static
23 29
24include_HEADERS = Evas_Engine_Quartz.h 30else
31
32noinst_LTLIBRARIES = libevas_engine_quartz.la
25 33
34libevas_engine_quartz_la_SOURCES = $(QUARTZ_SOURCES)
35libevas_engine_quartz_la_LIBADD = $(QUARTZ_LIBADD)
36
37endif
26endif 38endif
27 39
28EXTRA_DIST = \ 40EXTRA_DIST = \
diff --git a/legacy/evas/src/modules/engines/quartz/evas_engine.c b/legacy/evas/src/modules/engines/quartz/evas_engine.c
index 4dc9d80d21..56377027f8 100644
--- a/legacy/evas/src/modules/engines/quartz/evas_engine.c
+++ b/legacy/evas/src/modules/engines/quartz/evas_engine.c
@@ -1412,7 +1412,7 @@ eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y
1412 1412
1413#pragma mark Module Function Export 1413#pragma mark Module Function Export
1414 1414
1415EAPI int 1415static int
1416module_open(Evas_Module *em) 1416module_open(Evas_Module *em)
1417{ 1417{
1418 if (!em) return 0; 1418 if (!em) return 0;
@@ -1511,16 +1511,25 @@ module_open(Evas_Module *em)
1511 return 1; 1511 return 1;
1512} 1512}
1513 1513
1514EAPI void 1514static void
1515module_close(void) 1515module_close(Evas_Module *em)
1516{ 1516{
1517 1517
1518} 1518}
1519 1519
1520EAPI Evas_Module_Api evas_modapi = 1520static Evas_Module_Api evas_modapi =
1521{ 1521{
1522 EVAS_MODULE_API_VERSION, 1522 EVAS_MODULE_API_VERSION,
1523 EVAS_MODULE_TYPE_ENGINE, 1523 "quartz",
1524 "quartz", 1524 "none",
1525 "none" 1525 {
1526 module_open,
1527 module_close
1528 }
1526}; 1529};
1530
1531EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, quartz);
1532
1533#ifndef EVAS_STATIC_BUILD_QUARTZ
1534EVAS_EINA_MODULE_DEFINE(engine, quartz);
1535#endif
diff --git a/legacy/evas/src/modules/engines/software_16/Makefile.am b/legacy/evas/src/modules/engines/software_16/Makefile.am
index 61dd4b6f8e..47eaf100ce 100644
--- a/legacy/evas/src/modules/engines/software_16/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16/Makefile.am
@@ -13,14 +13,26 @@ AM_CFLAGS = @WIN32_CFLAGS@
13 13
14if BUILD_ENGINE_SOFTWARE_16 14if BUILD_ENGINE_SOFTWARE_16
15 15
16SOFTWARE_16_SOURCES = evas_engine.c
17
16pkgdir = $(libdir)/evas/modules/engines/software_16/$(MODULE_ARCH) 18pkgdir = $(libdir)/evas/modules/engines/software_16/$(MODULE_ARCH)
17 19
18pkg_LTLIBRARIES = module.la 20if !EVAS_STATIC_BUILD_SOFTWARE_16
19module_la_SOURCES = \
20evas_engine.c
21 21
22pkg_LTLIBRARIES = module.la
23module_la_SOURCES = $(SOFTWARE_16_SOURCES)
22module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la 24module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la
23module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 25module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
24module_la_LIBTOOLFLAGS = --tag=disable-static 26module_la_LIBTOOLFLAGS = --tag=disable-static
25 27
28else
29
30noinst_LTLIBRARIES = libevas_engine_software_16.la
31
32libevas_engine_software_16_la_SOURCES = $(SOFTWARE_16_SOURCES)
33
34endif
26endif 35endif
36
37EXTRA_DIST = \
38evas_engine.c
diff --git a/legacy/evas/src/modules/engines/software_16/evas_engine.c b/legacy/evas/src/modules/engines/software_16/evas_engine.c
index 30e6758e26..19f1dd3b62 100644
--- a/legacy/evas/src/modules/engines/software_16/evas_engine.c
+++ b/legacy/evas/src/modules/engines/software_16/evas_engine.c
@@ -984,7 +984,7 @@ static Evas_Func func =
984 ***** 984 *****
985 */ 985 */
986 986
987EAPI int 987static int
988module_open(Evas_Module *em) 988module_open(Evas_Module *em)
989{ 989{
990 if (!em) return 0; 990 if (!em) return 0;
@@ -992,15 +992,24 @@ module_open(Evas_Module *em)
992 return 1; 992 return 1;
993} 993}
994 994
995EAPI void 995static void
996module_close(void) 996module_close(Evas_Module *em)
997{ 997{
998} 998}
999 999
1000EAPI Evas_Module_Api evas_modapi = 1000static Evas_Module_Api evas_modapi =
1001{ 1001{
1002 EVAS_MODULE_API_VERSION, 1002 EVAS_MODULE_API_VERSION,
1003 EVAS_MODULE_TYPE_ENGINE,
1004 "software_16", 1003 "software_16",
1005 "none" 1004 "none",
1005 {
1006 module_open,
1007 module_close
1008 }
1006}; 1009};
1010
1011EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_16);
1012
1013#ifndef EVAS_STATIC_BUILD_SOFTWARE_16
1014EVAS_EINA_MODULE_DEFINE(engine, software_16);
1015#endif
diff --git a/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am b/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am
index fa1f766917..f752ab7ea1 100644
--- a/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am
@@ -13,22 +13,35 @@ AM_CPPFLAGS = \
13 13
14if BUILD_ENGINE_SOFTWARE_16_DDRAW 14if BUILD_ENGINE_SOFTWARE_16_DDRAW
15 15
16pkgdir = $(libdir)/evas/modules/engines/software_16_ddraw/$(MODULE_ARCH) 16SOFTWARE_16_DDRAW_SOURCES = \
17
18pkg_LTLIBRARIES = module.la
19
20module_la_SOURCES = \
21evas_engine.c \ 17evas_engine.c \
22evas_ddraw_buffer.cpp \ 18evas_ddraw_buffer.cpp \
23evas_ddraw_main.cpp 19evas_ddraw_main.cpp
24 20
21SOFTWARE_16_DDRAW_LIBADD = @evas_engine_software_16_ddraw_libs@
22
23pkgdir = $(libdir)/evas/modules/engines/software_16_ddraw/$(MODULE_ARCH)
24
25include_HEADERS = Evas_Engine_Software_16_DDraw.h
26
27if !EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW
28
29pkg_LTLIBRARIES = module.la
30
31module_la_SOURCES = $(SOFTWARE_16_DDRAW_SOURCES)
25module_la_CXXFLAGS = -fno-rtti -fno-exceptions 32module_la_CXXFLAGS = -fno-rtti -fno-exceptions
26module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ @evas_engine_software_16_ddraw_libs@ 33module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ $(SOFTWARE_16_DDRAW_LIBADD)
27module_la_LDFLAGS = -no-undefined -module -avoid-version 34module_la_LDFLAGS = -no-undefined -module -avoid-version
28module_la_LIBTOOLFLAGS = --tag=disable-static 35module_la_LIBTOOLFLAGS = --tag=disable-static
29 36
30include_HEADERS = Evas_Engine_Software_16_DDraw.h 37else
38
39noinst_LTLIBRARIES = libevas_engine_software_16_ddraw.la
31 40
41libevas_engine_software_16_ddraw_la_SOURCES = $(SOFTWARE_16_DDRAW_SOURCES)
42libevas_engine_software_16_ddraw_la_LIBADD = $(SOFTWARE_16_DDRAW_LIBADD)
43
44endif
32endif 45endif
33 46
34EXTRA_DIST = evas_engine.h 47EXTRA_DIST = evas_engine.h
diff --git a/legacy/evas/src/modules/engines/software_16_ddraw/evas_engine.c b/legacy/evas/src/modules/engines/software_16_ddraw/evas_engine.c
index 048f46bc71..61776d13b1 100644
--- a/legacy/evas/src/modules/engines/software_16_ddraw/evas_engine.c
+++ b/legacy/evas/src/modules/engines/software_16_ddraw/evas_engine.c
@@ -564,7 +564,7 @@ eng_output_idle_flush(void *data)
564 564
565 565
566/* module advertising code */ 566/* module advertising code */
567EAPI int 567static int
568module_open(Evas_Module *em) 568module_open(Evas_Module *em)
569{ 569{
570 if (!em) return 0; 570 if (!em) return 0;
@@ -592,15 +592,24 @@ module_open(Evas_Module *em)
592 return 1; 592 return 1;
593} 593}
594 594
595EAPI void 595static void
596module_close(void) 596module_close(Evas_Module *em)
597{ 597{
598} 598}
599 599
600EAPI Evas_Module_Api evas_modapi = 600static Evas_Module_Api evas_modapi =
601{ 601{
602 EVAS_MODULE_API_VERSION, 602 EVAS_MODULE_API_VERSION,
603 EVAS_MODULE_TYPE_ENGINE, 603 "software_16_ddraw",
604 "software_16_ddraw", 604 "none",
605 "none" 605 {
606 module_open,
607 module_close
608 }
606}; 609};
610
611EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_16_ddraw);
612
613#ifndef EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW
614EVAS_EINA_MODULE_DEFINE(engine, software_16_ddraw);
615#endif
diff --git a/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am b/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am
index a00ce3c7cd..75ee7091f5 100644
--- a/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am
@@ -6,19 +6,31 @@ INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE
6 6
7if BUILD_ENGINE_SOFTWARE_SDL 7if BUILD_ENGINE_SOFTWARE_SDL
8 8
9SOFTWARE_SDL_SOURCES = \
10evas_engine.c \
11evas_engine.h
12
9pkgdir = $(libdir)/evas/modules/engines/software_16_sdl/$(MODULE_ARCH) 13pkgdir = $(libdir)/evas/modules/engines/software_16_sdl/$(MODULE_ARCH)
10 14
15include_HEADERS = Evas_Engine_SDL_16.h
16
17if !EVAS_STATIC_BUILD_SOFTWARE_SDL
18
11pkg_LTLIBRARIES = module.la 19pkg_LTLIBRARIES = module.la
12 20
13module_la_SOURCES = \ 21module_la_SOURCES = $(SOFTWARE_SDL_SOURCES)
14evas_engine.c \
15evas_engine.h
16 22
17module_la_LIBADD = @EINA_LIBS@ @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la 23module_la_LIBADD = @EINA_LIBS@ @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la
18module_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs 24module_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
19 25
20include_HEADERS = Evas_Engine_SDL_16.h 26else
21 27
28noinst_LTLIBRARIES = libevas_engine_software_16_sdl.la
29
30libevas_engine_software_16_sdl_la_SOURCES = $(SOFTWARE_SDL_SOURCES)
31libevas_engine_software_16_sdl_la_LIBADD = @SDL_LIBS@
32
33endif
22endif 34endif
23 35
24EXTRA_DIST = \ 36EXTRA_DIST = \
diff --git a/legacy/evas/src/modules/engines/software_16_sdl/evas_engine.c b/legacy/evas/src/modules/engines/software_16_sdl/evas_engine.c
index 334172005b..1f57ce5808 100644
--- a/legacy/evas/src/modules/engines/software_16_sdl/evas_engine.c
+++ b/legacy/evas/src/modules/engines/software_16_sdl/evas_engine.c
@@ -1019,7 +1019,7 @@ evas_engine_sdl16_image_stride_get(void *data __UNUSED__, void *image, int *stri
1019} 1019}
1020 1020
1021/* module advertising code */ 1021/* module advertising code */
1022EAPI int 1022static int
1023module_open(Evas_Module *em) 1023module_open(Evas_Module *em)
1024{ 1024{
1025 if (!em) return 0; 1025 if (!em) return 0;
@@ -1079,19 +1079,28 @@ module_open(Evas_Module *em)
1079 return 1; 1079 return 1;
1080} 1080}
1081 1081
1082EAPI void 1082static void
1083module_close(void) 1083module_close(Evas_Module *em)
1084{ 1084{
1085} 1085}
1086 1086
1087EAPI Evas_Module_Api evas_modapi = 1087static Evas_Module_Api evas_modapi =
1088{ 1088{
1089 EVAS_MODULE_API_VERSION, 1089 EVAS_MODULE_API_VERSION,
1090 EVAS_MODULE_TYPE_ENGINE, 1090 "software_16_sdl",
1091 "software_16_sdl", 1091 "none",
1092 "none" 1092 {
1093 module_open,
1094 module_close
1095 }
1093}; 1096};
1094 1097
1098EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_16_sdl);
1099
1100#ifndef EVAS_STATIC_BUILD_SOFTWARE_SDL
1101EVAS_EINA_MODULE_DEFINE(engine, software_16_sdl);
1102#endif
1103
1095static Engine_Image_Entry* 1104static Engine_Image_Entry*
1096_sdl16_image_alloc(void) 1105_sdl16_image_alloc(void)
1097{ 1106{
diff --git a/legacy/evas/src/modules/engines/software_16_wince/Makefile.am b/legacy/evas/src/modules/engines/software_16_wince/Makefile.am
index 69de313b3e..4557d734ec 100644
--- a/legacy/evas/src/modules/engines/software_16_wince/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16_wince/Makefile.am
@@ -16,11 +16,7 @@ AM_CPPFLAGS = \
16 16
17if BUILD_ENGINE_SOFTWARE_16_WINCE 17if BUILD_ENGINE_SOFTWARE_16_WINCE
18 18
19pkgdir = $(libdir)/evas/modules/engines/software_16_wince/$(MODULE_ARCH) 19SOFTWARE_16_WINCE_SOURCE = \
20
21pkg_LTLIBRARIES = module.la
22
23module_la_SOURCES = \
24evas_engine.c \ 20evas_engine.c \
25evas_wince_ddraw_buffer.cpp \ 21evas_wince_ddraw_buffer.cpp \
26evas_wince_fb_buffer.c \ 22evas_wince_fb_buffer.c \
@@ -28,14 +24,31 @@ evas_wince_gapi_buffer.c \
28evas_wince_gdi_buffer.c \ 24evas_wince_gdi_buffer.c \
29evas_wince_gapi.rc 25evas_wince_gapi.rc
30 26
27SOFTWARE_16_WINCE_LIBADD = @evas_engine_software_16_wince_libs@
28
29pkgdir = $(libdir)/evas/modules/engines/software_16_wince/$(MODULE_ARCH)
30
31include_HEADERS = Evas_Engine_Software_16_WinCE.h
32
33if !EVAS_STATIC_BUILD_SOFTWARE_16_WINCE
34
35pkg_LTLIBRARIES = module.la
36
37module_la_SOURCES = $(SOFTWARE_16_WINCE_SOURCE)
31module_la_CFLAGS = @WIN32_CFLAGS@ 38module_la_CFLAGS = @WIN32_CFLAGS@
32module_la_CXXFLAGS = -fno-rtti -fno-exceptions 39module_la_CXXFLAGS = -fno-rtti -fno-exceptions
33module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la @evas_engine_software_16_wince_libs@ 40module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la $(SOFTWARE_16_WINCE_LIBADD)
34module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 41module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
35module_la_LIBTOOLFLAGS = --tag=disable-static 42module_la_LIBTOOLFLAGS = --tag=disable-static
36 43
37include_HEADERS = Evas_Engine_Software_16_WinCE.h 44else
45
46noinst_LTLIBRARIES = libevas_engine_software_16_wince.la
38 47
48libevas_engine_software_16_wince_la_SOURCES = $(SOFTWARE_16_WINCE_SOURCE)
49libevas_engine_software_16_wince_la_LIBADD = $(SOFTWARE_16_WINCE_LIBADD)
50
51endif
39endif 52endif
40 53
41EXTRA_DIST = evas_engine.h 54EXTRA_DIST = evas_engine.h
diff --git a/legacy/evas/src/modules/engines/software_16_wince/evas_engine.c b/legacy/evas/src/modules/engines/software_16_wince/evas_engine.c
index c8412b293a..1bfc4d6f1e 100644
--- a/legacy/evas/src/modules/engines/software_16_wince/evas_engine.c
+++ b/legacy/evas/src/modules/engines/software_16_wince/evas_engine.c
@@ -705,7 +705,7 @@ eng_output_idle_flush(void *data)
705 705
706 706
707/* module advertising code */ 707/* module advertising code */
708EAPI int 708static int
709module_open(Evas_Module *em) 709module_open(Evas_Module *em)
710{ 710{
711 if (!em) return 0; 711 if (!em) return 0;
@@ -733,15 +733,24 @@ module_open(Evas_Module *em)
733 return 1; 733 return 1;
734} 734}
735 735
736EAPI void 736static void
737module_close(void) 737module_close(Evas_Module *em)
738{ 738{
739} 739}
740 740
741EAPI Evas_Module_Api evas_modapi = 741static Evas_Module_Api evas_modapi =
742{ 742{
743 EVAS_MODULE_API_VERSION, 743 EVAS_MODULE_API_VERSION,
744 EVAS_MODULE_TYPE_ENGINE,
745 "software_16_wince_fb", 744 "software_16_wince_fb",
746 "none" 745 "none",
746 {
747 module_open,
748 module_close
749 }
747}; 750};
751
752EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_16_wince_fb);
753
754#ifndef EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FB
755EVAS_EINA_MODULE_DEFINE(engine, software_16_wince_fb);
756#endif
diff --git a/legacy/evas/src/modules/engines/software_16_x11/Makefile.am b/legacy/evas/src/modules/engines/software_16_x11/Makefile.am
index 8a44b65766..45106ed34b 100644
--- a/legacy/evas/src/modules/engines/software_16_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16_x11/Makefile.am
@@ -13,20 +13,33 @@ AM_CPPFLAGS = \
13 13
14if BUILD_ENGINE_SOFTWARE_16_X11 14if BUILD_ENGINE_SOFTWARE_16_X11
15 15
16SOFTWARE_16_X11_SOURCES = \
17evas_engine.c \
18evas_x_buffer.c
19
20SOFTWARE_16_X11_LIBADD = @evas_engine_software_16_x11_libs@
21
16pkgdir = $(libdir)/evas/modules/engines/software_16_x11/$(MODULE_ARCH) 22pkgdir = $(libdir)/evas/modules/engines/software_16_x11/$(MODULE_ARCH)
17 23
18pkg_LTLIBRARIES = module.la 24include_HEADERS = Evas_Engine_Software_16_X11.h
19 25
20module_la_SOURCES = \ 26if !EVAS_STATIC_BUILD_SOFTWARE_16_X11
21evas_engine.c \ 27
22evas_x_buffer.c 28pkg_LTLIBRARIES = module.la
23 29
24module_la_LIBADD = @EINA_LIBS@ @evas_engine_software_16_x11_libs@ $(top_builddir)/src/lib/libevas.la 30module_la_SOURCES = $(SOFTWARE_16_X11_SOURCES)
31module_la_LIBADD = @EINA_LIBS@ $(SOFTWARE_16_X11_LIBADD) $(top_builddir)/src/lib/libevas.la
25module_la_LDFLAGS = -no-undefined -module -avoid-version 32module_la_LDFLAGS = -no-undefined -module -avoid-version
26module_la_LIBTOOLFLAGS = --tag=disable-static 33module_la_LIBTOOLFLAGS = --tag=disable-static
27 34
28include_HEADERS = Evas_Engine_Software_16_X11.h 35else
29 36
37noinst_LTLIBRARIES = libevas_engine_software_16_x11.la
38
39libevas_engine_software_16_x11_la_SOURCES = $(SOFTWARE_16_X11_SOURCES)
40libevas_engine_software_16_x11_la_LIBADD = $(SOFTWARE_16_X11_LIBADD)
41
42endif
30endif 43endif
31 44
32EXTRA_DIST = evas_engine.h 45EXTRA_DIST = evas_engine.h
diff --git a/legacy/evas/src/modules/engines/software_16_x11/evas_engine.c b/legacy/evas/src/modules/engines/software_16_x11/evas_engine.c
index 720e948b65..d4906e97ad 100644
--- a/legacy/evas/src/modules/engines/software_16_x11/evas_engine.c
+++ b/legacy/evas/src/modules/engines/software_16_x11/evas_engine.c
@@ -544,7 +544,7 @@ eng_output_idle_flush(void *data)
544 544
545 545
546/* module advertising code */ 546/* module advertising code */
547EAPI int 547static int
548module_open(Evas_Module *em) 548module_open(Evas_Module *em)
549{ 549{
550 if (!em) return 0; 550 if (!em) return 0;
@@ -572,15 +572,25 @@ module_open(Evas_Module *em)
572 return 1; 572 return 1;
573} 573}
574 574
575EAPI void 575static void
576module_close(void) 576module_close(Evas_Module *em)
577{ 577{
578} 578}
579 579
580EAPI Evas_Module_Api evas_modapi = 580static Evas_Module_Api evas_modapi =
581{ 581{
582 EVAS_MODULE_API_VERSION, 582 EVAS_MODULE_API_VERSION,
583 EVAS_MODULE_TYPE_ENGINE, 583 "software_16_x11",
584 "software_16_x11", 584 "none",
585 "none" 585 {
586 module_open,
587 module_close
588 }
586}; 589};
590
591EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_16_x11);
592
593#ifndef EVAS_STATIC_BUILD_SOFTWARE_16_X11
594EVAS_EINA_MODULE_DEFINE(engine, software_16_x11);
595#endif
596
diff --git a/legacy/evas/src/modules/engines/software_ddraw/Makefile.am b/legacy/evas/src/modules/engines/software_ddraw/Makefile.am
index 72cbe7ae82..751f50aa55 100644
--- a/legacy/evas/src/modules/engines/software_ddraw/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_ddraw/Makefile.am
@@ -12,22 +12,35 @@ AM_CPPFLAGS = \
12 12
13if BUILD_ENGINE_SOFTWARE_DDRAW 13if BUILD_ENGINE_SOFTWARE_DDRAW
14 14
15pkgdir = $(libdir)/evas/modules/engines/software_ddraw/$(MODULE_ARCH) 15SOFTWARE_DDRAW_SOURCES = \
16
17pkg_LTLIBRARIES = module.la
18module_la_SOURCES = \
19evas_engine.c \ 16evas_engine.c \
20evas_outbuf.c \ 17evas_outbuf.c \
21evas_ddraw_buffer.c \ 18evas_ddraw_buffer.c \
22evas_ddraw_main.cpp 19evas_ddraw_main.cpp
23 20
21SOFTWARE_DDRAW_LIBADD = @evas_engine_software_ddraw_libs@
22
23pkgdir = $(libdir)/evas/modules/engines/software_ddraw/$(MODULE_ARCH)
24
25include_HEADERS = Evas_Engine_Software_DDraw.h
26
27if !EVAS_STATIC_BUILD_SOFTWARE_DDRAW
28
29pkg_LTLIBRARIES = module.la
30module_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES)
24module_la_CXXFLAGS = -fno-rtti -fno-exceptions 31module_la_CXXFLAGS = -fno-rtti -fno-exceptions
25module_la_LIBADD = @EINA_LIBS@ @evas_engine_software_ddraw_libs@ $(top_builddir)/src/lib/libevas.la 32module_la_LIBADD = @EINA_LIBS@ $(SOFTWARE_DDRAW_LIBADD) $(top_builddir)/src/lib/libevas.la
26module_la_LDFLAGS = -no-undefined -module -avoid-version 33module_la_LDFLAGS = -no-undefined -module -avoid-version
27module_la_LIBTOOLFLAGS = --tag=disable-static 34module_la_LIBTOOLFLAGS = --tag=disable-static
28 35
29include_HEADERS = Evas_Engine_Software_DDraw.h 36else
30 37
38noinst_LTLIBRARIES = libevas_engine_software_ddraw.la
39
40libevas_engine_software_ddraw_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES)
41libevas_engine_software_ddraw_la_LIBADD = $(SOFTWARE_DDRAW_LIBADD)
42
43endif
31endif 44endif
32 45
33EXTRA_DIST = evas_engine.h 46EXTRA_DIST = evas_engine.h
diff --git a/legacy/evas/src/modules/engines/software_ddraw/evas_engine.c b/legacy/evas/src/modules/engines/software_ddraw/evas_engine.c
index 61abfb1ee7..0cf7a2f4b8 100644
--- a/legacy/evas/src/modules/engines/software_ddraw/evas_engine.c
+++ b/legacy/evas/src/modules/engines/software_ddraw/evas_engine.c
@@ -311,7 +311,7 @@ eng_output_idle_flush(void *data)
311 311
312 312
313/* module advertising code */ 313/* module advertising code */
314EAPI int 314static int
315module_open(Evas_Module *em) 315module_open(Evas_Module *em)
316{ 316{
317 if (!em) return 0; 317 if (!em) return 0;
@@ -339,15 +339,24 @@ module_open(Evas_Module *em)
339 return 1; 339 return 1;
340} 340}
341 341
342EAPI void 342static void
343module_close(void) 343module_close(Evas_Module *em)
344{ 344{
345} 345}
346 346
347EAPI Evas_Module_Api evas_modapi = 347static Evas_Module_Api evas_modapi =
348{ 348{
349 EVAS_MODULE_API_VERSION, 349 EVAS_MODULE_API_VERSION,
350 EVAS_MODULE_TYPE_ENGINE,
351 "software_ddraw", 350 "software_ddraw",
352 "none" 351 "none",
352 {
353 module_open,
354 module_close
355 }
353}; 356};
357
358EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_ddraw);
359
360#ifndef EVAS_STATIC_BUILD_SOFTWARE_DDRAW
361EVAS_EINA_MODULE_DEFINE(engine, software_ddraw);
362#endif
diff --git a/legacy/evas/src/modules/engines/software_gdi/Makefile.am b/legacy/evas/src/modules/engines/software_gdi/Makefile.am
index daf5f85ff6..943d4184b1 100644
--- a/legacy/evas/src/modules/engines/software_gdi/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_gdi/Makefile.am
@@ -12,21 +12,34 @@ AM_CPPFLAGS = \
12 12
13if BUILD_ENGINE_SOFTWARE_GDI 13if BUILD_ENGINE_SOFTWARE_GDI
14 14
15pkgdir = $(libdir)/evas/modules/engines/software_gdi/$(MODULE_ARCH) 15SOFTWARE_GDI_SOURCES = \
16
17pkg_LTLIBRARIES = module.la
18module_la_SOURCES = \
19evas_engine.c \ 16evas_engine.c \
20evas_outbuf.c \ 17evas_outbuf.c \
21evas_gdi_buffer.c \ 18evas_gdi_buffer.c \
22evas_gdi_main.c 19evas_gdi_main.c
23 20
24module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ @evas_engine_software_gdi_libs@ 21SOFTWARE_GDI_LIBADD = @evas_engine_software_gdi_libs@
22
23pkgdir = $(libdir)/evas/modules/engines/software_gdi/$(MODULE_ARCH)
24
25include_HEADERS = Evas_Engine_Software_Gdi.h
26
27if !EVAS_STATIC_BUILD_SOFTWARE_GDI
28
29pkg_LTLIBRARIES = module.la
30module_la_SOURCES = $(SOFTWARE_GDI_SOURCES)
31module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ $(SOFTWARE_GDI_LIBADD)
25module_la_LDFLAGS = -no-undefined -module -avoid-version 32module_la_LDFLAGS = -no-undefined -module -avoid-version
26module_la_LIBTOOLFLAGS = --tag=disable-static 33module_la_LIBTOOLFLAGS = --tag=disable-static
27 34
28include_HEADERS = Evas_Engine_Software_Gdi.h 35else
29 36
37noinst_LTLIBRARIES = libevas_engine_software_gdi.la
38
39libevas_engine_software_gdi_la_SOURCES = $(SOFTWARE_GDI_SOURCES)
40libevas_engine_software_gdi_la_LIBADD = $(SOFTWARE_GDI_LIBADD)
41
42endif
30endif 43endif
31 44
32EXTRA_DIST = evas_engine.h 45EXTRA_DIST = evas_engine.h
diff --git a/legacy/evas/src/modules/engines/software_gdi/evas_engine.c b/legacy/evas/src/modules/engines/software_gdi/evas_engine.c
index 5b73cadc26..4c9eb2d9a1 100644
--- a/legacy/evas/src/modules/engines/software_gdi/evas_engine.c
+++ b/legacy/evas/src/modules/engines/software_gdi/evas_engine.c
@@ -321,7 +321,7 @@ eng_output_idle_flush(void *data)
321 321
322 322
323/* module advertising code */ 323/* module advertising code */
324EAPI int 324static int
325module_open(Evas_Module *em) 325module_open(Evas_Module *em)
326{ 326{
327 if (!em) return 0; 327 if (!em) return 0;
@@ -349,15 +349,24 @@ module_open(Evas_Module *em)
349 return 1; 349 return 1;
350} 350}
351 351
352EAPI void 352static void
353module_close(void) 353module_close(Evas_Module *em)
354{ 354{
355} 355}
356 356
357EAPI Evas_Module_Api evas_modapi = 357static Evas_Module_Api evas_modapi =
358{ 358{
359 EVAS_MODULE_API_VERSION, 359 EVAS_MODULE_API_VERSION,
360 EVAS_MODULE_TYPE_ENGINE,
361 "software_gdi", 360 "software_gdi",
362 "none" 361 "none",
362 {
363 module_open,
364 module_close
365 }
363}; 366};
367
368EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_gdi);
369
370#ifndef EVAS_STATIC_BUILD_SOFTWARE_GDI
371EVAS_EINA_MODULE_DEFINE(engine, software_gdi);
372#endif
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
diff --git a/legacy/evas/src/modules/engines/software_qtopia/Makefile.am b/legacy/evas/src/modules/engines/software_qtopia/Makefile.am
index 8998b12fac..a8ac9000d4 100644
--- a/legacy/evas/src/modules/engines/software_qtopia/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_qtopia/Makefile.am
@@ -14,20 +14,33 @@ AM_CXXFLAGS = $(CFLAGS) -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -DNO_DEBUG
14 14
15if BUILD_ENGINE_SOFTWARE_QTOPIA 15if BUILD_ENGINE_SOFTWARE_QTOPIA
16 16
17pkgdir = $(libdir)/evas/modules/engines/software_qtopia/$(MODULE_ARCH) 17SOFTWARE_QTOPIA_SOURCES = \
18
19pkg_LTLIBRARIES = module.la
20module_la_SOURCES = \
21evas_engine.c \ 18evas_engine.c \
22evas_outbuf.c \ 19evas_outbuf.c \
23evas_qt_main.cpp 20evas_qt_main.cpp
24 21
25module_la_LIBADD = @EINA_LIBS@ @evas_engine_software_qtopia_libs@ $(top_builddir)/src/lib/libevas.la 22SOFTWARE_QTOPIA_LIBADD = @evas_engine_software_qtopia_libs@
23
24pkgdir = $(libdir)/evas/modules/engines/software_qtopia/$(MODULE_ARCH)
25
26include_HEADERS = Evas_Engine_Software_Qtopia.h
27
28if !EVAS_STATIC_BUILD_SOFTWARE_QTOPIA
29
30pkg_LTLIBRARIES = module.la
31module_la_SOURCES = $(SOFTWARE_QTOPIA_SOURCES)
32module_la_LIBADD = @EINA_LIBS@ $(SOFTWARE_QTOPIA_LIBADD) $(top_builddir)/src/lib/libevas.la
26module_la_LDFLAGS = -module -avoid-version 33module_la_LDFLAGS = -module -avoid-version
27module_la_LIBTOOLFLAGS = --tag=disable-static 34module_la_LIBTOOLFLAGS = --tag=disable-static
28 35
29include_HEADERS = Evas_Engine_Software_Qtopia.h 36else
30 37
38noinst_LTLIBRARIES = libevas_engine_software_qtopia.la
39
40libevas_engine_software_qtopia_la_SOURCES = $(SOFTWARE_QTOPIA_SOURCES)
41libevas_engine_software_qtopia_la_LIBADD = $(SOFTWARE_QTOPIA_LIBADD)
42
43endif
31endif 44endif
32 45
33EXTRA_DIST = evas_engine.h 46EXTRA_DIST = evas_engine.h
diff --git a/legacy/evas/src/modules/engines/software_qtopia/evas_engine.c b/legacy/evas/src/modules/engines/software_qtopia/evas_engine.c
index be3259081f..83eadfbeba 100644
--- a/legacy/evas/src/modules/engines/software_qtopia/evas_engine.c
+++ b/legacy/evas/src/modules/engines/software_qtopia/evas_engine.c
@@ -263,7 +263,7 @@ eng_output_idle_flush(void *data)
263} 263}
264 264
265/* module advertising code */ 265/* module advertising code */
266EAPI int 266static int
267module_open(Evas_Module *em) 267module_open(Evas_Module *em)
268{ 268{
269 if (!em) return 0; 269 if (!em) return 0;
@@ -291,15 +291,24 @@ module_open(Evas_Module *em)
291 return 1; 291 return 1;
292} 292}
293 293
294EAPI void 294static void
295module_close(void) 295module_close(Evas_Module *em)
296{ 296{
297} 297}
298 298
299EAPI Evas_Module_Api evas_modapi = 299static Evas_Module_Api evas_modapi =
300{ 300{
301 EVAS_MODULE_API_VERSION, 301 EVAS_MODULE_API_VERSION,
302 EVAS_MODULE_TYPE_ENGINE, 302 "software_qtopia",
303 "software_qtopia", 303 "none",
304 "none" 304 {
305 module_open,
306 module_close
307 }
305}; 308};
309
310EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_qtopia);
311
312#ifndef EVAS_STATIC_BUILD_SOFTWARE_QTOPIA
313EVAS_EINA_MODULE_DEFINE(engine, software_qtopia);
314#endif
diff --git a/legacy/evas/src/modules/engines/software_sdl/Makefile.am b/legacy/evas/src/modules/engines/software_sdl/Makefile.am
index 1962683a44..19814727b0 100644
--- a/legacy/evas/src/modules/engines/software_sdl/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_sdl/Makefile.am
@@ -14,18 +14,30 @@ AM_CFLAGS = @WIN32_CFLAGS@
14 14
15if BUILD_ENGINE_SOFTWARE_SDL 15if BUILD_ENGINE_SOFTWARE_SDL
16 16
17SOFTWARE_SDL_SOURCES = evas_engine.c
18SOFTWARE_SDL_LIBADD = @evas_engine_software_sdl_libs@
19
17pkgdir = $(libdir)/evas/modules/engines/software_sdl/$(MODULE_ARCH) 20pkgdir = $(libdir)/evas/modules/engines/software_sdl/$(MODULE_ARCH)
18 21
19pkg_LTLIBRARIES = module.la 22include_HEADERS = Evas_Engine_SDL.h
20 23
21module_la_SOURCES = evas_engine.c 24if !EVAS_STATIC_BUILD_SOFTWARE_SDL
25
26pkg_LTLIBRARIES = module.la
22 27
23module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ @evas_engine_software_sdl_libs@ 28module_la_SOURCES = $(SOFTWARE_SDL_SOURCES)
29module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ $(SOFTWARE_SDL_LIBADD)
24module_la_LDFLAGS = -no-undefined -module -avoid-version 30module_la_LDFLAGS = -no-undefined -module -avoid-version
25module_la_LIBTOOLFLAGS = --tag=disable-static 31module_la_LIBTOOLFLAGS = --tag=disable-static
26 32
27include_HEADERS = Evas_Engine_SDL.h 33else
34
35noinst_LTLIBRARIES = libevas_engine_software_sdl.la
28 36
37libevas_engine_software_sdl_la_SOURCES = $(SOFTWARE_SDL_SOURCES)
38libevas_engine_software_sdl_la_LIBADD = $(SOFTWARE_SDL_LIBADD)
39
40endif
29endif 41endif
30 42
31EXTRA_DIST = evas_engine.h 43EXTRA_DIST = evas_engine.h
diff --git a/legacy/evas/src/modules/engines/software_sdl/evas_engine.c b/legacy/evas/src/modules/engines/software_sdl/evas_engine.c
index 13c7f5dcea..5d542ba40c 100644
--- a/legacy/evas/src/modules/engines/software_sdl/evas_engine.c
+++ b/legacy/evas/src/modules/engines/software_sdl/evas_engine.c
@@ -817,7 +817,7 @@ evas_engine_sdl_gradient_draw(void *data __UNUSED__, void *context, void *surfac
817 SDL_UnlockSurface(eim->surface); 817 SDL_UnlockSurface(eim->surface);
818} 818}
819 819
820EAPI int module_open(Evas_Module *em) 820static int module_open(Evas_Module *em)
821{ 821{
822 if (!em) return 0; 822 if (!em) return 0;
823 /* get whatever engine module we inherit from */ 823 /* get whatever engine module we inherit from */
@@ -876,19 +876,28 @@ EAPI int module_open(Evas_Module *em)
876 return 1; 876 return 1;
877} 877}
878 878
879EAPI void module_close(void) 879static void module_close(Evas_Module *em)
880{ 880{
881 881
882} 882}
883 883
884EAPI Evas_Module_Api evas_modapi = 884static Evas_Module_Api evas_modapi =
885{ 885{
886 EVAS_MODULE_API_VERSION, 886 EVAS_MODULE_API_VERSION,
887 EVAS_MODULE_TYPE_ENGINE, 887 "software_sdl",
888 "software_sdl", 888 "none",
889 "none" 889 {
890 module_open,
891 module_close
892 }
890}; 893};
891 894
895EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_sdl);
896
897#ifndef EVAS_STATIC_BUILD_SOFTWARE_SDL
898EVAS_EINA_MODULE_DEFINE(engine, software_sdl);
899#endif
900
892/* Private routines. */ 901/* Private routines. */
893 902
894static void* 903static void*
diff --git a/legacy/evas/src/modules/engines/software_x11/Makefile.am b/legacy/evas/src/modules/engines/software_x11/Makefile.am
index 76a93c4d22..3730b4286b 100644
--- a/legacy/evas/src/modules/engines/software_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_x11/Makefile.am
@@ -13,20 +13,18 @@ AM_CPPFLAGS = \
13 13
14if BUILD_ENGINE_SOFTWARE_X11 14if BUILD_ENGINE_SOFTWARE_X11
15 15
16pkgdir = $(libdir)/evas/modules/engines/software_x11/$(MODULE_ARCH) 16SOFTWARE_X11_SOURCES = \
17
18pkg_LTLIBRARIES = module.la
19
20module_la_SOURCES = \
21evas_engine.c \ 17evas_engine.c \
22evas_xlib_outbuf.c \ 18evas_xlib_outbuf.c \
23evas_xlib_buffer.c \ 19evas_xlib_buffer.c \
24evas_xlib_color.c \ 20evas_xlib_color.c \
25evas_xlib_main.c 21evas_xlib_main.c
26 22
23SOFTWARE_X11_LIBADD = @evas_engine_software_x11_libs@ @evas_engine_software_xcb_libs@
24
27if BUILD_ENGINE_SOFTWARE_XCB 25if BUILD_ENGINE_SOFTWARE_XCB
28 26
29module_la_SOURCES += \ 27SOFTWARE_X11_SOURCES +=\
30evas_xcb_outbuf.c \ 28evas_xcb_outbuf.c \
31evas_xcb_buffer.c \ 29evas_xcb_buffer.c \
32evas_xcb_color.c \ 30evas_xcb_color.c \
@@ -34,12 +32,27 @@ evas_xcb_main.c
34 32
35endif 33endif
36 34
37module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ @evas_engine_software_x11_libs@ @evas_engine_software_xcb_libs@ 35pkgdir = $(libdir)/evas/modules/engines/software_x11/$(MODULE_ARCH)
36
37include_HEADERS = Evas_Engine_Software_X11.h
38
39if !EVAS_STATIC_BUILD_SOFTWARE_X11
40
41pkg_LTLIBRARIES = module.la
42
43module_la_SOURCES = $(SOFTWARE_X11_SOURCES)
44module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ $(SOFTWARE_X11_LIBADD)
38module_la_LDFLAGS = -no-undefined -module -avoid-version 45module_la_LDFLAGS = -no-undefined -module -avoid-version
39module_la_LIBTOOLFLAGS = --tag=disable-static 46module_la_LIBTOOLFLAGS = --tag=disable-static
40 47
41include_HEADERS = Evas_Engine_Software_X11.h 48else
49
50noinst_LTLIBRARIES = libevas_engine_software_x11.la
42 51
52libevas_engine_software_x11_la_SOURCES = $(SOFTWARE_X11_SOURCES)
53libevas_engine_software_x11_la_LIBADD = $(SOFTWARE_X11_LIBADD)
54
55endif
43endif 56endif
44 57
45EXTRA_DIST = \ 58EXTRA_DIST = \
diff --git a/legacy/evas/src/modules/engines/software_x11/evas_engine.c b/legacy/evas/src/modules/engines/software_x11/evas_engine.c
index f480b68ffc..03d5d66934 100644
--- a/legacy/evas/src/modules/engines/software_x11/evas_engine.c
+++ b/legacy/evas/src/modules/engines/software_x11/evas_engine.c
@@ -613,7 +613,7 @@ eng_output_idle_flush(void *data)
613 613
614 614
615/* module advertising code */ 615/* module advertising code */
616EAPI int 616static int
617module_open(Evas_Module *em) 617module_open(Evas_Module *em)
618{ 618{
619 if (!em) return 0; 619 if (!em) return 0;
@@ -641,15 +641,25 @@ module_open(Evas_Module *em)
641 return 1; 641 return 1;
642} 642}
643 643
644EAPI void 644static void
645module_close(void) 645module_close(Evas_Module *em)
646{ 646{
647} 647}
648 648
649EAPI Evas_Module_Api evas_modapi = 649static Evas_Module_Api evas_modapi =
650{ 650{
651 EVAS_MODULE_API_VERSION, 651 EVAS_MODULE_API_VERSION,
652 EVAS_MODULE_TYPE_ENGINE, 652 "software_x11",
653 "software_x11", 653 "none",
654 "none" 654 {
655 module_open,
656 module_close
657 }
655}; 658};
659
660EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, software_x11);
661
662#ifndef EVAS_STATIC_BUILD_SOFTWARE_X11
663EVAS_EINA_MODULE_DEFINE(engine, software_x11);
664#endif
665
diff --git a/legacy/evas/src/modules/engines/xrender_x11/Makefile.am b/legacy/evas/src/modules/engines/xrender_x11/Makefile.am
index 907401858a..83d1a7739e 100644
--- a/legacy/evas/src/modules/engines/xrender_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/xrender_x11/Makefile.am
@@ -13,11 +13,7 @@ AM_CPPFLAGS = \
13 13
14if BUILD_ENGINE_XRENDER_X11 14if BUILD_ENGINE_XRENDER_X11
15 15
16pkgdir = $(libdir)/evas/modules/engines/xrender_x11/$(MODULE_ARCH) 16XRENDER_X11_SOURCES = \
17
18pkg_LTLIBRARIES = module.la
19
20module_la_SOURCES = \
21evas_engine_xlib_font.c \ 17evas_engine_xlib_font.c \
22evas_engine_xlib_gradient.c \ 18evas_engine_xlib_gradient.c \
23evas_engine_xlib_image.c \ 19evas_engine_xlib_image.c \
@@ -26,20 +22,39 @@ evas_engine_xlib_ximage.c \
26evas_engine.c 22evas_engine.c
27 23
28if BUILD_ENGINE_XRENDER_XCB 24if BUILD_ENGINE_XRENDER_XCB
29module_la_SOURCES += \ 25
26XRENDER_X11_SOURCES += \
30evas_engine_xcb_font.c \ 27evas_engine_xcb_font.c \
31evas_engine_xcb_gradient.c \ 28evas_engine_xcb_gradient.c \
32evas_engine_xcb_image.c \ 29evas_engine_xcb_image.c \
33evas_engine_xcb_render.c \ 30evas_engine_xcb_render.c \
34evas_engine_xcb_ximage.c 31evas_engine_xcb_ximage.c
32
35endif 33endif
36 34
37module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ @evas_engine_xrender_xcb_libs@ @evas_engine_xrender_x11_libs@ 35XRENDER_X11_LIBADD = @evas_engine_xrender_xcb_libs@ @evas_engine_xrender_x11_libs@
36
37pkgdir = $(libdir)/evas/modules/engines/xrender_x11/$(MODULE_ARCH)
38
39include_HEADERS = Evas_Engine_XRender_X11.h
40
41if !EVAS_STATIC_BUILD_XRENDER_X11
42
43pkg_LTLIBRARIES = module.la
44
45module_la_SOURCES = $(XRENDER_X11_SOURCES)
46module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ $(XRENDER_X11_LIBADD)
38module_la_LDFLAGS = -no-undefined -module -avoid-version 47module_la_LDFLAGS = -no-undefined -module -avoid-version
39module_la_LIBTOOLFLAGS = --tag=disable-static 48module_la_LIBTOOLFLAGS = --tag=disable-static
40 49
41include_HEADERS = Evas_Engine_XRender_X11.h 50else
51
52noinst_LTLIBRARIES = libevas_engine_xrender_x11.la
42 53
54libevas_engine_xrender_x11_la_SOURCES = $(XRENDER_X11_SOURCES)
55libevas_engine_xrender_x11_la_LIBADD = $(XRENDER_X11_LIBADD)
56
57endif
43endif 58endif
44 59
45EXTRA_DIST = evas_engine.h 60EXTRA_DIST = evas_engine.h
diff --git a/legacy/evas/src/modules/engines/xrender_x11/evas_engine.c b/legacy/evas/src/modules/engines/xrender_x11/evas_engine.c
index 167368581a..2d17ff3ac0 100644
--- a/legacy/evas/src/modules/engines/xrender_x11/evas_engine.c
+++ b/legacy/evas/src/modules/engines/xrender_x11/evas_engine.c
@@ -1398,12 +1398,13 @@ eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y
1398} 1398}
1399 1399
1400/* module advertising code */ 1400/* module advertising code */
1401EAPI int 1401static int
1402module_open(Evas_Module *em) 1402module_open(Evas_Module *em)
1403{ 1403{
1404 if (!em) return 0; 1404 if (!em) return 0;
1405 /* get whatever engine module we inherit from */ 1405 /* get whatever engine module we inherit from */
1406 if (!_evas_module_engine_inherit(&pfunc, "software_generic")) return 0; 1406 if (!_evas_module_engine_inherit(&pfunc, "software_generic")) return 0;
1407
1407 /* store it for later use */ 1408 /* store it for later use */
1408 func = pfunc; 1409 func = pfunc;
1409 /* now to override methods */ 1410 /* now to override methods */
@@ -1500,15 +1501,24 @@ module_open(Evas_Module *em)
1500 return 1; 1501 return 1;
1501} 1502}
1502 1503
1503EAPI void 1504static void
1504module_close(void) 1505module_close(Evas_Module *em)
1505{ 1506{
1506} 1507}
1507 1508
1508EAPI Evas_Module_Api evas_modapi = 1509static Evas_Module_Api evas_modapi =
1509{ 1510{
1510 EVAS_MODULE_API_VERSION, 1511 EVAS_MODULE_API_VERSION,
1511 EVAS_MODULE_TYPE_ENGINE, 1512 "xrender_x11",
1512 "xrender_x11", 1513 "none",
1513 "none" 1514 {
1515 module_open,
1516 module_close
1517 }
1514}; 1518};
1519
1520EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_ENGINE, engine, xrender_x11);
1521
1522#ifndef EVAS_STATIC_BUILD_XRENDER_X11
1523EVAS_EINA_MODULE_DEFINE(engine, xrender_x11);
1524#endif