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

67 files changed, 141 insertions, 134 deletions

diff --git a/legacy/evas/configure.ac b/legacy/evas/configure.ac
index 98ab4b53d4..389a6bfea2 100644
--- 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
 
diff --git a/legacy/evas/src/bin/Makefile.am b/legacy/evas/src/bin/Makefile.am
index 6cddccd64d..84028cee96 100644
--- 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
diff --git a/legacy/evas/src/bin/loaders/bmp/Makefile.am b/legacy/evas/src/bin/loaders/bmp/Makefile.am
index 113c19b94c..faba4a514f 100644
--- 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
 
diff --git a/legacy/evas/src/bin/loaders/eet/Makefile.am b/legacy/evas/src/bin/loaders/eet/Makefile.am
index b6aedfbb23..a164bcda1c 100644
--- 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
 
diff --git a/legacy/evas/src/bin/loaders/ico/Makefile.am b/legacy/evas/src/bin/loaders/ico/Makefile.am
index 10d0d4e778..9c045e0010 100644
--- 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
 
diff --git a/legacy/evas/src/bin/loaders/jpeg/Makefile.am b/legacy/evas/src/bin/loaders/jpeg/Makefile.am
index 5bb093fd23..03e3928a33 100644
--- 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
 
diff --git a/legacy/evas/src/bin/loaders/pmaps/Makefile.am b/legacy/evas/src/bin/loaders/pmaps/Makefile.am
index 16410410ce..07480b98d6 100644
--- 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
 
diff --git a/legacy/evas/src/bin/loaders/png/Makefile.am b/legacy/evas/src/bin/loaders/png/Makefile.am
index e99660c16c..554f44d1c7 100644
--- 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
 
diff --git a/legacy/evas/src/bin/loaders/psd/Makefile.am b/legacy/evas/src/bin/loaders/psd/Makefile.am
index 55a3ab2f66..2b09650852 100644
--- 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
 
diff --git a/legacy/evas/src/bin/loaders/tga/Makefile.am b/legacy/evas/src/bin/loaders/tga/Makefile.am
index 7b813caea3..b861412628 100644
--- 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
 
diff --git a/legacy/evas/src/bin/loaders/tiff/Makefile.am b/legacy/evas/src/bin/loaders/tiff/Makefile.am
index 19458ebc88..8c33b61b9b 100644
--- 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
 
diff --git a/legacy/evas/src/bin/loaders/wbmp/Makefile.am b/legacy/evas/src/bin/loaders/wbmp/Makefile.am
index b96e17919a..bed8c29ce6 100644
--- 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
 
diff --git a/legacy/evas/src/bin/loaders/xpm/Makefile.am b/legacy/evas/src/bin/loaders/xpm/Makefile.am
index 8edae6c426..c8117d8146 100644
--- 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
 
diff --git a/legacy/evas/src/examples/Makefile.am b/legacy/evas/src/examples/Makefile.am
index e03ff9e751..276ac9fe65 100644
--- 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@
diff --git a/legacy/evas/src/lib/Makefile.am b/legacy/evas/src/lib/Makefile.am
index 00511f38d8..5daf8ec594 100644
--- 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@ \
diff --git a/legacy/evas/src/lib/cache/Makefile.am b/legacy/evas/src/lib/cache/Makefile.am
index feb5c940c2..d25932f2bc 100644
--- 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  = \
diff --git a/legacy/evas/src/lib/cache2/Makefile.am b/legacy/evas/src/lib/cache2/Makefile.am
index 788b592e18..2eaf0b9cd1 100644
--- 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@
 
diff --git a/legacy/evas/src/lib/canvas/Makefile.am b/legacy/evas/src/lib/canvas/Makefile.am
index d0c8e120c3..8564d66cbe 100644
--- 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@
diff --git a/legacy/evas/src/lib/cserve/Makefile.am b/legacy/evas/src/lib/cserve/Makefile.am
index f2bf1e4bfe..8ed10b80ea 100644
--- 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@
diff --git a/legacy/evas/src/lib/cserve2/Makefile.am b/legacy/evas/src/lib/cserve2/Makefile.am
index 39d7048a49..2aa0c5ccac 100644
--- 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
diff --git a/legacy/evas/src/lib/engines/common/Makefile.am b/legacy/evas/src/lib/engines/common/Makefile.am
index 1938e6c29f..a5ac2a6dbb 100644
--- 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@
 
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/Makefile.am b/legacy/evas/src/lib/engines/common/evas_op_blend/Makefile.am
index 77435c4f1e..d7b5861475 100644
--- 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@
diff --git a/legacy/evas/src/lib/engines/common_16/Makefile.am b/legacy/evas/src/lib/engines/common_16/Makefile.am
index ef2ab305e4..cfa1347a27 100644
--- 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@
 
