Evas: Started using EVAS_GENERAL_CFLAGS/LIBS 2 vars to rule them all.

Instead of going all over the place and adding cflags to many different Makefiles, now you just need to update these 2 vars. SVN revision: 75619
2012-08-23 11:32:38 +00:00 · 2012-08-23 11:32:38 +00:00 · a1687ca4b9
parent b47d9a1ce4
commit a1687ca4b9
67 changed files with 141 additions and 134 deletions
--- a/legacy/evas/configure.ac
+++ b/legacy/evas/configure.ac
@ -1790,6 +1790,13 @@ fi
 AC_SUBST(EVAS_CFLAGS)
 AC_SUBST(EVAS_LIBS)

+# General CFLAGS
+
+EVAS_GENERAL_CFLAGS="${EINA_CFLAGS}"
+EVAS_GENERAL_LIBS="${EINA_LIBS}"
+AC_SUBST(EVAS_GENERAL_CFLAGS)
+AC_SUBST(EVAS_GENERAL_LIBS)
+
 #####################################################################
 ## Fill in flags

--- a/legacy/evas/src/bin/Makefile.am
+++ b/legacy/evas/src/bin/Makefile.am
@ -10,7 +10,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FREETYPE_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@EET_CFLAGS@ \
@ -26,7 +26,7 @@ evas_cserve_main.c
 evas_cserve_LDADD = \
 $(top_builddir)/src/lib/libevas.la \
@pthread_libs@ \
-@EINA_LIBS@
+@EVAS_GENERAL_LIBS@

 evas_cserve_tool_LDFLAGS =

@ -36,7 +36,7 @@ evas_cserve_tool.c
 evas_cserve_tool_LDADD = \
 $(top_builddir)/src/lib/libevas.la \
@pthread_libs@ \
-@EINA_LIBS@
+@EVAS_GENERAL_LIBS@

 endif

@ -56,7 +56,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_LIBEXEC_DIR=\"$(libexecdir)\" \
@FREETYPE_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@EET_CFLAGS@

 evas_cserve2_SOURCES = \
@ -75,7 +75,7 @@ libevas_cserve2_utils_la = $(top_builddir)/src/lib/cserve2/libevas_cserve2_utils

 evas_cserve2_LDADD = \
@FREETYPE_LIBS@ \
-@EINA_LIBS@ \
+@EVAS_GENERAL_LIBS@ \
@EFL_SHM_OPEN_LIBS@ \
@EET_LIBS@ \
 $(libevas_cserve2_utils_la)
@ -90,10 +90,10 @@ evas_cserve2_debug_SOURCES = \
 evas_cserve2_debug.c

 evas_cserve2_usage_LDADD = \
-@EINA_LIBS@
+@EVAS_GENERAL_LIBS@

 evas_cserve2_debug_LDADD = \
-@EINA_LIBS@
+@EVAS_GENERAL_LIBS@

 evas_cserve2_slave_SOURCES = \
 evas_cserve2_slave.c \
@ -102,14 +102,14 @@ evas_cserve2_utils.c
 evas_cserve2_slave_LDFLAGS = -export-dynamic

 evas_cserve2_slave_LDADD = \
-@EINA_LIBS@ \
+@EVAS_GENERAL_LIBS@ \
@EFL_SHM_OPEN_LIBS@

 dummy_slave_SOURCES = \
 dummy_slave.c

 dummy_slave_LDADD = \
-@EINA_LIBS@ \
+@EVAS_GENERAL_LIBS@ \
@EFL_SHM_OPEN_LIBS@

 endif
--- a/legacy/evas/src/bin/loaders/bmp/Makefile.am
+++ b/legacy/evas/src/bin/loaders/bmp/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/lib/cserve2 \
 -I$(top_srcdir)/src/bin \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@EVIL_CFLAGS@

 if BUILD_LOADER_BMP
@ -18,7 +18,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_bmp.c

-module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ -lm
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @EVIL_LIBS@ -lm
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/bin/loaders/eet/Makefile.am
+++ b/legacy/evas/src/bin/loaders/eet/Makefile.am
@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/cserve2 \
 -I$(top_srcdir)/src/bin \
@evas_image_loader_eet_cflags@ \
-@EINA_CFLAGS@
+@EVAS_GENERAL_CFLAGS@


 if BUILD_LOADER_EET
@ -19,7 +19,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_eet.c

-module_la_LIBADD = @EINA_LIBS@ @evas_image_loader_eet_libs@
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @evas_image_loader_eet_libs@
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/bin/loaders/ico/Makefile.am
+++ b/legacy/evas/src/bin/loaders/ico/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/lib/cserve2 \
 -I$(top_srcdir)/src/bin \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@EVIL_CFLAGS@

 if BUILD_LOADER_ICO
@ -18,7 +18,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_ico.c

