summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-03-06 09:13:38 +0000
committerTom Hacohen <tom@stosb.com>2014-03-06 09:13:38 +0000
commitf8f7ff25df96ae7154011e8555a05e1f6f9661a4 (patch)
tree46d81ee955c55d08bd4d1d37a91649c70b07a466
parente252e796b7ecbf7617d0a6c146d477430a548ec8 (diff)
downloadefl-devs/jackdanielz/Make_Eolian.tar.gz
Fix evas compilation and installation.devs/jackdanielz/Make_Eolian
-rw-r--r--src/Makefile_Evas.am8
-rw-r--r--src/lib/evas/Evas_Eo.h2
2 files changed, 6 insertions, 4 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index b0e95bac11..33f17b97d7 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 c685ea525b..9c95b2f525 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()