14 files changed, 28 insertions, 28 deletions
diff --git a/src/benchmarks/eina/Makefile.am b/src/benchmarks/eina/Makefile.am
index d4c39e5dc..fd44ac0f0 100644
--- a/src/benchmarks/eina/Makefile.am
+++ b/src/benchmarks/eina/Makefile.am
@@ -1,8 +1,8 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
--I$(top_srcdir)/src/include/eina \
--I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
 -DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
 -DCITYHASH_BENCH \
 @EINA_CFLAGS@ \
diff --git a/src/benchmarks/eo/Makefile.am b/src/benchmarks/eo/Makefile.am
index e0f9e4c0f..737fcc369 100644
--- a/src/benchmarks/eo/Makefile.am
+++ b/src/benchmarks/eo/Makefile.am
@@ -2,9 +2,9 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
--I$(top_srcdir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eo \
--I$(top_builddir)/src/include/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eo \
 @EFL_EO_BUILD@ \
 @EO_CFLAGS@
diff --git a/src/examples/eet/Makefile.am b/src/examples/eet/Makefile.am
index 5ac3ad851..121f23711 100644
--- a/src/examples/eet/Makefile.am
+++ b/src/examples/eet/Makefile.am
@@ -1,8 +1,8 @@
 MAINTAINERCLEANFILES = Makefile.in
 AM_CPPFLAGS = \
--I$(top_srcdir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eet \
--I$(top_builddir)/src/include/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eet \
 @EET_CFLAGS@
 
diff --git a/src/examples/eina/Makefile.am b/src/examples/eina/Makefile.am
index 8f67f266c..97671a429 100644
--- a/src/examples/eina/Makefile.am
+++ b/src/examples/eina/Makefile.am
@@ -2,8 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I. \
--I$(top_srcdir)/src/include/eina \
--I$(top_builddir)/src/include/eina
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina
 
 LDADD = $(top_builddir)/src/lib/eina/libeina.la
 
diff --git a/src/lib/eo/Makefile.am b/src/lib/eo/Makefile.am
index 0580bc048..f507230e7 100644
--- a/src/lib/eo/Makefile.am
+++ b/src/lib/eo/Makefile.am
@@ -1,9 +1,9 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
--I$(top_srcdir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eo \
--I$(top_builddir)/src/include/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eo \
 @EFL_EO_BUILD@ \
 @EO_CFLAGS@
diff --git a/src/modules/eina/mp/buddy/Makefile.am b/src/modules/eina/mp/buddy/Makefile.am
index e43db1aa8..4dc40aaf0 100644
--- a/src/modules/eina/mp/buddy/Makefile.am
+++ b/src/modules/eina/mp/buddy/Makefile.am
@@ -2,8 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I. \
--I$(top_srcdir)/src/include/eina \
--I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
 @EFL_EINA_BUILD@
diff --git a/src/modules/eina/mp/chained_pool/Makefile.am b/src/modules/eina/mp/chained_pool/Makefile.am
index 4e9344581..9c701638b 100644
--- a/src/modules/eina/mp/chained_pool/Makefile.am
+++ b/src/modules/eina/mp/chained_pool/Makefile.am
@@ -2,8 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I. \
--I$(top_srcdir)/src/include/eina \
--I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
 @EFL_EINA_BUILD@ \
diff --git a/src/modules/eina/mp/ememoa_fixed/Makefile.am b/src/modules/eina/mp/ememoa_fixed/Makefile.am
index 50a4115ad..09c12ca36 100644
--- a/src/modules/eina/mp/ememoa_fixed/Makefile.am
+++ b/src/modules/eina/mp/ememoa_fixed/Makefile.am
@@ -2,8 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I. \
--I$(top_srcdir)/src/include/eina \
--I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
 @EMEMOA_CFLAGS@ \
diff --git a/src/modules/eina/mp/ememoa_unknown/Makefile.am b/src/modules/eina/mp/ememoa_unknown/Makefile.am
index 971313711..5ab88a687 100644
--- a/src/modules/eina/mp/ememoa_unknown/Makefile.am
+++ b/src/modules/eina/mp/ememoa_unknown/Makefile.am
@@ -2,8 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I. \
--I$(top_srcdir)/src/include/eina \
--I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
 @EMEMOA_CFLAGS@ \
diff --git a/src/modules/eina/mp/fixed_bitmap/Makefile.am b/src/modules/eina/mp/fixed_bitmap/Makefile.am
index 214367600..784b74028 100644
--- a/src/modules/eina/mp/fixed_bitmap/Makefile.am
+++ b/src/modules/eina/mp/fixed_bitmap/Makefile.am
@@ -2,8 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I. \
--I$(top_srcdir)/src/include/eina \
--I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
 @EFL_EINA_BUILD@
diff --git a/src/modules/eina/mp/one_big/Makefile.am b/src/modules/eina/mp/one_big/Makefile.am
index 6a5efa531..3fa4ec92a 100644
--- a/src/modules/eina/mp/one_big/Makefile.am
+++ b/src/modules/eina/mp/one_big/Makefile.am
@@ -2,8 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I. \
--I$(top_srcdir)/src/include/eina \
--I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
 @EFL_EINA_BUILD@ \
diff --git a/src/modules/eina/mp/pass_through/Makefile.am b/src/modules/eina/mp/pass_through/Makefile.am
index 6d5f1687e..28ff9e992 100644
--- a/src/modules/eina/mp/pass_through/Makefile.am
+++ b/src/modules/eina/mp/pass_through/Makefile.am
@@ -2,8 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I. \
--I$(top_srcdir)/src/include/eina \
--I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
 @EFL_EINA_BUILD@
diff --git a/src/tests/eet/Makefile.am b/src/tests/eet/Makefile.am
index 2f72a2a82..17451ad03 100644
--- a/src/tests/eet/Makefile.am
+++ b/src/tests/eet/Makefile.am
@@ -1,9 +1,9 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
--I$(top_srcdir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eet \
--I$(top_builddir)/src/include/eina \
+-I$(top_builddir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eet \
 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet\" \
 @CHECK_CFLAGS@ \
diff --git a/src/tests/eina/Makefile.am b/src/tests/eina/Makefile.am
index 72f87d891..db80e0bb3 100644
--- a/src/tests/eina/Makefile.am
+++ b/src/tests/eina/Makefile.am
@@ -1,8 +1,8 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
--I$(top_srcdir)/src/include/eina \
--I$(top_builddir)/src/include/eina \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
 -DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
 @CHECK_CFLAGS@ \
 @EINA_CFLAGS@