-module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @EVIL_LIBS@
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/bin/loaders/jpeg/Makefile.am
+++ b/legacy/evas/src/bin/loaders/jpeg/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/lib/cserve2 \
 -I$(top_srcdir)/src/bin \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@evas_image_loader_jpeg_cflags@ \
@EVIL_CFLAGS@

@ -19,7 +19,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_jpeg.c

-module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ @evas_image_loader_jpeg_libs@
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @EVIL_LIBS@ @evas_image_loader_jpeg_libs@
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/bin/loaders/pmaps/Makefile.am
+++ b/legacy/evas/src/bin/loaders/pmaps/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/lib/cserve2 \
 -I$(top_srcdir)/src/bin \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@evas_image_loader_pmaps_cflags@ \
@EVIL_CFLAGS@

@ -19,7 +19,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_pmaps.c

-module_la_LIBADD = @evas_image_loader_pmaps_libs@ @EINA_LIBS@ @EVIL_LIBS@
+module_la_LIBADD = @evas_image_loader_pmaps_libs@ @EVAS_GENERAL_LIBS@ @EVIL_LIBS@
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/bin/loaders/png/Makefile.am
+++ b/legacy/evas/src/bin/loaders/png/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/lib/cserve2 \
 -I$(top_srcdir)/src/bin \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@evas_image_loader_png_cflags@ \
@EVIL_CFLAGS@

@ -19,7 +19,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_png.c

-module_la_LIBADD = @EINA_LIBS@ @evas_image_loader_png_libs@ @EVIL_LIBS@
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @evas_image_loader_png_libs@ @EVIL_LIBS@
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/bin/loaders/psd/Makefile.am
+++ b/legacy/evas/src/bin/loaders/psd/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/lib/cserve2 \
 -I$(top_srcdir)/src/bin \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@EVIL_CFLAGS@

 if BUILD_LOADER_PSD
@ -18,7 +18,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_psd.c

-module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @EVIL_LIBS@
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/bin/loaders/tga/Makefile.am
+++ b/legacy/evas/src/bin/loaders/tga/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/lib/cserve2 \
 -I$(top_srcdir)/src/bin \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@EVIL_CFLAGS@

 if BUILD_LOADER_TGA
@ -18,7 +18,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_tga.c

-module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @EVIL_LIBS@
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/bin/loaders/tiff/Makefile.am
+++ b/legacy/evas/src/bin/loaders/tiff/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/lib/cserve2 \
 -I$(top_srcdir)/src/bin \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@evas_image_loader_tiff_cflags@ \
@EVIL_CFLAGS@

@ -19,7 +19,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_tiff.c

-module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ @evas_image_loader_tiff_libs@
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @EVIL_LIBS@ @evas_image_loader_tiff_libs@
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/bin/loaders/wbmp/Makefile.am
+++ b/legacy/evas/src/bin/loaders/wbmp/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/lib/cserve2 \
 -I$(top_srcdir)/src/bin \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@EVIL_CFLAGS@

 if BUILD_LOADER_WBMP
@ -18,7 +18,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_wbmp.c

-module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @EVIL_LIBS@
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/bin/loaders/xpm/Makefile.am
+++ b/legacy/evas/src/bin/loaders/xpm/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/lib/cserve2 \
 -I$(top_srcdir)/src/bin \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@evas_image_loader_xpm_cflags@ \
@EVIL_CFLAGS@

@ -19,7 +19,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_xpm.c

-module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ @evas_image_loader_xpm_libs@
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @EVIL_LIBS@ @evas_image_loader_xpm_libs@
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/examples/Makefile.am
+++ b/legacy/evas/src/examples/Makefile.am
@ -18,7 +18,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
 -DPACKAGE_EXAMPLES_DIR=\"$(datadir)/$(PACKAGE)/examples\" \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@ -85,7 +85,7 @@ evas_smart_interface_LDADD = $(top_builddir)/src/lib/libevas.la @ECORE_EVAS_LIBS

 examples_PROGRAMS += evas_box
 evas_box_SOURCES = evas-box.c
-evas_box_LDADD = $(top_builddir)/src/lib/libevas.la @ECORE_EVAS_LIBS@ @EINA_LIBS@
+evas_box_LDADD = $(top_builddir)/src/lib/libevas.la @ECORE_EVAS_LIBS@ @EVAS_GENERAL_LIBS@

 #the ones using ecore_evas and edje follow
 AM_CPPFLAGS += @EDJE_CFLAGS@
--- a/legacy/evas/src/lib/Makefile.am
+++ b/legacy/evas/src/lib/Makefile.am
@ -185,7 +185,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FREETYPE_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@HARFBUZZ_CFLAGS@ \
@ -226,7 +226,7 @@ engines/common/libevas_engine_common.la \
@EET_LIBS@ \
@FONTCONFIG_LIBS@ \
@pthread_libs@ \
-@EINA_LIBS@ \
+@EVAS_GENERAL_LIBS@ \
 $(EVAS_STATIC_MODULE) \
 $(EVAS_STATIC_LIBADD) \
