diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 49b8cd7ca7..dfa53c569a 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -206,10 +206,10 @@ lib_evas_libevas_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas/common \ -I$(top_builddir)/src/lib/evas/common \ -I$(top_srcdir)/src/lib/eina \ --I$(top_srcdir)/src/lib/eo \ --I$(top_srcdir)/src/lib/eet \ -I$(top_builddir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ -I$(top_builddir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/eet \ -I$(top_builddir)/src/lib/eet \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ @@ -372,10 +372,15 @@ enginesoftwaregenericpkg_LTLIBRARIES = modules/evas/engines/software_generic/mod modules_evas_engines_software_generic_module_la_SOURCES = modules/evas/engines/software_generic/evas_engine.c modules_evas_engines_software_generic_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_engines_software_generic_module_la_LIBADD = @EFL_LIBS@ lib/evas/libevas.la @@ -397,10 +402,15 @@ enginebufferpkg_LTLIBRARIES = modules/evas/engines/buffer/module.la modules_evas_engines_buffer_module_la_SOURCES = $(BUFFER_SOURCES) modules_evas_engines_buffer_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@ @@ -450,10 +460,15 @@ enginedirect3dpkg_LTLIBRARIES = modules/evas/engines/direct3d/module.la modules_evas_engines_direct3d_module_la_SOURCES = $(DIRECT3D_SOURCES) modules_evas_engines_direct3d_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ @evas_engine_direct3d_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -483,10 +498,15 @@ enginedirectfbpkg_LTLIBRARIES = modules/evas/engines/directfb/module.la modules_evas_engines_directfb_module_la_SOURCES = $(DIRECTFB_SOURCES) modules_evas_engines_directfb_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ @evas_engine_directfb_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -517,10 +537,15 @@ enginefbpkg_LTLIBRARIES = modules/evas/engines/fb/module.la modules_evas_engines_fb_module_la_SOURCES = $(FB_SOURCES) modules_evas_engines_fb_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ @evas_engine_fb_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -665,10 +690,15 @@ noinst_LTLIBRARIES = modules/evas/engines/gl_common/libevas_engine_gl_common.la modules_evas_engines_gl_common_libevas_engine_gl_common_la_SOURCES = $(GL_COMMON_SOURCES) modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ @GL_EET_CFLAGS@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -704,11 +734,17 @@ engineglcocoapkg_LTLIBRARIES = modules/evas/engines/gl_cocoa/module.la modules_evas_engines_gl_cocoa_module_la_SOURCES = $(GL_COCOA_SOURCES) modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/modules/evas/engines/gl_common \ +-I$(top_builddir)/src/modules/evas/engines/gl_common \ @evas_engine_gl_cocoa_cflags@ \ @GL_EET_CFLAGS@ \ @EFL_CFLAGS@ \ @@ -743,11 +779,17 @@ engineglsdlpkg_LTLIBRARIES = modules/evas/engines/gl_sdl/module.la modules_evas_engines_gl_sdl_module_la_SOURCES = $(GL_SDL_SOURCES) modules_evas_engines_gl_sdl_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/modules/evas/engines/gl_common \ +-I$(top_builddir)/src/modules/evas/engines/gl_common \ @evas_engine_gl_sdl_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -782,11 +824,17 @@ engineglx11pkg_LTLIBRARIES = modules/evas/engines/gl_x11/module.la modules_evas_engines_gl_x11_module_la_SOURCES = $(GL_X11_SOURCES) modules_evas_engines_gl_x11_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/modules/evas/engines/gl_common \ +-I$(top_builddir)/src/modules/evas/engines/gl_common \ @evas_engine_gl_xlib_cflags@ \ @GL_EET_CFLAGS@ \ @EFL_CFLAGS@ \ @@ -819,10 +867,15 @@ enginepsl1ghtpkg_LTLIBRARIES = modules/evas/engines/psl1ght/module.la modules_evas_engines_psl1ght_module_la_SOURCES = $(PSL1GHT_SOURCES) modules_evas_engines_psl1ght_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ @evas_engine_psl1ght_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -854,10 +907,15 @@ enginesoftwareddrawpkg_LTLIBRARIES = modules/evas/engines/software_ddraw/module. modules_evas_engines_software_ddraw_module_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES) modules_evas_engines_software_ddraw_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ @evas_engine_software_ddraw_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -889,10 +947,15 @@ enginesoftwaregdipkg_LTLIBRARIES = modules/evas/engines/software_gdi/module.la modules_evas_engines_software_gdi_module_la_SOURCES = $(SOFTWARE_GDI_SOURCES) modules_evas_engines_software_gdi_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ @evas_engine_software_gdi_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -913,10 +976,15 @@ modules/evas/engines/software_x11/evas_x_egl.c \ modules/evas/engines/software_x11/evas_x_egl.h SOFTWARE_X11_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ SOFTWARE_X11_LIBADD = @@ -978,10 +1046,15 @@ enginewaylandeglpkg_LTLIBRARIES = modules/evas/engines/wayland_egl/module.la modules_evas_engines_wayland_egl_module_la_SOURCES = $(WAYLAND_EGL_SOURCES) modules_evas_engines_wayland_egl_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ @evas_engine_wayland_egl_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1010,10 +1083,15 @@ enginewaylandshmpkg_LTLIBRARIES = modules/evas/engines/wayland_shm/module.la modules_evas_engines_wayland_shm_module_la_SOURCES = $(WAYLAND_SHM_SOURCES) modules_evas_engines_wayland_shm_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ @evas_engine_wayland_shm_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1039,9 +1117,13 @@ 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_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ @evas_image_loader_bmp_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1065,11 +1147,16 @@ 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_srcdir)/src/lib/eet \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/eet \ +-I$(top_builddir)/src/lib/eet \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ @evas_image_loader_eet_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1093,9 +1180,13 @@ 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_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ @evas_image_loader_generic_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1119,9 +1210,13 @@ 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_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ @evas_image_loader_gif_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1145,9 +1240,13 @@ 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_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ @evas_image_loader_ico_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1174,9 +1273,13 @@ 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_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ @evas_image_loader_jpeg_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1192,9 +1295,13 @@ 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_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ @evas_image_loader_jpeg_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1219,9 +1326,13 @@ 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_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ @evas_image_loader_pmaps_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1245,9 +1356,13 @@ 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_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ @evas_image_loader_png_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1263,9 +1378,13 @@ 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_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ @evas_image_loader_png_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1289,9 +1408,13 @@ 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_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ @evas_image_loader_psd_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1315,9 +1438,13 @@ loadersvgpkg_LTLIBRARIES = modules/evas/loaders/svg/module.la modules_evas_loaders_svg_module_la_SOURCES = modules/evas/loaders/svg/evas_image_load_esvg.c modules_evas_loaders_svg_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ @evas_image_loader_svg_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1341,9 +1468,13 @@ 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_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ @evas_image_loader_tga_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1367,9 +1498,13 @@ 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_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ @evas_image_loader_tiff_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1385,9 +1520,13 @@ 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_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ @evas_image_loader_tiff_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1411,9 +1550,13 @@ 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_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ @evas_image_loader_wbmp_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1437,9 +1580,13 @@ 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_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ @evas_image_loader_webp_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1463,9 +1610,13 @@ 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_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ @evas_image_loader_xpm_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1506,11 +1657,21 @@ lib/evas/cserve2/evas_cs2_utils.c bin_evas_evas_cserve2_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/lib/eet \ +-I$(top_builddir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eo \ +-I$(top_builddir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_builddir)/src/lib/eet \ -DPACKAGE_LIBEXEC_DIR=\"$(libexecdir)\" \ @EVAS_CFLAGS@ \ @@ -1520,6 +1681,7 @@ bin_evas_evas_cserve2_LDADD = \ @EVAS_LIBS@ \ @EFL_LIBS@ \ lib/eet/libeet.la \ +lib/eina/libeina.la \ lib/evas/libevas.la bin_evas_evas_cserve2_client_SOURCES = \ @@ -1527,10 +1689,15 @@ bin/evas/evas_cserve2_client.c bin_evas_evas_cserve2_client_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ @EVAS_CFLAGS@ \ @EFL_CFLAGS@ @@ -1539,10 +1706,15 @@ bin/evas/evas_cserve2_usage.c bin_evas_evas_cserve2_usage_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ @EVAS_CFLAGS@ \ @EFL_CFLAGS@ @@ -1556,10 +1728,15 @@ bin/evas/evas_cserve2_debug.c bin_evas_evas_cserve2_debug_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ @EVAS_CFLAGS@ \ @EFL_CFLAGS@ @@ -1574,10 +1751,15 @@ bin/evas/evas_cserve2_utils.c bin_evas_evas_cserve2_slave_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ @EVAS_CFLAGS@ \ @EFL_CFLAGS@ @@ -1594,15 +1776,19 @@ bin/evas/dummy_slave.c bin_evas_dummy_slave_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ @EVAS_CFLAGS@ \ @EFL_CFLAGS@ bin_evas_dummy_slave_LDADD = \ -lib/eina/libeina.la \ @EFL_LIBS@ \ @EVAS_LIBS@ @@ -1614,10 +1800,15 @@ cserve2bmppkg_LTLIBRARIES = bin/evas/loaders/bmp/module.la bin_evas_loaders_bmp_module_la_SOURCES = bin/evas/loaders/bmp/evas_image_load_bmp.c bin_evas_loaders_bmp_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1652,10 +1843,15 @@ cserve2icopkg_LTLIBRARIES = bin/evas/loaders/ico/module.la bin_evas_loaders_ico_module_la_SOURCES = bin/evas/loaders/ico/evas_image_load_ico.c bin_evas_loaders_ico_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @evas_image_loader_ico_cflags@ \ @EFL_CFLAGS@ \ @@ -1671,10 +1867,15 @@ cserve2jpegpkg_LTLIBRARIES = bin/evas/loaders/jpeg/module.la bin_evas_loaders_jpeg_module_la_SOURCES = bin/evas/loaders/jpeg/evas_image_load_jpeg.c bin_evas_loaders_jpeg_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @evas_image_loader_jpeg_cflags@ \ @EFL_CFLAGS@ \ @@ -1690,10 +1891,15 @@ cserve2pmapspkg_LTLIBRARIES = bin/evas/loaders/pmaps/module.la bin_evas_loaders_pmaps_module_la_SOURCES = bin/evas/loaders/pmaps/evas_image_load_pmaps.c bin_evas_loaders_pmaps_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @evas_image_loader_pmaps_cflags@ \ @EFL_CFLAGS@ \ @@ -1709,10 +1915,15 @@ cserve2pngpkg_LTLIBRARIES = bin/evas/loaders/png/module.la bin_evas_loaders_png_module_la_SOURCES = bin/evas/loaders/png/evas_image_load_png.c bin_evas_loaders_png_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @evas_image_loader_png_cflags@ \ @EFL_CFLAGS@ \ @@ -1728,10 +1939,15 @@ cserve2psdpkg_LTLIBRARIES = bin/evas/loaders/psd/module.la bin_evas_loaders_psd_module_la_SOURCES = bin/evas/loaders/psd/evas_image_load_psd.c bin_evas_loaders_psd_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @evas_image_loader_psd_cflags@ \ @EFL_CFLAGS@ \ @@ -1747,10 +1963,15 @@ cserve2tgapkg_LTLIBRARIES = bin/evas/loaders/tga/module.la bin_evas_loaders_tga_module_la_SOURCES = bin/evas/loaders/tga/evas_image_load_tga.c bin_evas_loaders_tga_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @evas_image_loader_tga_cflags@ \ @EFL_CFLAGS@ \ @@ -1766,10 +1987,15 @@ cserve2tiffpkg_LTLIBRARIES = bin/evas/loaders/tiff/module.la bin_evas_loaders_tiff_module_la_SOURCES = bin/evas/loaders/tiff/evas_image_load_tiff.c bin_evas_loaders_tiff_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @evas_image_loader_tiff_cflags@ \ @EFL_CFLAGS@ \ @@ -1785,10 +2011,15 @@ cserve2wbmppkg_LTLIBRARIES = bin/evas/loaders/wbmp/module.la bin_evas_loaders_wbmp_module_la_SOURCES = bin/evas/loaders/wbmp/evas_image_load_wbmp.c bin_evas_loaders_wbmp_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @evas_image_loader_wbmp_cflags@ \ @EFL_CFLAGS@ \ @@ -1804,10 +2035,15 @@ cserve2webppkg_LTLIBRARIES = bin/evas/loaders/webp/module.la bin_evas_loaders_webp_module_la_SOURCES = bin/evas/loaders/webp/evas_image_load_webp.c bin_evas_loaders_webp_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @evas_image_loader_webp_cflags@ \ @EFL_CFLAGS@ \ @@ -1823,10 +2059,15 @@ cserve2xpmpkg_LTLIBRARIES = bin/evas/loaders/xpm/module.la bin_evas_loaders_xpm_module_la_SOURCES = bin/evas/loaders/xpm/evas_image_load_xpm.c bin_evas_loaders_xpm_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ +-I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ +-I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ @evas_image_loader_xpm_cflags@ \ @EFL_CFLAGS@ \