From 52ec3d2d7ecb7cdcf3310fba8cff5ed7d2accdbf Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Thu, 3 Dec 2015 15:04:26 +0900 Subject: [PATCH] Ector: Rename C files to match their EO counterparts --- src/Makefile_Ector.am | 10 +++++----- src/Makefile_Evas.am | 4 ++-- .../{ector_renderer_base.c => ector_renderer_generic_base.c} | 0 ...r_renderer_gradient.c => ector_renderer_generic_gradient.c} | 0 ...dient_linear.c => ector_renderer_generic_gradient_linear.c} | 0 ...dient_radial.c => ector_renderer_generic_gradient_radial.c} | 0 .../{ector_renderer_shape.c => ector_renderer_generic_shape.c} | 0 .../ector_cairo_software_surface.c} | 0 .../ector_cairo_software_surface.c} | 0 9 files changed, 7 insertions(+), 7 deletions(-) rename src/lib/ector/{ector_renderer_base.c => ector_renderer_generic_base.c} (100%) rename src/lib/ector/{ector_renderer_gradient.c => ector_renderer_generic_gradient.c} (100%) rename src/lib/ector/{ector_renderer_gradient_linear.c => ector_renderer_generic_gradient_linear.c} (100%) rename src/lib/ector/{ector_renderer_gradient_radial.c => ector_renderer_generic_gradient_radial.c} (100%) rename src/lib/ector/{ector_renderer_shape.c => ector_renderer_generic_shape.c} (100%) rename src/modules/evas/engines/{software_generic/ector_surface.c => gl_generic/ector_cairo_software_surface.c} (100%) rename src/modules/evas/engines/{gl_generic/ector_surface.c => software_generic/ector_cairo_software_surface.c} (100%) diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am index 404dbb2..0f50260 100644 --- a/src/Makefile_Ector.am +++ b/src/Makefile_Ector.am @@ -69,12 +69,12 @@ lib/ector/software/Ector_Software.h lib_ector_libector_la_SOURCES = \ lib/ector/ector_main.c \ lib/ector/ector_generic_buffer.c \ -lib/ector/ector_renderer_shape.c \ -lib/ector/ector_renderer_base.c \ +lib/ector/ector_renderer_generic_shape.c \ +lib/ector/ector_renderer_generic_base.c \ lib/ector/ector_renderer_generic_buffer.c \ -lib/ector/ector_renderer_gradient.c \ -lib/ector/ector_renderer_gradient_radial.c \ -lib/ector/ector_renderer_gradient_linear.c +lib/ector/ector_renderer_generic_gradient.c \ +lib/ector/ector_renderer_generic_gradient_radial.c \ +lib/ector/ector_renderer_generic_gradient_linear.c installed_ectorgenericheadersdir = $(includedir)/ector-@VMAJ@/generic nodist_installed_ectorgenericheaders_DATA = $(ector_eolian_generic_h) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 0db38f6..2f04c3c 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -567,7 +567,7 @@ if EVAS_STATIC_BUILD_SOFTWARE_GENERIC BUILT_SOURCES += \ modules/evas/engines/software_generic/ector_cairo_software_surface.eo.c \ modules/evas/engines/software_generic/ector_cairo_software_surface.eo.h -lib_evas_libevas_la_SOURCES += modules/evas/engines/software_generic/evas_engine.c modules/evas/engines/software_generic/ector_surface.c modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h +lib_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 lib_evas_libevas_la_LIBADD += else enginesoftwaregenericpkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH) @@ -740,7 +740,7 @@ modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x: modules/evas/engi GL_GENERIC_SOURCES = \ modules/evas/engines/gl_generic/evas_engine.c \ -modules/evas/engines/gl_generic/ector_surface.c \ +modules/evas/engines/gl_generic/ector_cairo_software_surface.c \ modules/evas/engines/gl_generic/Evas_Engine_GL_Generic.h if EVAS_STATIC_BUILD_GL_COMMON diff --git a/src/lib/ector/ector_renderer_base.c b/src/lib/ector/ector_renderer_generic_base.c similarity index 100% rename from src/lib/ector/ector_renderer_base.c rename to src/lib/ector/ector_renderer_generic_base.c diff --git a/src/lib/ector/ector_renderer_gradient.c b/src/lib/ector/ector_renderer_generic_gradient.c similarity index 100% rename from src/lib/ector/ector_renderer_gradient.c rename to src/lib/ector/ector_renderer_generic_gradient.c diff --git a/src/lib/ector/ector_renderer_gradient_linear.c b/src/lib/ector/ector_renderer_generic_gradient_linear.c similarity index 100% rename from src/lib/ector/ector_renderer_gradient_linear.c rename to src/lib/ector/ector_renderer_generic_gradient_linear.c diff --git a/src/lib/ector/ector_renderer_gradient_radial.c b/src/lib/ector/ector_renderer_generic_gradient_radial.c similarity index 100% rename from src/lib/ector/ector_renderer_gradient_radial.c rename to src/lib/ector/ector_renderer_generic_gradient_radial.c diff --git a/src/lib/ector/ector_renderer_shape.c b/src/lib/ector/ector_renderer_generic_shape.c similarity index 100% rename from src/lib/ector/ector_renderer_shape.c rename to src/lib/ector/ector_renderer_generic_shape.c diff --git a/src/modules/evas/engines/software_generic/ector_surface.c b/src/modules/evas/engines/gl_generic/ector_cairo_software_surface.c similarity index 100% rename from src/modules/evas/engines/software_generic/ector_surface.c rename to src/modules/evas/engines/gl_generic/ector_cairo_software_surface.c diff --git a/src/modules/evas/engines/gl_generic/ector_surface.c b/src/modules/evas/engines/software_generic/ector_cairo_software_surface.c similarity index 100% rename from src/modules/evas/engines/gl_generic/ector_surface.c rename to src/modules/evas/engines/software_generic/ector_cairo_software_surface.c -- 2.7.4