@PIXMAN_LIBS@ \
--- a/legacy/evas/src/lib/cache/Makefile.am
+++ b/legacy/evas/src/lib/cache/Makefile.am
@ -9,7 +9,7 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
-@EINA_CFLAGS@
+@EVAS_GENERAL_CFLAGS@

 noinst_LTLIBRARIES      = libevas_cache.la
 libevas_cache_la_SOURCES  = \
--- a/legacy/evas/src/lib/cache2/Makefile.am
+++ b/legacy/evas/src/lib/cache2/Makefile.am
@ -11,7 +11,7 @@ AM_CPPFLAGS	     = -I. \
 		       @EVIL_CFLAGS@ \
 		       @FREETYPE_CFLAGS@ \
                       @PIXMAN_CFLAGS@ \
-		       @EINA_CFLAGS@ \
+		       @EVAS_GENERAL_CFLAGS@ \
                       @PIXMAN_CFLAGS@ \
                       @FRIBIDI_CFLAGS@

--- a/legacy/evas/src/lib/canvas/Makefile.am
+++ b/legacy/evas/src/lib/canvas/Makefile.am
@ -13,7 +13,7 @@ AM_CPPFLAGS = \
@EET_CFLAGS@ \
@FONTCONFIG_CFLAGS@ \
@EVAS_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@EVIL_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@FRIBIDI_CFLAGS@
--- a/legacy/evas/src/lib/cserve/Makefile.am
+++ b/legacy/evas/src/lib/cserve/Makefile.am
@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FREETYPE_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@EET_CFLAGS@ \
@ -29,4 +29,4 @@ evas_cs_server.c \
 evas_cs_client.c \
 evas_cs_mem.c

-libevas_cserve_la_LIBADD = @EINA_LIBS@ @EFL_SHM_OPEN_LIBS@
+libevas_cserve_la_LIBADD = @EVAS_GENERAL_LIBS@ @EFL_SHM_OPEN_LIBS@
--- a/legacy/evas/src/lib/cserve2/Makefile.am
+++ b/legacy/evas/src/lib/cserve2/Makefile.am
@ -4,7 +4,7 @@ AM_CPPFLAGS = \
 -I. \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FREETYPE_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@EET_CFLAGS@ \
@ -26,6 +26,6 @@ libevas_cserve2_utils_la_SOURCES = \
 evas_cs2_utils.h \
 evas_cs2_utils.c

-libevas_cserve2_la_LIBADD = @EINA_LIBS@ libevas_cserve2_utils.la
+libevas_cserve2_la_LIBADD = @EVAS_GENERAL_LIBS@ libevas_cserve2_utils.la

 endif
--- a/legacy/evas/src/lib/engines/common/Makefile.am
+++ b/legacy/evas/src/lib/engines/common/Makefile.am
@ -14,7 +14,7 @@ AM_CPPFLAGS	     = -I. \
 		       @FREETYPE_CFLAGS@ @VALGRIND_CFLAGS@ \
                       @PIXMAN_CFLAGS@ \
 		       @EET_CFLAGS@ @pthread_cflags@ \
-		       @EINA_CFLAGS@ \
+		       @EVAS_GENERAL_CFLAGS@ \
                       @FRIBIDI_CFLAGS@ @HARFBUZZ_CFLAGS@ \
                       @PIXMAN_CFLAGS@

--- a/legacy/evas/src/lib/engines/common/evas_op_blend/Makefile.am
+++ b/legacy/evas/src/lib/engines/common/evas_op_blend/Makefile.am
@ -40,7 +40,7 @@ libevas_engine_common_op_blend_master_sse3_la_CFLAGS = \
@FREETYPE_CFLAGS@ @VALGRIND_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@EET_CFLAGS@ @pthread_cflags@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FRIBIDI_CFLAGS@ @HARFBUZZ_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@EVAS_SSE3_CFLAGS@
--- a/legacy/evas/src/lib/engines/common_16/Makefile.am
+++ b/legacy/evas/src/lib/engines/common_16/Makefile.am
@ -8,7 +8,7 @@ AM_CPPFLAGS = \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@VALGRIND_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@EET_CFLAGS@ \
@pthread_cflags@

--- a/legacy/evas/src/lib/engines/common_8/Makefile.am
+++ b/legacy/evas/src/lib/engines/common_8/Makefile.am
@ -8,7 +8,7 @@ AM_CPPFLAGS = \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@VALGRIND_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@EET_CFLAGS@ \
@pthread_cflags@

