summaryrefslogtreecommitdiff
path: root/src/Makefile_Evas.am
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-12-03 15:10:18 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-12-03 18:42:50 +0900
commit4bcea3eada67332b61e175adabbcbe6dd07563f8 (patch)
treecafd9cb5ea57d927109c47c38304e6d44b894ff7 /src/Makefile_Evas.am
parent52ec3d2d7ecb7cdcf3310fba8cff5ed7d2accdbf (diff)
Ector: Move cairo surface back to ector
The original plan was to have two different surfaces for GL and SW, but this is probably not going to happen anytime soon. So, move the implementation back to lib/ector. This avoid a file duplication.
Diffstat (limited to 'src/Makefile_Evas.am')
-rw-r--r--src/Makefile_Evas.am16
1 files changed, 1 insertions, 15 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 2f04c3c7c6..8f234af829 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -555,19 +555,10 @@ lib/evas/filters/blur/blur_box_rgba_i386.c \
555lib/evas/filters/blur/blur_box_rgba_sse3.c \ 555lib/evas/filters/blur/blur_box_rgba_sse3.c \
556lib/evas/filters/blur/blur_box_rgba_neon.c 556lib/evas/filters/blur/blur_box_rgba_neon.c
557 557
558### Vector surface helper
559
560EXTRA_DIST += \
561modules/evas/engines/software_generic/ector_cairo_software_surface.eo \
562modules/evas/engines/gl_generic/ector_cairo_software_surface.eo
563
564### Engines 558### Engines
565 559
566if EVAS_STATIC_BUILD_SOFTWARE_GENERIC 560if EVAS_STATIC_BUILD_SOFTWARE_GENERIC
567BUILT_SOURCES += \ 561lib_evas_libevas_la_SOURCES += modules/evas/engines/software_generic/evas_engine.c modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h
568modules/evas/engines/software_generic/ector_cairo_software_surface.eo.c \
569modules/evas/engines/software_generic/ector_cairo_software_surface.eo.h
570lib_evas_libevas_la_SOURCES += modules/evas/engines/software_generic/evas_engine.c modules/evas/engines/software_generic/ector_cairo_software_surface.c modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h
571lib_evas_libevas_la_LIBADD += 562lib_evas_libevas_la_LIBADD +=
572else 563else
573enginesoftwaregenericpkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH) 564enginesoftwaregenericpkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH)
@@ -656,10 +647,6 @@ endif
656endif 647endif
657 648
658if BUILD_ENGINE_GL_COMMON 649if BUILD_ENGINE_GL_COMMON
659BUILT_SOURCES += \
660modules/evas/engines/gl_generic/ector_cairo_software_surface.eo.c \
661modules/evas/engines/gl_generic/ector_cairo_software_surface.eo.h
662
663GL_COMMON_SOURCES = \ 650GL_COMMON_SOURCES = \
664modules/evas/engines/gl_common/evas_gl_private.h \ 651modules/evas/engines/gl_common/evas_gl_private.h \
665modules/evas/engines/gl_common/evas_gl_common.h \ 652modules/evas/engines/gl_common/evas_gl_common.h \
@@ -740,7 +727,6 @@ modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x: modules/evas/engi
740 727
741GL_GENERIC_SOURCES = \ 728GL_GENERIC_SOURCES = \
742modules/evas/engines/gl_generic/evas_engine.c \ 729modules/evas/engines/gl_generic/evas_engine.c \
743modules/evas/engines/gl_generic/ector_cairo_software_surface.c \
744modules/evas/engines/gl_generic/Evas_Engine_GL_Generic.h 730modules/evas/engines/gl_generic/Evas_Engine_GL_Generic.h
745 731
746if EVAS_STATIC_BUILD_GL_COMMON 732if EVAS_STATIC_BUILD_GL_COMMON