diff --git a/legacy/evas/src/lib/engines/common_8/Makefile.am b/legacy/evas/src/lib/engines/common_8/Makefile.am
index 58a1b1f8e2..95a48ae642 100644
--- 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@
 
diff --git a/legacy/evas/src/lib/file/Makefile.am b/legacy/evas/src/lib/file/Makefile.am
index c1c8b66b67..97970f4fdb 100644
--- 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@
 
diff --git a/legacy/evas/src/modules/engines/buffer/Makefile.am b/legacy/evas/src/modules/engines/buffer/Makefile.am
index 27f491266a..de9c4012bf 100644
--- 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
 
diff --git a/legacy/evas/src/modules/engines/direct3d/Makefile.am b/legacy/evas/src/modules/engines/direct3d/Makefile.am
index 1ff43a7af8..e8f02928db 100644
--- 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
 
diff --git a/legacy/evas/src/modules/engines/directfb/Makefile.am b/legacy/evas/src/modules/engines/directfb/Makefile.am
index c7ce8ffce9..3d3ea20b20 100644
--- 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
 
diff --git a/legacy/evas/src/modules/engines/fb/Makefile.am b/legacy/evas/src/modules/engines/fb/Makefile.am
index 3046db94d8..1aa1acb85f 100644
--- 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
 
diff --git a/legacy/evas/src/modules/engines/gl_cocoa/Makefile.am b/legacy/evas/src/modules/engines/gl_cocoa/Makefile.am
index 1db05cc00f..02a213d0e0 100644
--- 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
 
diff --git a/legacy/evas/src/modules/engines/gl_common/Makefile.am b/legacy/evas/src/modules/engines/gl_common/Makefile.am
index b2ebc5b4f5..1b7e0b3015 100644
--- 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 = \
diff --git a/legacy/evas/src/modules/engines/gl_sdl/Makefile.am b/legacy/evas/src/modules/engines/gl_sdl/Makefile.am
index 9fd5827d61..86ed306ddf 100644
--- 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
 
diff --git a/legacy/evas/src/modules/engines/gl_x11/Makefile.am b/legacy/evas/src/modules/engines/gl_x11/Makefile.am
index 99ad963854..e1859339f9 100644
--- 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
 
diff --git a/legacy/evas/src/modules/engines/psl1ght/Makefile.am b/legacy/evas/src/modules/engines/psl1ght/Makefile.am
index 557e51cb8a..306ad03dab 100644
--- 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
 
diff --git a/legacy/evas/src/modules/engines/software_16/Makefile.am b/legacy/evas/src/modules/engines/software_16/Makefile.am
index 6e45657795..67e880b233 100644
--- 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
 
diff --git a/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am b/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am
index 64ce6d6531..260eedfb42 100644
--- 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
diff --git a/legacy/evas/src/modules/engines/software_16_wince/Makefile.am b/legacy/evas/src/modules/engines/software_16_wince/Makefile.am
index b8a30769b6..5ac702c22a 100644
--- 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
 
diff --git a/legacy/evas/src/modules/engines/software_16_x11/Makefile.am b/legacy/evas/src/modules/engines/software_16_x11/Makefile.am
index 4ca894a7be..68be01476b 100644
--- 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
 
diff --git a/legacy/evas/src/modules/engines/software_8/Makefile.am b/legacy/evas/src/modules/engines/software_8/Makefile.am
index f6361c75ff..d69505e743 100644
--- 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
 
diff --git a/legacy/evas/src/modules/engines/software_8_x11/Makefile.am b/legacy/evas/src/modules/engines/software_8_x11/Makefile.am
index aac2b2c5d9..700b63c426 100644
--- 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
diff --git a/legacy/evas/src/modules/engines/software_ddraw/Makefile.am b/legacy/evas/src/modules/engines/software_ddraw/Makefile.am
index ac8a9fe87c..c8e1090940 100644
--- 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
 
diff --git a/legacy/evas/src/modules/engines/software_gdi/Makefile.am b/legacy/evas/src/modules/engines/software_gdi/Makefile.am
index b5981af09f..296f141074 100644
--- 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
 
diff --git a/legacy/evas/src/modules/engines/software_generic/Makefile.am b/legacy/evas/src/modules/engines/software_generic/Makefile.am
index f31810e6de..a8d56be419 100644
--- 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
 
diff --git a/legacy/evas/src/modules/engines/software_x11/Makefile.am b/legacy/evas/src/modules/engines/software_x11/Makefile.am
index 7c15a270a7..8c0961d25d 100644
--- 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
 