--- a/legacy/evas/src/lib/file/Makefile.am
+++ b/legacy/evas/src/lib/file/Makefile.am
@ -9,7 +9,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
@FREETYPE_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@EVIL_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@PIXMAN_CFLAGS@
@ -21,5 +21,5 @@ evas_module.c \
 evas_module.h \
 evas_path.h

-libevas_file_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@
+libevas_file_la_LIBADD = @EVAS_GENERAL_LIBS@ @EVIL_LIBS@

--- a/legacy/evas/src/modules/engines/buffer/Makefile.am
+++ b/legacy/evas/src/modules/engines/buffer/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/lib/cserve2 \
 -I$(top_srcdir)/src/modules/engines \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@FRIBIDI_CFLAGS@
@ -28,7 +28,7 @@ pkgdir = $(libdir)/evas/modules/engines/buffer/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la

 module_la_SOURCES = $(BUFFER_SOURCES)
-module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@
+module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EVAS_GENERAL_LIBS@
 module_la_LDFLAGS =  -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/engines/direct3d/Makefile.am
+++ b/legacy/evas/src/modules/engines/direct3d/Makefile.am
@ -6,7 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/modules/engines \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@ -41,7 +41,7 @@ pkgdir = $(libdir)/evas/modules/engines/direct3d/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
 module_la_SOURCES = $(DIRECT3D_SOURCES)
 module_la_CXXFLAGS = -fno-exceptions
-module_la_LIBADD = $(top_builddir)/src/lib/libevas.la $(DIRECT3D_LIBADD) @EINA_LIBS@
+module_la_LIBADD = $(top_builddir)/src/lib/libevas.la $(DIRECT3D_LIBADD) @EVAS_GENERAL_LIBS@
 module_la_LDFLAGS = @lt_enable_auto_import@ -no-undefined -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/engines/directfb/Makefile.am
+++ b/legacy/evas/src/modules/engines/directfb/Makefile.am
@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/modules/engines \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_engine_directfb_cflags@

@ -28,7 +28,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES  = $(DIRECTFB_SOURCES)

-module_la_LIBADD = @EINA_LIBS@ $(DIRECTFB_LIBADD) $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ $(DIRECTFB_LIBADD) $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/engines/fb/Makefile.am
+++ b/legacy/evas/src/modules/engines/fb/Makefile.am
@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/modules/engines \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_engine_fb_cflags@

@ -30,7 +30,7 @@ if !EVAS_STATIC_BUILD_FB
 pkgdir = $(libdir)/evas/modules/engines/fb/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
 module_la_SOURCES = $(FB_SOURCES)
-module_la_LIBADD = @EINA_LIBS@ $(FB_LIBADD) $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ $(FB_LIBADD) $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/engines/gl_cocoa/Makefile.am
+++ b/legacy/evas/src/modules/engines/gl_cocoa/Makefile.am
@ -6,7 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/modules/engines/gl_common \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@GL_EET_CFLAGS@ \
@FREETYPE_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@ -30,7 +30,7 @@ pkgdir = $(libdir)/evas/modules/engines/gl_cocoa/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la

 module_la_SOURCES = $(GL_COCOA_SOURCES)
-module_la_LIBADD = @EINA_LIBS@ @GL_EET_LIBS@ $(GL_COCOA_LIBADD) $(top_builddir)/src/lib/libevas.la @dlopen_libs@
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @GL_EET_LIBS@ $(GL_COCOA_LIBADD) $(top_builddir)/src/lib/libevas.la @dlopen_libs@
 module_la_LDFLAGS = -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/engines/gl_common/Makefile.am
+++ b/legacy/evas/src/modules/engines/gl_common/Makefile.am
@ -8,7 +8,7 @@ AM_CPPFLAGS = \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@GL_EET_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FRIBIDI_CFLAGS@

 if BUILD_ENGINE_GL_COMMON
@ -93,7 +93,7 @@ shader/yuy2_vert.h \
 shader/yuy2_nomul_frag.h \
 shader/yuy2_nomul_vert.h

-libevas_engine_gl_common_la_LIBADD = @EINA_LIBS@ @GL_EET_LIBS@ @evas_engine_gl_common_libs@ @dlopen_libs@
+libevas_engine_gl_common_la_LIBADD = @EVAS_GENERAL_LIBS@ @GL_EET_LIBS@ @evas_engine_gl_common_libs@ @dlopen_libs@
 endif

 EXTRA_DIST = \
--- a/legacy/evas/src/modules/engines/gl_sdl/Makefile.am
+++ b/legacy/evas/src/modules/engines/gl_sdl/Makefile.am
@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/modules/engines/gl_common \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@GL_EET_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_engine_gl_sdl_cflags@
@ -30,7 +30,7 @@ pkgdir = $(libdir)/evas/modules/engines/gl_sdl/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la

 module_la_SOURCES = $(GL_SDL_SOURCES)
