From 043055fc8eb3d7db11856f4d142f5e0e3262b3a6 Mon Sep 17 00:00:00 2001 From: Bogdan Devichev Date: Wed, 26 Nov 2014 18:50:43 +0200 Subject: [PATCH] evas: preparation of places for model_saver_loader separated from image_saver_loader. --- spec/efl.spec.in | 8 +- src/Makefile_Evas.am | 452 +++++++++--------- src/lib/evas/file/evas_module.c | 4 +- .../bmp/evas_image_load_bmp.c | 0 .../dds/evas_image_load_dds.c | 0 .../{loaders => image_loaders}/dds/s3tc.h | 0 .../dds/s3tc_decoder.c | 0 .../eet/evas_image_load_eet.c | 0 .../generic/evas_image_load_generic.c | 0 .../gif/evas_image_load_gif.c | 0 .../ico/evas_image_load_ico.c | 0 .../jp2k/evas_image_load_jp2k.c | 0 .../jpeg/evas_image_load_jpeg.c | 0 .../pmaps/evas_image_load_pmaps.c | 0 .../png/evas_image_load_png.c | 0 .../psd/evas_image_load_psd.c | 0 .../tga/evas_image_load_tga.c | 0 .../tgv/evas_image_load_tgv.c | 0 .../tiff/evas_image_load_tiff.c | 0 .../wbmp/evas_image_load_wbmp.c | 0 .../webp/evas_image_load_webp.c | 0 .../xpm/evas_image_load_xpm.c | 0 .../eet/evas_image_save_eet.c | 0 .../jpeg/evas_image_save_jpeg.c | 0 .../png/evas_image_save_png.c | 0 .../tgv/evas_image_save_tgv.c | 0 .../tiff/evas_image_save_tiff.c | 0 .../webp/evas_image_save_webp.c | 0 28 files changed, 232 insertions(+), 232 deletions(-) rename src/modules/evas/{loaders => image_loaders}/bmp/evas_image_load_bmp.c (100%) rename src/modules/evas/{loaders => image_loaders}/dds/evas_image_load_dds.c (100%) rename src/modules/evas/{loaders => image_loaders}/dds/s3tc.h (100%) rename src/modules/evas/{loaders => image_loaders}/dds/s3tc_decoder.c (100%) rename src/modules/evas/{loaders => image_loaders}/eet/evas_image_load_eet.c (100%) rename src/modules/evas/{loaders => image_loaders}/generic/evas_image_load_generic.c (100%) rename src/modules/evas/{loaders => image_loaders}/gif/evas_image_load_gif.c (100%) rename src/modules/evas/{loaders => image_loaders}/ico/evas_image_load_ico.c (100%) rename src/modules/evas/{loaders => image_loaders}/jp2k/evas_image_load_jp2k.c (100%) rename src/modules/evas/{loaders => image_loaders}/jpeg/evas_image_load_jpeg.c (100%) rename src/modules/evas/{loaders => image_loaders}/pmaps/evas_image_load_pmaps.c (100%) rename src/modules/evas/{loaders => image_loaders}/png/evas_image_load_png.c (100%) rename src/modules/evas/{loaders => image_loaders}/psd/evas_image_load_psd.c (100%) rename src/modules/evas/{loaders => image_loaders}/tga/evas_image_load_tga.c (100%) rename src/modules/evas/{loaders => image_loaders}/tgv/evas_image_load_tgv.c (100%) rename src/modules/evas/{loaders => image_loaders}/tiff/evas_image_load_tiff.c (100%) rename src/modules/evas/{loaders => image_loaders}/wbmp/evas_image_load_wbmp.c (100%) rename src/modules/evas/{loaders => image_loaders}/webp/evas_image_load_webp.c (100%) rename src/modules/evas/{loaders => image_loaders}/xpm/evas_image_load_xpm.c (100%) rename src/modules/evas/{savers => image_savers}/eet/evas_image_save_eet.c (100%) rename src/modules/evas/{savers => image_savers}/jpeg/evas_image_save_jpeg.c (100%) rename src/modules/evas/{savers => image_savers}/png/evas_image_save_png.c (100%) rename src/modules/evas/{savers => image_savers}/tgv/evas_image_save_tgv.c (100%) rename src/modules/evas/{savers => image_savers}/tiff/evas_image_save_tiff.c (100%) rename src/modules/evas/{savers => image_savers}/webp/evas_image_save_webp.c (100%) diff --git a/spec/efl.spec.in b/spec/efl.spec.in index 9c087a8dc5..1bd474b4f2 100644 --- a/spec/efl.spec.in +++ b/spec/efl.spec.in @@ -97,8 +97,8 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so.* %{_libdir}/evas/cserve2/loaders/*/linux-gnu-*/*.so %{_libdir}/evas/modules/engines/*/linux-gnu-*/*.so -%{_libdir}/evas/modules/loaders/*/linux-gnu-*/*.so -%{_libdir}/evas/modules/savers/*/linux-gnu-*/*.so +%{_libdir}/evas/modules/image_loaders/*/linux-gnu-*/*.so +%{_libdir}/evas/modules/image_savers/*/linux-gnu-*/*.so %{_libdir}/ecore/*/*.so %{_libdir}/ecore_evas/*/*/*/*.so %{_libexecdir}/* @@ -115,8 +115,8 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT %{_libdir}/ecore_evas/*/*/*/*.la %{_libdir}/evas/cserve2/loaders/*/linux-gnu-*/*.la %{_libdir}/evas/modules/engines/*/linux-gnu-*/*.la -%{_libdir}/evas/modules/loaders/*/linux-gnu-*/*.la -%{_libdir}/evas/modules/savers/*/linux-gnu-*/*.la +%{_libdir}/evas/modules/image_loaders/*/linux-gnu-*/*.la +%{_libdir}/evas/modules/image_savers/*/linux-gnu-*/*.la %{_datadir}/embryo/ %{_datadir}/evas/ diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index a625ec67e8..b40ce7d9b4 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -1240,503 +1240,503 @@ bin_evas_dummy_slave_LDADD = \ endif -### Loaders and savers +### loaders and savers if BUILD_LOADER_BMP if EVAS_STATIC_BUILD_BMP -lib_evas_libevas_la_SOURCES += modules/evas/loaders/bmp/evas_image_load_bmp.c +lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/bmp/evas_image_load_bmp.c lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_bmp_cflags@ lib_evas_libevas_la_LIBADD += @evas_image_loader_bmp_libs@ if EVAS_CSERVE2 -bin_evas_evas_cserve2_slave_SOURCES += modules/evas/loaders/bmp/evas_image_load_bmp.c +bin_evas_evas_cserve2_slave_SOURCES += modules/evas/image_loaders/bmp/evas_image_load_bmp.c bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_bmp_cflags@ bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_bmp_libs@ endif else -loaderbmppkgdir = $(libdir)/evas/modules/loaders/bmp/$(MODULE_ARCH) -loaderbmppkg_LTLIBRARIES = modules/evas/loaders/bmp/module.la -modules_evas_loaders_bmp_module_la_SOURCES = modules/evas/loaders/bmp/evas_image_load_bmp.c -modules_evas_loaders_bmp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +loaderbmppkgdir = $(libdir)/evas/modules/image_loaders/bmp/$(MODULE_ARCH) +loaderbmppkg_LTLIBRARIES = modules/evas/image_loaders/bmp/module.la +modules_evas_image_loaders_bmp_module_la_SOURCES = modules/evas/image_loaders/bmp/evas_image_load_bmp.c +modules_evas_image_loaders_bmp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ @EVAS_CFLAGS@ \ @evas_image_loader_bmp_cflags@ -modules_evas_loaders_bmp_module_la_LIBADD = \ +modules_evas_image_loaders_bmp_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_loader_bmp_libs@ -modules_evas_loaders_bmp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_loaders_bmp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static +modules_evas_image_loaders_bmp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_loaders_bmp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif if BUILD_LOADER_DDS if EVAS_STATIC_BUILD_DDS lib_evas_libevas_la_SOURCES += \ -modules/evas/loaders/dds/evas_image_load_dds.c \ -modules/evas/loaders/dds/s3tc_decoder.c \ -modules/evas/loaders/dds/s3tc.h +modules/evas/image_loaders/dds/evas_image_load_dds.c \ +modules/evas/image_loaders/dds/s3tc_decoder.c \ +modules/evas/image_loaders/dds/s3tc.h lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_dds_cflags@ lib_evas_libevas_la_LIBADD += @evas_image_loader_dds_libs@ if EVAS_CSERVE2 bin_evas_evas_cserve2_slave_SOURCES += \ -modules/evas/loaders/dds/evas_image_load_dds.c \ -modules/evas/loaders/dds/s3tc_decoder.c \ -modules/evas/loaders/dds/s3tc.h +modules/evas/image_loaders/dds/evas_image_load_dds.c \ +modules/evas/image_loaders/dds/s3tc_decoder.c \ +modules/evas/image_loaders/dds/s3tc.h bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_dds_cflags@ bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_dds_libs@ endif else -loaderddspkgdir = $(libdir)/evas/modules/loaders/dds/$(MODULE_ARCH) -loaderddspkg_LTLIBRARIES = modules/evas/loaders/dds/module.la -modules_evas_loaders_dds_module_la_SOURCES = \ -modules/evas/loaders/dds/evas_image_load_dds.c \ -modules/evas/loaders/dds/s3tc_decoder.c \ -modules/evas/loaders/dds/s3tc.h -modules_evas_loaders_dds_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +loaderddspkgdir = $(libdir)/evas/modules/image_loaders/dds/$(MODULE_ARCH) +loaderddspkg_LTLIBRARIES = modules/evas/image_loaders/dds/module.la +modules_evas_image_loaders_dds_module_la_SOURCES = \ +modules/evas/image_loaders/dds/evas_image_load_dds.c \ +modules/evas/image_loaders/dds/s3tc_decoder.c \ +modules/evas/image_loaders/dds/s3tc.h +modules_evas_image_loaders_dds_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ @EVAS_CFLAGS@ \ @evas_image_loader_dds_cflags@ -modules_evas_loaders_dds_module_la_LIBADD = \ +modules_evas_image_loaders_dds_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_loader_dds_libs@ -modules_evas_loaders_dds_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_loaders_dds_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_loaders_dds_module_la_LIBTOOLFLAGS = --tag=disable-static +modules_evas_image_loaders_dds_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_loaders_dds_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_loaders_dds_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif if BUILD_LOADER_EET if EVAS_STATIC_BUILD_EET -lib_evas_libevas_la_SOURCES += modules/evas/loaders/eet/evas_image_load_eet.c modules/evas/savers/eet/evas_image_save_eet.c +lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/eet/evas_image_load_eet.c modules/evas/image_savers/eet/evas_image_save_eet.c lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_eet_cflags@ lib_evas_libevas_la_LIBADD += @evas_image_loader_eet_libs@ if EVAS_CSERVE2 -bin_evas_evas_cserve2_slave_SOURCES += modules/evas/loaders/eet/evas_image_load_eet.c +bin_evas_evas_cserve2_slave_SOURCES += modules/evas/image_loaders/eet/evas_image_load_eet.c bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_eet_cflags@ bin_evas_evas_cserve2_slave_DEPENDENCIES += @USE_EET_INTERNAL_LIBS@ bin_evas_evas_cserve2_slave_LDADD += @USE_EET_LIBS@ @evas_image_loader_eet_libs@ endif else -loadereetpkgdir = $(libdir)/evas/modules/loaders/eet/$(MODULE_ARCH) -loadereetpkg_LTLIBRARIES = modules/evas/loaders/eet/module.la -modules_evas_loaders_eet_module_la_SOURCES = modules/evas/loaders/eet/evas_image_load_eet.c -modules_evas_loaders_eet_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +loadereetpkgdir = $(libdir)/evas/modules/image_loaders/eet/$(MODULE_ARCH) +loadereetpkg_LTLIBRARIES = modules/evas/image_loaders/eet/module.la +modules_evas_image_loaders_eet_module_la_SOURCES = modules/evas/image_loaders/eet/evas_image_load_eet.c +modules_evas_image_loaders_eet_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ @EVAS_CFLAGS@ \ @evas_image_loader_eet_cflags@ -modules_evas_loaders_eet_module_la_LIBADD = \ +modules_evas_image_loaders_eet_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_loader_eet_libs@ -modules_evas_loaders_eet_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_loaders_eet_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_loaders_eet_module_la_LIBTOOLFLAGS = --tag=disable-static +modules_evas_image_loaders_eet_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_loaders_eet_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_loaders_eet_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif if BUILD_LOADER_GENERIC if EVAS_STATIC_BUILD_GENERIC -lib_evas_libevas_la_SOURCES += modules/evas/loaders/generic/evas_image_load_generic.c +lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/generic/evas_image_load_generic.c lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_generic_cflags@ lib_evas_libevas_la_LIBADD += @evas_image_loader_generic_libs@ if EVAS_CSERVE2 -bin_evas_evas_cserve2_slave_SOURCES += modules/evas/loaders/generic/evas_image_load_generic.c +bin_evas_evas_cserve2_slave_SOURCES += modules/evas/image_loaders/generic/evas_image_load_generic.c bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_generic_cflags@ bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_generic_libs@ endif else -loadergenericpkgdir = $(libdir)/evas/modules/loaders/generic/$(MODULE_ARCH) -loadergenericpkg_LTLIBRARIES = modules/evas/loaders/generic/module.la -modules_evas_loaders_generic_module_la_SOURCES = modules/evas/loaders/generic/evas_image_load_generic.c -modules_evas_loaders_generic_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +loadergenericpkgdir = $(libdir)/evas/modules/image_loaders/generic/$(MODULE_ARCH) +loadergenericpkg_LTLIBRARIES = modules/evas/image_loaders/generic/module.la +modules_evas_image_loaders_generic_module_la_SOURCES = modules/evas/image_loaders/generic/evas_image_load_generic.c +modules_evas_image_loaders_generic_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ @EVAS_CFLAGS@ \ @evas_image_loader_generic_cflags@ -modules_evas_loaders_generic_module_la_LIBADD = \ +modules_evas_image_loaders_generic_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_loader_generic_libs@ -modules_evas_loaders_generic_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_loaders_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_loaders_generic_module_la_LIBTOOLFLAGS = --tag=disable-static +modules_evas_image_loaders_generic_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_loaders_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_loaders_generic_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif if BUILD_LOADER_GIF if EVAS_STATIC_BUILD_GIF -lib_evas_libevas_la_SOURCES += modules/evas/loaders/gif/evas_image_load_gif.c +lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/gif/evas_image_load_gif.c lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_gif_cflags@ lib_evas_libevas_la_LIBADD += @evas_image_loader_gif_libs@ if EVAS_CSERVE2 -bin_evas_evas_cserve2_slave_SOURCES += modules/evas/loaders/gif/evas_image_load_gif.c +bin_evas_evas_cserve2_slave_SOURCES += modules/evas/image_loaders/gif/evas_image_load_gif.c bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_gif_cflags@ bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_gif_libs@ endif else -loadergifpkgdir = $(libdir)/evas/modules/loaders/gif/$(MODULE_ARCH) -loadergifpkg_LTLIBRARIES = modules/evas/loaders/gif/module.la -modules_evas_loaders_gif_module_la_SOURCES = modules/evas/loaders/gif/evas_image_load_gif.c -modules_evas_loaders_gif_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +loadergifpkgdir = $(libdir)/evas/modules/image_loaders/gif/$(MODULE_ARCH) +loadergifpkg_LTLIBRARIES = modules/evas/image_loaders/gif/module.la +modules_evas_image_loaders_gif_module_la_SOURCES = modules/evas/image_loaders/gif/evas_image_load_gif.c +modules_evas_image_loaders_gif_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ @EVAS_CFLAGS@ \ @evas_image_loader_gif_cflags@ -modules_evas_loaders_gif_module_la_LIBADD = \ +modules_evas_image_loaders_gif_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_loader_gif_libs@ -modules_evas_loaders_gif_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_loaders_gif_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_loaders_gif_module_la_LIBTOOLFLAGS = --tag=disable-static +modules_evas_image_loaders_gif_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_loaders_gif_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_loaders_gif_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif if BUILD_LOADER_ICO if EVAS_STATIC_BUILD_ICO -lib_evas_libevas_la_SOURCES += modules/evas/loaders/ico/evas_image_load_ico.c +lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/ico/evas_image_load_ico.c lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_ico_cflags@ lib_evas_libevas_la_LIBADD += @evas_image_loader_ico_libs@ if EVAS_CSERVE2 -bin_evas_evas_cserve2_slave_SOURCES += modules/evas/loaders/ico/evas_image_load_ico.c +bin_evas_evas_cserve2_slave_SOURCES += modules/evas/image_loaders/ico/evas_image_load_ico.c bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_ico_cflags@ bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_ico_libs@ endif else -loadericopkgdir = $(libdir)/evas/modules/loaders/ico/$(MODULE_ARCH) -loadericopkg_LTLIBRARIES = modules/evas/loaders/ico/module.la -modules_evas_loaders_ico_module_la_SOURCES = modules/evas/loaders/ico/evas_image_load_ico.c -modules_evas_loaders_ico_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +loadericopkgdir = $(libdir)/evas/modules/image_loaders/ico/$(MODULE_ARCH) +loadericopkg_LTLIBRARIES = modules/evas/image_loaders/ico/module.la +modules_evas_image_loaders_ico_module_la_SOURCES = modules/evas/image_loaders/ico/evas_image_load_ico.c +modules_evas_image_loaders_ico_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ @EVAS_CFLAGS@ \ @evas_image_loader_ico_cflags@ -modules_evas_loaders_ico_module_la_LIBADD = \ +modules_evas_image_loaders_ico_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_loader_ico_libs@ -modules_evas_loaders_ico_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_loaders_ico_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static +modules_evas_image_loaders_ico_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_loaders_ico_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif if BUILD_LOADER_JPEG if EVAS_STATIC_BUILD_JPEG -lib_evas_libevas_la_SOURCES += modules/evas/loaders/jpeg/evas_image_load_jpeg.c -lib_evas_libevas_la_SOURCES += modules/evas/savers/jpeg/evas_image_save_jpeg.c +lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c +lib_evas_libevas_la_SOURCES += modules/evas/image_savers/jpeg/evas_image_save_jpeg.c lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_jpeg_cflags@ lib_evas_libevas_la_LIBADD += @evas_image_loader_jpeg_libs@ if EVAS_CSERVE2 -bin_evas_evas_cserve2_slave_SOURCES += modules/evas/loaders/jpeg/evas_image_load_jpeg.c +bin_evas_evas_cserve2_slave_SOURCES += modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_jpeg_cflags@ bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_jpeg_libs@ endif else -loaderjpegpkgdir = $(libdir)/evas/modules/loaders/jpeg/$(MODULE_ARCH) -loaderjpegpkg_LTLIBRARIES = modules/evas/loaders/jpeg/module.la -modules_evas_loaders_jpeg_module_la_SOURCES = modules/evas/loaders/jpeg/evas_image_load_jpeg.c -modules_evas_loaders_jpeg_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +loaderjpegpkgdir = $(libdir)/evas/modules/image_loaders/jpeg/$(MODULE_ARCH) +loaderjpegpkg_LTLIBRARIES = modules/evas/image_loaders/jpeg/module.la +modules_evas_image_loaders_jpeg_module_la_SOURCES = modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c +modules_evas_image_loaders_jpeg_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ @EVAS_CFLAGS@ \ @evas_image_loader_jpeg_cflags@ -modules_evas_loaders_jpeg_module_la_LIBADD = \ +modules_evas_image_loaders_jpeg_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_loader_jpeg_libs@ -modules_evas_loaders_jpeg_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_loaders_jpeg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static -saverjpegpkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH) -saverjpegpkg_LTLIBRARIES = modules/evas/savers/jpeg/module.la -modules_evas_savers_jpeg_module_la_SOURCES = modules/evas/savers/jpeg/evas_image_save_jpeg.c -modules_evas_savers_jpeg_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +modules_evas_image_loaders_jpeg_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_loaders_jpeg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static +saverjpegpkgdir = $(libdir)/evas/modules/image_savers/jpeg/$(MODULE_ARCH) +saverjpegpkg_LTLIBRARIES = modules/evas/image_savers/jpeg/module.la +modules_evas_image_savers_jpeg_module_la_SOURCES = modules/evas/image_savers/jpeg/evas_image_save_jpeg.c +modules_evas_image_savers_jpeg_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ @EVAS_CFLAGS@ \ @evas_image_loader_jpeg_cflags@ -modules_evas_savers_jpeg_module_la_LIBADD = \ +modules_evas_image_savers_jpeg_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_loader_jpeg_libs@ -modules_evas_savers_jpeg_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_savers_jpeg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_savers_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static +modules_evas_image_savers_jpeg_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_savers_jpeg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_savers_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif if BUILD_LOADER_JP2K if EVAS_STATIC_BUILD_JP2K -lib_evas_libevas_la_SOURCES += modules/evas/loaders/jp2k/evas_image_load_jp2k.c +lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_jp2k_cflags@ lib_evas_libevas_la_LIBADD += @evas_image_loader_jp2k_libs@ if EVAS_CSERVE2 -bin_evas_evas_cserve2_slave_SOURCES += modules/evas/loaders/jp2k/evas_image_load_jp2k.c +bin_evas_evas_cserve2_slave_SOURCES += modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_jp2k_cflags@ bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_jp2k_libs@ endif else -loaderjp2kpkgdir = $(libdir)/evas/modules/loaders/jp2k/$(MODULE_ARCH) -loaderjp2kpkg_LTLIBRARIES = modules/evas/loaders/jp2k/module.la -modules_evas_loaders_jp2k_module_la_SOURCES = modules/evas/loaders/jp2k/evas_image_load_jp2k.c -modules_evas_loaders_jp2k_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +loaderjp2kpkgdir = $(libdir)/evas/modules/image_loaders/jp2k/$(MODULE_ARCH) +loaderjp2kpkg_LTLIBRARIES = modules/evas/image_loaders/jp2k/module.la +modules_evas_image_loaders_jp2k_module_la_SOURCES = modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c +modules_evas_image_loaders_jp2k_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ @EVAS_CFLAGS@ \ @evas_image_loader_jp2k_cflags@ -modules_evas_loaders_jp2k_module_la_LIBADD = \ +modules_evas_image_loaders_jp2k_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_loader_jp2k_libs@ -modules_evas_loaders_jp2k_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_loaders_jp2k_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_loaders_jp2k_module_la_LIBTOOLFLAGS = --tag=disable-static +modules_evas_image_loaders_jp2k_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_loaders_jp2k_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_loaders_jp2k_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif if BUILD_LOADER_PMAPS if EVAS_STATIC_BUILD_PMAPS -lib_evas_libevas_la_SOURCES += modules/evas/loaders/pmaps/evas_image_load_pmaps.c +lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_pmaps_cflags@ lib_evas_libevas_la_LIBADD += @evas_image_loader_pmaps_libs@ if EVAS_CSERVE2 -bin_evas_evas_cserve2_slave_SOURCES += modules/evas/loaders/pmaps/evas_image_load_pmaps.c +bin_evas_evas_cserve2_slave_SOURCES += modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_pmaps_cflags@ bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_pmaps_libs@ endif else -loaderpmapspkgdir = $(libdir)/evas/modules/loaders/pmaps/$(MODULE_ARCH) -loaderpmapspkg_LTLIBRARIES = modules/evas/loaders/pmaps/module.la -modules_evas_loaders_pmaps_module_la_SOURCES = modules/evas/loaders/pmaps/evas_image_load_pmaps.c -modules_evas_loaders_pmaps_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +loaderpmapspkgdir = $(libdir)/evas/modules/image_loaders/pmaps/$(MODULE_ARCH) +loaderpmapspkg_LTLIBRARIES = modules/evas/image_loaders/pmaps/module.la +modules_evas_image_loaders_pmaps_module_la_SOURCES = modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c +modules_evas_image_loaders_pmaps_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ @EVAS_CFLAGS@ \ @evas_image_loader_pmaps_cflags@ -modules_evas_loaders_pmaps_module_la_LIBADD = \ +modules_evas_image_loaders_pmaps_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_loader_pmaps_libs@ -modules_evas_loaders_pmaps_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_loaders_pmaps_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static +modules_evas_image_loaders_pmaps_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_loaders_pmaps_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif if BUILD_LOADER_PNG if EVAS_STATIC_BUILD_PNG -lib_evas_libevas_la_SOURCES += modules/evas/loaders/png/evas_image_load_png.c modules/evas/savers/png/evas_image_save_png.c +lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/png/evas_image_load_png.c modules/evas/image_savers/png/evas_image_save_png.c lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_png_cflags@ lib_evas_libevas_la_LIBADD += @evas_image_loader_png_libs@ if EVAS_CSERVE2 -bin_evas_evas_cserve2_slave_SOURCES += modules/evas/loaders/png/evas_image_load_png.c +bin_evas_evas_cserve2_slave_SOURCES += modules/evas/image_loaders/png/evas_image_load_png.c bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_png_cflags@ bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_png_libs@ endif else -loaderpngpkgdir = $(libdir)/evas/modules/loaders/png/$(MODULE_ARCH) -loaderpngpkg_LTLIBRARIES = modules/evas/loaders/png/module.la -modules_evas_loaders_png_module_la_SOURCES = modules/evas/loaders/png/evas_image_load_png.c -modules_evas_loaders_png_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +loaderpngpkgdir = $(libdir)/evas/modules/image_loaders/png/$(MODULE_ARCH) +loaderpngpkg_LTLIBRARIES = modules/evas/image_loaders/png/module.la +modules_evas_image_loaders_png_module_la_SOURCES = modules/evas/image_loaders/png/evas_image_load_png.c +modules_evas_image_loaders_png_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ @EVAS_CFLAGS@ \ @evas_image_loader_png_cflags@ -modules_evas_loaders_png_module_la_LIBADD = \ +modules_evas_image_loaders_png_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_loader_png_libs@ -modules_evas_loaders_png_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_loaders_png_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static +modules_evas_image_loaders_png_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_loaders_png_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static -saverpngpkgdir = $(libdir)/evas/modules/savers/png/$(MODULE_ARCH) -saverpngpkg_LTLIBRARIES = modules/evas/savers/png/module.la -modules_evas_savers_png_module_la_SOURCES = modules/evas/savers/png/evas_image_save_png.c -modules_evas_savers_png_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +saverpngpkgdir = $(libdir)/evas/modules/image_savers/png/$(MODULE_ARCH) +saverpngpkg_LTLIBRARIES = modules/evas/image_savers/png/module.la +modules_evas_image_savers_png_module_la_SOURCES = modules/evas/image_savers/png/evas_image_save_png.c +modules_evas_image_savers_png_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ @EVAS_CFLAGS@ \ @evas_image_loader_png_cflags@ -modules_evas_savers_png_module_la_LIBADD = \ +modules_evas_image_savers_png_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_loader_png_libs@ -modules_evas_savers_png_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_savers_png_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_savers_png_module_la_LIBTOOLFLAGS = --tag=disable-static +modules_evas_image_savers_png_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_savers_png_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_savers_png_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif if BUILD_LOADER_PSD if EVAS_STATIC_BUILD_PSD -lib_evas_libevas_la_SOURCES += modules/evas/loaders/psd/evas_image_load_psd.c +lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/psd/evas_image_load_psd.c lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_psd_cflags@ lib_evas_libevas_la_LIBADD += @evas_image_loader_psd_libs@ if EVAS_CSERVE2 -bin_evas_evas_cserve2_slave_SOURCES += modules/evas/loaders/psd/evas_image_load_psd.c +bin_evas_evas_cserve2_slave_SOURCES += modules/evas/image_loaders/psd/evas_image_load_psd.c bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_psd_cflags@ bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_psd_libs@ endif else -loaderpsdpkgdir = $(libdir)/evas/modules/loaders/psd/$(MODULE_ARCH) -loaderpsdpkg_LTLIBRARIES = modules/evas/loaders/psd/module.la -modules_evas_loaders_psd_module_la_SOURCES = modules/evas/loaders/psd/evas_image_load_psd.c -modules_evas_loaders_psd_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +loaderpsdpkgdir = $(libdir)/evas/modules/image_loaders/psd/$(MODULE_ARCH) +loaderpsdpkg_LTLIBRARIES = modules/evas/image_loaders/psd/module.la +modules_evas_image_loaders_psd_module_la_SOURCES = modules/evas/image_loaders/psd/evas_image_load_psd.c +modules_evas_image_loaders_psd_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ @EVAS_CFLAGS@ \ @evas_image_loader_psd_cflags@ -modules_evas_loaders_psd_module_la_LIBADD = \ +modules_evas_image_loaders_psd_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_loader_psd_libs@ -modules_evas_loaders_psd_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_loaders_psd_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static +modules_evas_image_loaders_psd_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_loaders_psd_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif if BUILD_LOADER_TGA if EVAS_STATIC_BUILD_TGA -lib_evas_libevas_la_SOURCES += modules/evas/loaders/tga/evas_image_load_tga.c +lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/tga/evas_image_load_tga.c lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_tga_cflags@ lib_evas_libevas_la_LIBADD += @evas_image_loader_tga_libs@ if EVAS_CSERVE2 -bin_evas_evas_cserve2_slave_SOURCES += modules/evas/loaders/tga/evas_image_load_tga.c +bin_evas_evas_cserve2_slave_SOURCES += modules/evas/image_loaders/tga/evas_image_load_tga.c bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_tga_cflags@ bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_tga_libs@ endif else -loadertgapkgdir = $(libdir)/evas/modules/loaders/tga/$(MODULE_ARCH) -loadertgapkg_LTLIBRARIES = modules/evas/loaders/tga/module.la -modules_evas_loaders_tga_module_la_SOURCES = modules/evas/loaders/tga/evas_image_load_tga.c -modules_evas_loaders_tga_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +loadertgapkgdir = $(libdir)/evas/modules/image_loaders/tga/$(MODULE_ARCH) +loadertgapkg_LTLIBRARIES = modules/evas/image_loaders/tga/module.la +modules_evas_image_loaders_tga_module_la_SOURCES = modules/evas/image_loaders/tga/evas_image_load_tga.c +modules_evas_image_loaders_tga_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ @EVAS_CFLAGS@ \ @evas_image_loader_tga_cflags@ -modules_evas_loaders_tga_module_la_LIBADD = \ +modules_evas_image_loaders_tga_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_loader_tga_libs@ -modules_evas_loaders_tga_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_loaders_tga_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static +modules_evas_image_loaders_tga_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_loaders_tga_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif if BUILD_LOADER_TIFF if EVAS_STATIC_BUILD_TIFF -lib_evas_libevas_la_SOURCES += modules/evas/loaders/tiff/evas_image_load_tiff.c modules/evas/savers/tiff/evas_image_save_tiff.c +lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/tiff/evas_image_load_tiff.c modules/evas/image_savers/tiff/evas_image_save_tiff.c lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_tiff_cflags@ lib_evas_libevas_la_LIBADD += @evas_image_loader_tiff_libs@ if EVAS_CSERVE2 -bin_evas_evas_cserve2_slave_SOURCES += modules/evas/loaders/tiff/evas_image_load_tiff.c +bin_evas_evas_cserve2_slave_SOURCES += modules/evas/image_loaders/tiff/evas_image_load_tiff.c bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_tiff_cflags@ bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_tiff_libs@ endif else -loadertiffpkgdir = $(libdir)/evas/modules/loaders/tiff/$(MODULE_ARCH) -loadertiffpkg_LTLIBRARIES = modules/evas/loaders/tiff/module.la -modules_evas_loaders_tiff_module_la_SOURCES = modules/evas/loaders/tiff/evas_image_load_tiff.c -modules_evas_loaders_tiff_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +loadertiffpkgdir = $(libdir)/evas/modules/image_loaders/tiff/$(MODULE_ARCH) +loadertiffpkg_LTLIBRARIES = modules/evas/image_loaders/tiff/module.la +modules_evas_image_loaders_tiff_module_la_SOURCES = modules/evas/image_loaders/tiff/evas_image_load_tiff.c +modules_evas_image_loaders_tiff_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ @EVAS_CFLAGS@ \ @evas_image_loader_tiff_cflags@ -modules_evas_loaders_tiff_module_la_LIBADD = \ +modules_evas_image_loaders_tiff_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_loader_tiff_libs@ -modules_evas_loaders_tiff_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_loaders_tiff_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static +modules_evas_image_loaders_tiff_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_loaders_tiff_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static -savertiffpkgdir = $(libdir)/evas/modules/savers/tiff/$(MODULE_ARCH) -savertiffpkg_LTLIBRARIES = modules/evas/savers/tiff/module.la -modules_evas_savers_tiff_module_la_SOURCES = modules/evas/savers/tiff/evas_image_save_tiff.c -modules_evas_savers_tiff_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +savertiffpkgdir = $(libdir)/evas/modules/image_savers/tiff/$(MODULE_ARCH) +savertiffpkg_LTLIBRARIES = modules/evas/image_savers/tiff/module.la +modules_evas_image_savers_tiff_module_la_SOURCES = modules/evas/image_savers/tiff/evas_image_save_tiff.c +modules_evas_image_savers_tiff_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ @EVAS_CFLAGS@ \ @evas_image_loader_tiff_cflags@ -modules_evas_savers_tiff_module_la_LIBADD = \ +modules_evas_image_savers_tiff_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_loader_tiff_libs@ -modules_evas_savers_tiff_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_savers_tiff_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_savers_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static +modules_evas_image_savers_tiff_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_savers_tiff_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_savers_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif if BUILD_LOADER_WBMP if EVAS_STATIC_BUILD_WBMP -lib_evas_libevas_la_SOURCES += modules/evas/loaders/wbmp/evas_image_load_wbmp.c +lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_wbmp_cflags@ lib_evas_libevas_la_LIBADD += @evas_image_loader_wbmp_libs@ if EVAS_CSERVE2 -bin_evas_evas_cserve2_slave_SOURCES += modules/evas/loaders/wbmp/evas_image_load_wbmp.c +bin_evas_evas_cserve2_slave_SOURCES += modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_wbmp_cflags@ bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_wbmp_libs@ endif else -loaderwbmppkgdir = $(libdir)/evas/modules/loaders/wbmp/$(MODULE_ARCH) -loaderwbmppkg_LTLIBRARIES = modules/evas/loaders/wbmp/module.la -modules_evas_loaders_wbmp_module_la_SOURCES = modules/evas/loaders/wbmp/evas_image_load_wbmp.c -modules_evas_loaders_wbmp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +loaderwbmppkgdir = $(libdir)/evas/modules/image_loaders/wbmp/$(MODULE_ARCH) +loaderwbmppkg_LTLIBRARIES = modules/evas/image_loaders/wbmp/module.la +modules_evas_image_loaders_wbmp_module_la_SOURCES = modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c +modules_evas_image_loaders_wbmp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ @EVAS_CFLAGS@ \ @evas_image_loader_wbmp_cflags@ -modules_evas_loaders_wbmp_module_la_LIBADD = \ +modules_evas_image_loaders_wbmp_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_loader_wbmp_libs@ -modules_evas_loaders_wbmp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_loaders_wbmp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static +modules_evas_image_loaders_wbmp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_loaders_wbmp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif if BUILD_LOADER_WEBP if EVAS_STATIC_BUILD_WEBP -lib_evas_libevas_la_SOURCES += modules/evas/loaders/webp/evas_image_load_webp.c modules/evas/savers/webp/evas_image_save_webp.c +lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/webp/evas_image_load_webp.c modules/evas/image_savers/webp/evas_image_save_webp.c lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_webp_cflags@ lib_evas_libevas_la_LIBADD += @evas_image_loader_webp_libs@ if EVAS_CSERVE2 -bin_evas_evas_cserve2_slave_SOURCES += modules/evas/loaders/webp/evas_image_load_webp.c +bin_evas_evas_cserve2_slave_SOURCES += modules/evas/image_loaders/webp/evas_image_load_webp.c bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_webp_cflags@ bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_webp_libs@ endif else -loaderwebppkgdir = $(libdir)/evas/modules/loaders/webp/$(MODULE_ARCH) -loaderwebppkg_LTLIBRARIES = modules/evas/loaders/webp/module.la -modules_evas_loaders_webp_module_la_SOURCES = modules/evas/loaders/webp/evas_image_load_webp.c -modules_evas_loaders_webp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +loaderwebppkgdir = $(libdir)/evas/modules/image_loaders/webp/$(MODULE_ARCH) +loaderwebppkg_LTLIBRARIES = modules/evas/image_loaders/webp/module.la +modules_evas_image_loaders_webp_module_la_SOURCES = modules/evas/image_loaders/webp/evas_image_load_webp.c +modules_evas_image_loaders_webp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ @EVAS_CFLAGS@ \ @evas_image_loader_webp_cflags@ -modules_evas_loaders_webp_module_la_LIBADD = \ +modules_evas_image_loaders_webp_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_loader_webp_libs@ -modules_evas_loaders_webp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_loaders_webp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static +modules_evas_image_loaders_webp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_loaders_webp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static -saverwebppkgdir = $(libdir)/evas/modules/savers/webp/$(MODULE_ARCH) -saverwebppkg_LTLIBRARIES = modules/evas/savers/webp/module.la -modules_evas_savers_webp_module_la_SOURCES = modules/evas/savers/webp/evas_image_save_webp.c -modules_evas_savers_webp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +saverwebppkgdir = $(libdir)/evas/modules/image_savers/webp/$(MODULE_ARCH) +saverwebppkg_LTLIBRARIES = modules/evas/image_savers/webp/module.la +modules_evas_image_savers_webp_module_la_SOURCES = modules/evas/image_savers/webp/evas_image_save_webp.c +modules_evas_image_savers_webp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ @EVAS_CFLAGS@ \ @evas_image_loader_webp_cflags@ -modules_evas_savers_webp_module_la_LIBADD = \ +modules_evas_image_savers_webp_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_loader_webp_libs@ -modules_evas_savers_webp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_savers_webp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_savers_webp_module_la_LIBTOOLFLAGS = --tag=disable-static +modules_evas_image_savers_webp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_savers_webp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_savers_webp_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif if BUILD_LOADER_XPM if EVAS_STATIC_BUILD_XPM -lib_evas_libevas_la_SOURCES += modules/evas/loaders/xpm/evas_image_load_xpm.c +lib_evas_libevas_la_SOURCES += modules/evas/image_loaders/xpm/evas_image_load_xpm.c lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_xpm_cflags@ lib_evas_libevas_la_LIBADD += @evas_image_loader_xpm_libs@ if EVAS_CSERVE2 -bin_evas_evas_cserve2_slave_SOURCES += modules/evas/loaders/xpm/evas_image_load_xpm.c +bin_evas_evas_cserve2_slave_SOURCES += modules/evas/image_loaders/xpm/evas_image_load_xpm.c bin_evas_evas_cserve2_slave_CPPFLAGS += @evas_image_loader_xpm_cflags@ bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_xpm_libs@ endif else -loaderxpmpkgdir = $(libdir)/evas/modules/loaders/xpm/$(MODULE_ARCH) -loaderxpmpkg_LTLIBRARIES = modules/evas/loaders/xpm/module.la -modules_evas_loaders_xpm_module_la_SOURCES = modules/evas/loaders/xpm/evas_image_load_xpm.c -modules_evas_loaders_xpm_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ +loaderxpmpkgdir = $(libdir)/evas/modules/image_loaders/xpm/$(MODULE_ARCH) +loaderxpmpkg_LTLIBRARIES = modules/evas/image_loaders/xpm/module.la +modules_evas_image_loaders_xpm_module_la_SOURCES = modules/evas/image_loaders/xpm/evas_image_load_xpm.c +modules_evas_image_loaders_xpm_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ @EVAS_CFLAGS@ \ @evas_image_loader_xpm_cflags@ -modules_evas_loaders_xpm_module_la_LIBADD = \ +modules_evas_image_loaders_xpm_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_loader_xpm_libs@ -modules_evas_loaders_xpm_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_loaders_xpm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static +modules_evas_image_loaders_xpm_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_loaders_xpm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif @@ -1744,8 +1744,8 @@ if BUILD_LOADER_TGV EXTRA_DIST += static_libs/rg_etc/README if EVAS_STATIC_BUILD_TGV lib_evas_libevas_la_SOURCES += \ -modules/evas/loaders/tgv/evas_image_load_tgv.c \ -modules/evas/savers/tgv/evas_image_save_tgv.c \ +modules/evas/image_loaders/tgv/evas_image_load_tgv.c \ +modules/evas/image_savers/tgv/evas_image_save_tgv.c \ static_libs/rg_etc/rg_etc1.c \ static_libs/rg_etc/rg_etc2.c \ static_libs/rg_etc/rg_etc1.h \ @@ -1767,7 +1767,7 @@ endif lib_evas_libevas_la_LIBADD += @evas_image_loader_tgv_libs@ if EVAS_CSERVE2 bin_evas_evas_cserve2_slave_SOURCES += \ -modules/evas/loaders/tgv/evas_image_load_tgv.c \ +modules/evas/image_loaders/tgv/evas_image_load_tgv.c \ static_libs/rg_etc/rg_etc1.c \ static_libs/rg_etc/rg_etc2.c \ static_libs/rg_etc/rg_etc1.h @@ -1789,19 +1789,19 @@ endif bin_evas_evas_cserve2_slave_LDADD += @evas_image_loader_tgv_libs@ endif else -loadertgvpkgdir = $(libdir)/evas/modules/loaders/tgv/$(MODULE_ARCH) -loadertgvpkg_LTLIBRARIES = modules/evas/loaders/tgv/module.la -modules_evas_loaders_tgv_module_la_SOURCES = \ -modules/evas/loaders/tgv/evas_image_load_tgv.c \ +loadertgvpkgdir = $(libdir)/evas/modules/image_loaders/tgv/$(MODULE_ARCH) +loadertgvpkg_LTLIBRARIES = modules/evas/image_loaders/tgv/module.la +modules_evas_image_loaders_tgv_module_la_SOURCES = \ +modules/evas/image_loaders/tgv/evas_image_load_tgv.c \ static_libs/rg_etc/rg_etc1.c \ static_libs/rg_etc/rg_etc2.c \ static_libs/rg_etc/rg_etc1.h if ! ENABLE_LIBLZ4 -modules_evas_loaders_tgv_module_la_SOURCES += \ +modules_evas_image_loaders_tgv_module_la_SOURCES += \ static_libs/lz4/lz4.c \ static_libs/lz4/lz4.h endif -modules_evas_loaders_tgv_module_la_CPPFLAGS = \ +modules_evas_image_loaders_tgv_module_la_CPPFLAGS = \ -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/static_libs/rg_etc \ -I$(top_srcdir)/src/lib/evas/ \ @@ -1809,46 +1809,46 @@ modules_evas_loaders_tgv_module_la_CPPFLAGS = \ @NEON_CFLAGS@ \ @evas_image_loader_tgv_cflags@ if ! ENABLE_LIBLZ4 -modules_evas_loaders_tgv_module_la_CPPFLAGS += \ +modules_evas_image_loaders_tgv_module_la_CPPFLAGS += \ -I$(top_srcdir)/src/static_libs/lz4 endif -modules_evas_loaders_tgv_module_la_LIBADD = \ +modules_evas_image_loaders_tgv_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_loader_tgv_libs@ -modules_evas_loaders_tgv_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_loaders_tgv_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_loaders_tgv_module_la_LIBTOOLFLAGS = --tag=disable-static +modules_evas_image_loaders_tgv_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_loaders_tgv_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_loaders_tgv_module_la_LIBTOOLFLAGS = --tag=disable-static -savertgvpkgdir = $(libdir)/evas/modules/savers/tgv/$(MODULE_ARCH) -savertgvpkg_LTLIBRARIES = modules/evas/savers/tgv/module.la -modules_evas_savers_tgv_module_la_SOURCES = \ -modules/evas/savers/tgv/evas_image_save_tgv.c \ +savertgvpkgdir = $(libdir)/evas/modules/image_savers/tgv/$(MODULE_ARCH) +savertgvpkg_LTLIBRARIES = modules/evas/image_savers/tgv/module.la +modules_evas_image_savers_tgv_module_la_SOURCES = \ +modules/evas/image_savers/tgv/evas_image_save_tgv.c \ static_libs/rg_etc/rg_etc1.c \ static_libs/rg_etc/rg_etc1.h \ static_libs/rg_etc/etc2_encoder.c if ! ENABLE_LIBLZ4 -modules_evas_savers_tgv_module_la_SOURCES += \ +modules_evas_image_savers_tgv_module_la_SOURCES += \ static_libs/lz4/lz4.c \ static_libs/lz4/lz4.h \ static_libs/lz4/lz4hc.c \ static_libs/lz4/lz4hc.h endif -modules_evas_savers_tgv_module_la_CPPFLAGS = \ +modules_evas_image_savers_tgv_module_la_CPPFLAGS = \ -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/static_libs/rg_etc \ -I$(top_srcdir)/src/lib/evas/ \ @EVAS_CFLAGS@ \ @evas_image_saver_tgv_cflags@ if ! ENABLE_LIBLZ4 -modules_evas_savers_tgv_module_la_CPPFLAGS += \ +modules_evas_image_savers_tgv_module_la_CPPFLAGS += \ -I$(top_srcdir)/src/static_libs/lz4 endif -modules_evas_savers_tgv_module_la_LIBADD = \ +modules_evas_image_savers_tgv_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ @evas_image_saver_tgv_libs@ -modules_evas_savers_tgv_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ -modules_evas_savers_tgv_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ -modules_evas_savers_tgv_module_la_LIBTOOLFLAGS = --tag=disable-static +modules_evas_image_savers_tgv_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ +modules_evas_image_savers_tgv_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ +modules_evas_image_savers_tgv_module_la_LIBTOOLFLAGS = --tag=disable-static endif endif diff --git a/src/lib/evas/file/evas_module.c b/src/lib/evas/file/evas_module.c index 34b1205dbf..ead26123b1 100644 --- a/src/lib/evas/file/evas_module.c +++ b/src/lib/evas/file/evas_module.c @@ -439,8 +439,8 @@ evas_module_find_type(Evas_Module_Type type, const char *name) switch (type) { case EVAS_MODULE_TYPE_ENGINE: type_str = "engines"; break; - case EVAS_MODULE_TYPE_IMAGE_LOADER: type_str = "loaders"; break; - case EVAS_MODULE_TYPE_IMAGE_SAVER: type_str = "savers"; break; + case EVAS_MODULE_TYPE_IMAGE_LOADER: type_str = "image_loaders"; break; + case EVAS_MODULE_TYPE_IMAGE_SAVER: type_str = "image_savers"; break; case EVAS_MODULE_TYPE_OBJECT: type_str = "object"; break; } diff --git a/src/modules/evas/loaders/bmp/evas_image_load_bmp.c b/src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c similarity index 100% rename from src/modules/evas/loaders/bmp/evas_image_load_bmp.c rename to src/modules/evas/image_loaders/bmp/evas_image_load_bmp.c diff --git a/src/modules/evas/loaders/dds/evas_image_load_dds.c b/src/modules/evas/image_loaders/dds/evas_image_load_dds.c similarity index 100% rename from src/modules/evas/loaders/dds/evas_image_load_dds.c rename to src/modules/evas/image_loaders/dds/evas_image_load_dds.c diff --git a/src/modules/evas/loaders/dds/s3tc.h b/src/modules/evas/image_loaders/dds/s3tc.h similarity index 100% rename from src/modules/evas/loaders/dds/s3tc.h rename to src/modules/evas/image_loaders/dds/s3tc.h diff --git a/src/modules/evas/loaders/dds/s3tc_decoder.c b/src/modules/evas/image_loaders/dds/s3tc_decoder.c similarity index 100% rename from src/modules/evas/loaders/dds/s3tc_decoder.c rename to src/modules/evas/image_loaders/dds/s3tc_decoder.c diff --git a/src/modules/evas/loaders/eet/evas_image_load_eet.c b/src/modules/evas/image_loaders/eet/evas_image_load_eet.c similarity index 100% rename from src/modules/evas/loaders/eet/evas_image_load_eet.c rename to src/modules/evas/image_loaders/eet/evas_image_load_eet.c diff --git a/src/modules/evas/loaders/generic/evas_image_load_generic.c b/src/modules/evas/image_loaders/generic/evas_image_load_generic.c similarity index 100% rename from src/modules/evas/loaders/generic/evas_image_load_generic.c rename to src/modules/evas/image_loaders/generic/evas_image_load_generic.c diff --git a/src/modules/evas/loaders/gif/evas_image_load_gif.c b/src/modules/evas/image_loaders/gif/evas_image_load_gif.c similarity index 100% rename from src/modules/evas/loaders/gif/evas_image_load_gif.c rename to src/modules/evas/image_loaders/gif/evas_image_load_gif.c diff --git a/src/modules/evas/loaders/ico/evas_image_load_ico.c b/src/modules/evas/image_loaders/ico/evas_image_load_ico.c similarity index 100% rename from src/modules/evas/loaders/ico/evas_image_load_ico.c rename to src/modules/evas/image_loaders/ico/evas_image_load_ico.c diff --git a/src/modules/evas/loaders/jp2k/evas_image_load_jp2k.c b/src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c similarity index 100% rename from src/modules/evas/loaders/jp2k/evas_image_load_jp2k.c rename to src/modules/evas/image_loaders/jp2k/evas_image_load_jp2k.c diff --git a/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c b/src/modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c similarity index 100% rename from src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c rename to src/modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c diff --git a/src/modules/evas/loaders/pmaps/evas_image_load_pmaps.c b/src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c similarity index 100% rename from src/modules/evas/loaders/pmaps/evas_image_load_pmaps.c rename to src/modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c diff --git a/src/modules/evas/loaders/png/evas_image_load_png.c b/src/modules/evas/image_loaders/png/evas_image_load_png.c similarity index 100% rename from src/modules/evas/loaders/png/evas_image_load_png.c rename to src/modules/evas/image_loaders/png/evas_image_load_png.c diff --git a/src/modules/evas/loaders/psd/evas_image_load_psd.c b/src/modules/evas/image_loaders/psd/evas_image_load_psd.c similarity index 100% rename from src/modules/evas/loaders/psd/evas_image_load_psd.c rename to src/modules/evas/image_loaders/psd/evas_image_load_psd.c diff --git a/src/modules/evas/loaders/tga/evas_image_load_tga.c b/src/modules/evas/image_loaders/tga/evas_image_load_tga.c similarity index 100% rename from src/modules/evas/loaders/tga/evas_image_load_tga.c rename to src/modules/evas/image_loaders/tga/evas_image_load_tga.c diff --git a/src/modules/evas/loaders/tgv/evas_image_load_tgv.c b/src/modules/evas/image_loaders/tgv/evas_image_load_tgv.c similarity index 100% rename from src/modules/evas/loaders/tgv/evas_image_load_tgv.c rename to src/modules/evas/image_loaders/tgv/evas_image_load_tgv.c diff --git a/src/modules/evas/loaders/tiff/evas_image_load_tiff.c b/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c similarity index 100% rename from src/modules/evas/loaders/tiff/evas_image_load_tiff.c rename to src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c diff --git a/src/modules/evas/loaders/wbmp/evas_image_load_wbmp.c b/src/modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c similarity index 100% rename from src/modules/evas/loaders/wbmp/evas_image_load_wbmp.c rename to src/modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c diff --git a/src/modules/evas/loaders/webp/evas_image_load_webp.c b/src/modules/evas/image_loaders/webp/evas_image_load_webp.c similarity index 100% rename from src/modules/evas/loaders/webp/evas_image_load_webp.c rename to src/modules/evas/image_loaders/webp/evas_image_load_webp.c diff --git a/src/modules/evas/loaders/xpm/evas_image_load_xpm.c b/src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c similarity index 100% rename from src/modules/evas/loaders/xpm/evas_image_load_xpm.c rename to src/modules/evas/image_loaders/xpm/evas_image_load_xpm.c diff --git a/src/modules/evas/savers/eet/evas_image_save_eet.c b/src/modules/evas/image_savers/eet/evas_image_save_eet.c similarity index 100% rename from src/modules/evas/savers/eet/evas_image_save_eet.c rename to src/modules/evas/image_savers/eet/evas_image_save_eet.c diff --git a/src/modules/evas/savers/jpeg/evas_image_save_jpeg.c b/src/modules/evas/image_savers/jpeg/evas_image_save_jpeg.c similarity index 100% rename from src/modules/evas/savers/jpeg/evas_image_save_jpeg.c rename to src/modules/evas/image_savers/jpeg/evas_image_save_jpeg.c diff --git a/src/modules/evas/savers/png/evas_image_save_png.c b/src/modules/evas/image_savers/png/evas_image_save_png.c similarity index 100% rename from src/modules/evas/savers/png/evas_image_save_png.c rename to src/modules/evas/image_savers/png/evas_image_save_png.c diff --git a/src/modules/evas/savers/tgv/evas_image_save_tgv.c b/src/modules/evas/image_savers/tgv/evas_image_save_tgv.c similarity index 100% rename from src/modules/evas/savers/tgv/evas_image_save_tgv.c rename to src/modules/evas/image_savers/tgv/evas_image_save_tgv.c diff --git a/src/modules/evas/savers/tiff/evas_image_save_tiff.c b/src/modules/evas/image_savers/tiff/evas_image_save_tiff.c similarity index 100% rename from src/modules/evas/savers/tiff/evas_image_save_tiff.c rename to src/modules/evas/image_savers/tiff/evas_image_save_tiff.c diff --git a/src/modules/evas/savers/webp/evas_image_save_webp.c b/src/modules/evas/image_savers/webp/evas_image_save_webp.c similarity index 100% rename from src/modules/evas/savers/webp/evas_image_save_webp.c rename to src/modules/evas/image_savers/webp/evas_image_save_webp.c