diff --git a/legacy/evas/src/modules/engines/wayland_egl/Makefile.am b/legacy/evas/src/modules/engines/wayland_egl/Makefile.am
index da6fcf77d7..3acf238a03 100644
--- 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@
diff --git a/legacy/evas/src/modules/engines/wayland_shm/Makefile.am b/legacy/evas/src/modules/engines/wayland_shm/Makefile.am
index 111862585b..9a1ea99aa2 100644
--- 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@
diff --git a/legacy/evas/src/modules/loaders/bmp/Makefile.am b/legacy/evas/src/modules/loaders/bmp/Makefile.am
index 1ab312885a..06861e2d01 100644
--- 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
 
diff --git a/legacy/evas/src/modules/loaders/edb/Makefile.am b/legacy/evas/src/modules/loaders/edb/Makefile.am
index eeece3f820..d74f3b7065 100644
--- 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
 
diff --git a/legacy/evas/src/modules/loaders/eet/Makefile.am b/legacy/evas/src/modules/loaders/eet/Makefile.am
index 2a3f92ffc0..7e954e9a49 100644
--- 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
 
diff --git a/legacy/evas/src/modules/loaders/generic/Makefile.am b/legacy/evas/src/modules/loaders/generic/Makefile.am
index 31975b84fb..6da5d91778 100644
--- 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
 
diff --git a/legacy/evas/src/modules/loaders/gif/Makefile.am b/legacy/evas/src/modules/loaders/gif/Makefile.am
index aa5c240de2..cb666c1fc3 100644
--- 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
 
diff --git a/legacy/evas/src/modules/loaders/ico/Makefile.am b/legacy/evas/src/modules/loaders/ico/Makefile.am
index a2d722d151..65983038ac 100644
--- 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
 
diff --git a/legacy/evas/src/modules/loaders/jpeg/Makefile.am b/legacy/evas/src/modules/loaders/jpeg/Makefile.am
index a5eb2ae739..03e831c43b 100644
--- 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
 
diff --git a/legacy/evas/src/modules/loaders/pmaps/Makefile.am b/legacy/evas/src/modules/loaders/pmaps/Makefile.am
index ff7fdf8b17..366f8900ca 100644
--- 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
 
diff --git a/legacy/evas/src/modules/loaders/png/Makefile.am b/legacy/evas/src/modules/loaders/png/Makefile.am
index 6958f02138..08574ee956 100644
--- 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
 
diff --git a/legacy/evas/src/modules/loaders/psd/Makefile.am b/legacy/evas/src/modules/loaders/psd/Makefile.am
index 7ce9f2c716..5715ed19a0 100644
--- 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
 
diff --git a/legacy/evas/src/modules/loaders/svg/Makefile.am b/legacy/evas/src/modules/loaders/svg/Makefile.am
index efb3e46437..976b3a8ea4 100644
--- 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
 
diff --git a/legacy/evas/src/modules/loaders/tga/Makefile.am b/legacy/evas/src/modules/loaders/tga/Makefile.am
index eeec57a104..3d67668357 100644
--- 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
 
diff --git a/legacy/evas/src/modules/loaders/tiff/Makefile.am b/legacy/evas/src/modules/loaders/tiff/Makefile.am
index d44643c927..9adb737cdb 100644
--- 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
 
diff --git a/legacy/evas/src/modules/loaders/wbmp/Makefile.am b/legacy/evas/src/modules/loaders/wbmp/Makefile.am
index e5badaf982..109a02b2f1 100644
--- 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
 
diff --git a/legacy/evas/src/modules/loaders/xpm/Makefile.am b/legacy/evas/src/modules/loaders/xpm/Makefile.am
index 219803b019..1213de5ec8 100644
--- 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
 
diff --git a/legacy/evas/src/modules/savers/edb/Makefile.am b/legacy/evas/src/modules/savers/edb/Makefile.am
index b3cc95c842..e5f7e3cd04 100644
--- 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
 
diff --git a/legacy/evas/src/modules/savers/eet/Makefile.am b/legacy/evas/src/modules/savers/eet/Makefile.am
index 679bad040c..6d62167774 100644
--- 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
 
diff --git a/legacy/evas/src/modules/savers/jpeg/Makefile.am b/legacy/evas/src/modules/savers/jpeg/Makefile.am
index 90afcca04d..c1c710450b 100644
--- 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
 
diff --git a/legacy/evas/src/modules/savers/png/Makefile.am b/legacy/evas/src/modules/savers/png/Makefile.am
index e25eeabdc5..43eb5b2241 100644
--- 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
 
diff --git a/legacy/evas/src/modules/savers/tiff/Makefile.am b/legacy/evas/src/modules/savers/tiff/Makefile.am
index 4730018c75..c0f80393c5 100644
--- 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
 
diff --git a/legacy/evas/src/tests/Makefile.am b/legacy/evas/src/tests/Makefile.am
index c659106e24..d1790d4231 100644
--- 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