-module_la_LIBADD = @EINA_LIBS@ $(GL_SDL_LIBADD) $(top_builddir)/src/lib/libevas.la @dlopen_libs@
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ $(GL_SDL_LIBADD) $(top_builddir)/src/lib/libevas.la @dlopen_libs@
 module_la_LDFLAGS = -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/engines/gl_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/gl_x11/Makefile.am
@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/modules/engines/gl_common \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@GL_EET_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_engine_gl_xlib_cflags@
@ -31,7 +31,7 @@ pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la

 module_la_SOURCES = $(GL_X11_SOURCES)
-module_la_LIBADD = @EINA_LIBS@ @GL_EET_LIBS@ $(GL_X11_LIBADD) $(top_builddir)/src/lib/libevas.la @dlopen_libs@
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @GL_EET_LIBS@ $(GL_X11_LIBADD) $(top_builddir)/src/lib/libevas.la @dlopen_libs@
 module_la_LDFLAGS = -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/engines/psl1ght/Makefile.am
+++ b/legacy/evas/src/modules/engines/psl1ght/Makefile.am
@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/modules/engines \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_engine_psl1ght_cflags@

@ -29,7 +29,7 @@ if !EVAS_STATIC_BUILD_PSL1GHT
 pkgdir = $(libdir)/evas/modules/engines/psl1ght/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
 module_la_SOURCES = $(PSL1GHT_SOURCES)
-module_la_LIBADD = @EINA_LIBS@ $(PSL1GHT_LIBADD) $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ $(PSL1GHT_LIBADD) $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/engines/software_16/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16/Makefile.am
@ -9,7 +9,7 @@ AM_CPPFLAGS = \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
-@EINA_CFLAGS@
+@EVAS_GENERAL_CFLAGS@

 if BUILD_ENGINE_SOFTWARE_16

@ -21,7 +21,7 @@ if !EVAS_STATIC_BUILD_SOFTWARE_16
 pkgdir = $(libdir)/evas/modules/engines/software_16/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
 module_la_SOURCES = $(SOFTWARE_16_SOURCES)
-module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am
@ -6,7 +6,7 @@ INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@SDL_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FRIBIDI_CFLAGS@

 if BUILD_ENGINE_SOFTWARE_16_SDL
@ -26,7 +26,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = $(SOFTWARE_SDL_SOURCES)

-module_la_LIBADD = @EINA_LIBS@ @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs

 else
--- a/legacy/evas/src/modules/engines/software_16_wince/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16_wince/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/modules/engines \
 -I$(top_srcdir)/src/modules/engines/software_16 \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@ -35,7 +35,7 @@ pkg_LTLIBRARIES	= module.la

 module_la_SOURCES = $(SOFTWARE_16_WINCE_SOURCE)
 module_la_CXXFLAGS = -fno-rtti -fno-exceptions
-module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la $(SOFTWARE_16_WINCE_LIBADD)
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ $(top_builddir)/src/lib/libevas.la $(SOFTWARE_16_WINCE_LIBADD)
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/engines/software_16_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16_x11/Makefile.am
@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/modules/engines \
 -I$(top_srcdir)/src/modules/engines/software_16 \
@FREETYPE_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_engine_software_16_x11_cflags@
@ -31,7 +31,7 @@ pkgdir = $(libdir)/evas/modules/engines/software_16_x11/$(MODULE_ARCH)
 pkg_LTLIBRARIES	= module.la

 module_la_SOURCES = $(SOFTWARE_16_X11_SOURCES)
-module_la_LIBADD = @EINA_LIBS@ $(SOFTWARE_16_X11_LIBADD) $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ $(SOFTWARE_16_X11_LIBADD) $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/engines/software_8/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_8/Makefile.am
@ -9,7 +9,7 @@ AM_CPPFLAGS = \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
-@EINA_CFLAGS@
+@EVAS_GENERAL_CFLAGS@

 if BUILD_ENGINE_SOFTWARE_8

@ -21,7 +21,7 @@ if !EVAS_STATIC_BUILD_SOFTWARE_8_X11
 pkgdir = $(libdir)/evas/modules/engines/software_8/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
 module_la_SOURCES = $(SOFTWARE_8_SOURCES)
-module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/engines/software_8_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_8_x11/Makefile.am
@ -9,7 +9,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/modules/engines/software_8 \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_engine_software_8_x11_cflags@

@ -31,7 +31,7 @@ pkgdir = $(libdir)/evas/modules/engines/software_8_x11/$(MODULE_ARCH)
 pkg_LTLIBRARIES	= module.la

 module_la_SOURCES = $(SOFTWARE_8_X11_SOURCES)
-module_la_LIBADD = @EINA_LIBS@ $(SOFTWARE_8_X11_LIBADD) $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ $(SOFTWARE_8_X11_LIBADD) $(top_builddir)/src/lib/libevas.la
 #-lxcb-image -lxcb-shm -lxcb -lpixman-1
 module_la_LDFLAGS = -no-undefined -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static
