jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9110d490e3e831064101e2c9ccdc637d8459ee8e
commit 9110d490e3e831064101e2c9ccdc637d8459ee8e
Author: Tom Hacohen <t...@stosb.com>
Date: Thu Mar 6 09:13:38 2014 +0000
Fix evas compilation and installation.
---
src/Makefile_Evas.am | 8 +++++---
src/lib/evas/Evas_Eo.h | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index adebb2c..ffe1522 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -18,8 +18,11 @@ lib/evas/Evas_Common.h \
lib/evas/Evas_Eo.h \
lib/evas/Evas_Legacy.h \
lib/evas/Evas_GL.h \
-lib/evas/Evas_Loader.h \
-lib/evas/canvas/evas_line.eo.h
+lib/evas/Evas_Loader.h
+
+installed_evascanvasheadersdir = $(includedir)/evas-@VMAJ@/canvas
+dist_installed_evascanvasheaders_DATA = \
+ lib/evas/canvas/evas_line.eo.h
noinst_HEADERS = \
lib/evas/include/evas_inline.x \
@@ -212,7 +215,6 @@ lib/evas/common/evas_font_ot.h
lib_evas_libevas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/common \
--I$(top_builddir)/src/lib/evas/canvas \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/lib/evas/file \
-I$(top_srcdir)/src/lib/evas/include \
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index c685ea5..9c95b2f 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -2917,7 +2917,7 @@ enum
*
* @{
*/
-#include "evas_line.eo.h"
+#include "canvas/evas_line.eo.h"
#if 0
#define EVAS_OBJ_LINE_CLASS evas_object_line_class_get()
--