--- a/legacy/evas/src/modules/engines/software_ddraw/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_ddraw/Makefile.am
@ -6,7 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/modules/engines \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@ -32,7 +32,7 @@ pkgdir = $(libdir)/evas/modules/engines/software_ddraw/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
 module_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES)
 module_la_CXXFLAGS = -fno-rtti -fno-exceptions
-module_la_LIBADD = @EINA_LIBS@ $(SOFTWARE_DDRAW_LIBADD) $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ $(SOFTWARE_DDRAW_LIBADD) $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = @lt_enable_auto_import@ -no-undefined -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/engines/software_gdi/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_gdi/Makefile.am
@ -6,7 +6,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/modules/engines \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@ -31,7 +31,7 @@ if !EVAS_STATIC_BUILD_SOFTWARE_GDI
 pkgdir = $(libdir)/evas/modules/engines/software_gdi/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
 module_la_SOURCES = $(SOFTWARE_GDI_SOURCES)
-module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EINA_LIBS@ $(SOFTWARE_GDI_LIBADD)
+module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @EVAS_GENERAL_LIBS@ $(SOFTWARE_GDI_LIBADD)
 module_la_LDFLAGS = @lt_enable_auto_import@ -no-undefined -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/engines/software_generic/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_generic/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
 -I$(top_srcdir)/src/lib/cserve2 \
 -I$(top_srcdir)/src/modules/engines \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@FRIBIDI_CFLAGS@
@ -22,7 +22,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES  = $(SOFTWARE_GENERIC_SOURCES)

-module_la_LIBADD = @EINA_LIBS@ @dlopen_libs@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @dlopen_libs@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/engines/software_x11/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_x11/Makefile.am
@ -15,7 +15,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/modules/engines \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_engine_software_xlib_cflags@

@ -25,7 +25,7 @@ evas_xlib_buffer.c \
 evas_xlib_color.c \
 evas_xlib_main.c

-SOFTWARE_X11_LIBADD = @FREETYPE_LIBS@ @EINA_LIBS@ @evas_engine_software_xlib_libs@
+SOFTWARE_X11_LIBADD = @FREETYPE_LIBS@ @EVAS_GENERAL_LIBS@ @evas_engine_software_xlib_libs@

 endif

@ -39,7 +39,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/modules/engines \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@evas_engine_software_xcb_cflags@

 SOFTWARE_X11_SOURCES += \
@ -49,7 +49,7 @@ evas_xcb_buffer.c \
 evas_xcb_color.c \
 evas_xcb_main.c

-SOFTWARE_X11_LIBADD = @FREETYPE_LIBS@ @PIXMAN_LIBS@ @EINA_LIBS@ @evas_engine_software_xcb_libs@
+SOFTWARE_X11_LIBADD = @FREETYPE_LIBS@ @PIXMAN_LIBS@ @EVAS_GENERAL_LIBS@ @evas_engine_software_xcb_libs@

 endif

--- a/legacy/evas/src/modules/engines/wayland_egl/Makefile.am
+++ b/legacy/evas/src/modules/engines/wayland_egl/Makefile.am
@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/modules/engines/gl_common \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@GL_EET_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_engine_wayland_egl_cflags@
@ -19,7 +19,7 @@ WAYLAND_EGL_SOURCES  = \
 evas_engine.c \
 evas_wl_main.c

-WAYLAND_EGL_LIBADD = @FREETYPE_LIBS@ @GL_EET_LIBS@ @EINA_LIBS@ @evas_engine_wayland_egl_libs@ @dlopen_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la
+WAYLAND_EGL_LIBADD = @FREETYPE_LIBS@ @GL_EET_LIBS@ @EVAS_GENERAL_LIBS@ @evas_engine_wayland_egl_libs@ @dlopen_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la

 includes_HEADERS = Evas_Engine_Wayland_Egl.h
 includesdir = $(includedir)/evas-@VMAJ@
--- a/legacy/evas/src/modules/engines/wayland_shm/Makefile.am
+++ b/legacy/evas/src/modules/engines/wayland_shm/Makefile.am
@ -9,7 +9,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/modules/engines \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_engine_wayland_shm_cflags@

@ -19,7 +19,7 @@ WAYLAND_SHM_SOURCES = \
 evas_engine.c \
 evas_outbuf.c

-WAYLAND_SHM_LIBADD = @FREETYPE_LIBS@ @PIXMAN_LIBS@ @EINA_LIBS@ @evas_engine_wayland_shm_libs@
+WAYLAND_SHM_LIBADD = @FREETYPE_LIBS@ @PIXMAN_LIBS@ @EVAS_GENERAL_LIBS@ @evas_engine_wayland_shm_libs@

 includes_HEADERS = Evas_Engine_Wayland_Shm.h
 includesdir = $(includedir)/evas-@VMAJ@
--- a/legacy/evas/src/modules/loaders/bmp/Makefile.am
+++ b/legacy/evas/src/modules/loaders/bmp/Makefile.am
@ -8,7 +8,7 @@ AM_CPPFLAGS = \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@EVIL_CFLAGS@

 if BUILD_LOADER_BMP
@ -19,7 +19,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_bmp.c

-module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ -lm $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @EVIL_LIBS@ -lm $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/loaders/edb/Makefile.am
+++ b/legacy/evas/src/modules/loaders/edb/Makefile.am
@ -9,7 +9,7 @@ AM_CPPFLAGS = \
@PIXMAN_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_image_loader_edb_cflags@ \
-@EINA_CFLAGS@
+@EVAS_GENERAL_CFLAGS@


 if BUILD_LOADER_EDB
@ -20,7 +20,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_edb.c

-module_la_LIBADD = @evas_image_loader_edb_libs@ @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @evas_image_loader_edb_libs@ @EVAS_GENERAL_LIBS@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/loaders/eet/Makefile.am
+++ b/legacy/evas/src/modules/loaders/eet/Makefile.am
@ -9,7 +9,7 @@ AM_CPPFLAGS = \
@PIXMAN_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_image_loader_eet_cflags@ \
-@EINA_CFLAGS@
+@EVAS_GENERAL_CFLAGS@


 if BUILD_LOADER_EET
@ -20,7 +20,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_eet.c

-module_la_LIBADD = @EINA_LIBS@ @evas_image_loader_eet_libs@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @evas_image_loader_eet_libs@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/loaders/generic/Makefile.am
+++ b/legacy/evas/src/modules/loaders/generic/Makefile.am
@ -9,7 +9,7 @@ AM_CPPFLAGS = \
@PIXMAN_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_image_loader_generic_cflags@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@EVIL_CFLAGS@


@ -21,7 +21,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_generic.c

-module_la_LIBADD = @EINA_LIBS@ @evas_image_loader_generic_libs@ @EFL_SHM_OPEN_LIBS@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @evas_image_loader_generic_libs@ @EFL_SHM_OPEN_LIBS@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/loaders/gif/Makefile.am
+++ b/legacy/evas/src/modules/loaders/gif/Makefile.am
@ -9,7 +9,7 @@ AM_CPPFLAGS = \
@PIXMAN_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_image_loader_gif_cflags@ \
-@EINA_CFLAGS@
+@EVAS_GENERAL_CFLAGS@

 if BUILD_LOADER_GIF
 if !EVAS_STATIC_BUILD_GIF
@ -19,7 +19,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_gif.c

-module_la_LIBADD = @EINA_LIBS@ @evas_image_loader_gif_libs@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @evas_image_loader_gif_libs@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/loaders/ico/Makefile.am
+++ b/legacy/evas/src/modules/loaders/ico/Makefile.am
@ -8,7 +8,7 @@ AM_CPPFLAGS = \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@EVIL_CFLAGS@

 if BUILD_LOADER_ICO
@ -19,7 +19,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_ico.c

-module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/loaders/jpeg/Makefile.am
+++ b/legacy/evas/src/modules/loaders/jpeg/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_image_loader_jpeg_cflags@ \
@EVIL_CFLAGS@
@ -20,7 +20,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_jpeg.c

-module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ @evas_image_loader_jpeg_libs@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @EVIL_LIBS@ @evas_image_loader_jpeg_libs@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/loaders/pmaps/Makefile.am
+++ b/legacy/evas/src/modules/loaders/pmaps/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_image_loader_pmaps_cflags@ \
@EVIL_CFLAGS@
@ -20,7 +20,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_pmaps.c

-module_la_LIBADD = @evas_image_loader_pmaps_libs@ @EINA_LIBS@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @evas_image_loader_pmaps_libs@ @EVAS_GENERAL_LIBS@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/loaders/png/Makefile.am
+++ b/legacy/evas/src/modules/loaders/png/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_image_loader_png_cflags@ \
@EVIL_CFLAGS@
@ -20,7 +20,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_png.c

-module_la_LIBADD = @EINA_LIBS@ @evas_image_loader_png_libs@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @evas_image_loader_png_libs@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/loaders/psd/Makefile.am
+++ b/legacy/evas/src/modules/loaders/psd/Makefile.am
@ -8,7 +8,7 @@ AM_CPPFLAGS = \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@EVIL_CFLAGS@

 if BUILD_LOADER_PSD
@ -19,7 +19,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_psd.c

-module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/loaders/svg/Makefile.am
+++ b/legacy/evas/src/modules/loaders/svg/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_image_loader_svg_cflags@

@ -19,7 +19,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_esvg.c

-module_la_LIBADD = @EINA_LIBS@ @evas_image_loader_svg_libs@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @evas_image_loader_svg_libs@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/loaders/tga/Makefile.am
+++ b/legacy/evas/src/modules/loaders/tga/Makefile.am
@ -8,7 +8,7 @@ AM_CPPFLAGS = \
@FREETYPE_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@EVIL_CFLAGS@

 if BUILD_LOADER_TGA
@ -19,7 +19,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_tga.c

-module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/loaders/tiff/Makefile.am
+++ b/legacy/evas/src/modules/loaders/tiff/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_image_loader_tiff_cflags@ \
@EVIL_CFLAGS@
@ -20,7 +20,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_tiff.c

-module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ @evas_image_loader_tiff_libs@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @EVIL_LIBS@ @evas_image_loader_tiff_libs@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/loaders/wbmp/Makefile.am
+++ b/legacy/evas/src/modules/loaders/wbmp/Makefile.am
@ -8,7 +8,7 @@ AM_CPPFLAGS = \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@EVIL_CFLAGS@

 if BUILD_LOADER_WBMP
@ -19,7 +19,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_wbmp.c

-module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/loaders/xpm/Makefile.am
+++ b/legacy/evas/src/modules/loaders/xpm/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_image_loader_xpm_cflags@ \
@EVIL_CFLAGS@
@ -20,7 +20,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_load_xpm.c

-module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ @evas_image_loader_xpm_libs@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @EVIL_LIBS@ @evas_image_loader_xpm_libs@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/savers/edb/Makefile.am
+++ b/legacy/evas/src/modules/savers/edb/Makefile.am
@ -6,7 +6,7 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include \
@PIXMAN_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_image_loader_edb_cflags@ \
-@EINA_CFLAGS@
+@EVAS_GENERAL_CFLAGS@

 if BUILD_LOADER_EDB
 if !EVAS_STATIC_BUILD_EDB
@ -16,7 +16,7 @@ pkg_LTLIBRARIES        = module.la

 module_la_SOURCES      = evas_image_save_edb.c

-module_la_LIBADD       = @EINA_LIBS@ @evas_image_loader_edb_libs@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD       = @EVAS_GENERAL_LIBS@ @evas_image_loader_edb_libs@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS      = -no-undefined -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/savers/eet/Makefile.am
+++ b/legacy/evas/src/modules/savers/eet/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_image_loader_eet_cflags@

@ -19,7 +19,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_save_eet.c

-module_la_LIBADD = @EINA_LIBS@ @evas_image_loader_eet_libs@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @evas_image_loader_eet_libs@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/savers/jpeg/Makefile.am
+++ b/legacy/evas/src/modules/savers/jpeg/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS= \
 -I$(top_srcdir)/src/lib/include \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_image_loader_jpeg_cflags@

@ -19,7 +19,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_save_jpeg.c

-module_la_LIBADD = @EINA_LIBS@ @evas_image_loader_jpeg_libs@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @evas_image_loader_jpeg_libs@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/savers/png/Makefile.am
+++ b/legacy/evas/src/modules/savers/png/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_image_loader_png_cflags@ \
@EVIL_CFLAGS@
@ -20,7 +20,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_save_png.c

-module_la_LIBADD = @EINA_LIBS@ @evas_image_loader_png_libs@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @evas_image_loader_png_libs@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/modules/savers/tiff/Makefile.am
+++ b/legacy/evas/src/modules/savers/tiff/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/include \
@FREETYPE_CFLAGS@ \
@PIXMAN_CFLAGS@ \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@FRIBIDI_CFLAGS@ \
@evas_image_loader_tiff_cflags@

@ -19,7 +19,7 @@ pkg_LTLIBRARIES = module.la

 module_la_SOURCES = evas_image_save_tiff.c

-module_la_LIBADD = @EINA_LIBS@ @evas_image_loader_tiff_libs@ $(top_builddir)/src/lib/libevas.la
+module_la_LIBADD = @EVAS_GENERAL_LIBS@ @evas_image_loader_tiff_libs@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 module_la_LIBTOOLFLAGS = --tag=disable-static

--- a/legacy/evas/src/tests/Makefile.am
+++ b/legacy/evas/src/tests/Makefile.am
@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@EINA_CFLAGS@ \
+@EVAS_GENERAL_CFLAGS@ \
@CHECK_CFLAGS@

 if EFL_ENABLE_TESTS
@ -24,6 +24,6 @@ evas_test_callbacks.c \
 evas_tests_helpers.h \
 evas_suite.h

-evas_suite_LDADD = @CHECK_LIBS@ $(top_builddir)/src/lib/libevas.la @EINA_LIBS@
+evas_suite_LDADD = @CHECK_LIBS@ $(top_builddir)/src/lib/libevas.la @EVAS_GENERAL_LIBS@

 endif