From d52faf7d3112890a1f3fd2c841ad61db1b21ee29 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Thu, 13 Mar 2014 09:55:12 +0000
Subject: [PATCH] Eolian: Set eolian_flags in .pc files and ship .eo files.

---
 pc/ecore.pc.in       | 2 ++
 pc/edje.pc.in        | 2 ++
 pc/eo.pc.in          | 2 ++
 pc/evas.pc.in        | 2 ++
 src/Makefile_Eo.am   | 6 +++++-
 src/Makefile_Evas.am | 6 +++++-
 6 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/pc/ecore.pc.in b/pc/ecore.pc.in
index b6b5516450..729f98fa91 100644
--- a/pc/ecore.pc.in
+++ b/pc/ecore.pc.in
@@ -4,6 +4,8 @@ libdir=@libdir@
 includedir=@includedir@
 modules=@libdir@/ecore
 module_arch=@MODULE_ARCH@
+eoincludedir=@datarootdir@/eolian/include
+eolian_flags=-I${eoincludedir}/ecore-@VMAJ@
 
 Name: ecore
 Description: Ecore event abstraction library
diff --git a/pc/edje.pc.in b/pc/edje.pc.in
index 3776fe898b..825c934ef6 100644
--- a/pc/edje.pc.in
+++ b/pc/edje.pc.in
@@ -11,6 +11,8 @@ vmin=@VMIN@
 vmic=@VMIC@
 multisense=@want_multisense@
 physics=@want_physics@
+eoincludedir=@datarootdir@/eolian/include
+eolian_flags=-I${eoincludedir}/edje-@VMAJ@
 
 Name: edje
 Description: Enlightened graphical design and layout engine.
diff --git a/pc/eo.pc.in b/pc/eo.pc.in
index 99750978f7..5d737a30de 100644
--- a/pc/eo.pc.in
+++ b/pc/eo.pc.in
@@ -2,6 +2,8 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+eoincludedir=@datarootdir@/eolian/include
+eolian_flags=-I${eoincludedir}/eo-@VMAJ@
 
 Name: Eo
 Description: EFL's generic object system library.
diff --git a/pc/evas.pc.in b/pc/evas.pc.in
index 4ca02758f4..a0f481418b 100644
--- a/pc/evas.pc.in
+++ b/pc/evas.pc.in
@@ -2,6 +2,8 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+eoincludedir=@datarootdir@/eolian/include
+eolian_flags=-I${eoincludedir}/evas-@VMAJ@
 
 Name: evas
 Description: Evas canvas display library
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index 0e87e78d88..230ff9e794 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -19,10 +19,14 @@ lib_eo_libeo_la_LIBADD = @EO_LIBS@
 lib_eo_libeo_la_DEPENDENCIES = @EO_INTERNAL_LIBS@
 lib_eo_libeo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
 
-EXTRA_DIST += \
+eoeolianfilesdir = $(datadir)/eolian/include/eo-@VMAJ@
+eoeolianfiles_DATA = \
               lib/eo/eo_base.eo \
               lib/eo/eo_abstract_class.eo
 
+EXTRA_DIST += \
+              ${eoeolianfiles_DATA}
+
 ### Unit tests
 
 if EFL_ENABLE_TESTS
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 9ff154a601..8cd3028bf6 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -35,7 +35,8 @@ BUILT_SOURCES += \
                  lib/evas/canvas/evas_out.eo.c \
                  lib/evas/canvas/evas_out.eo.h
 
-EXTRA_DIST += \
+evaseolianfilesdir = $(datadir)/eolian/include/evas-@VMAJ@
+evaseolianfiles_DATA = \
               lib/evas/canvas/evas_object.eo \
               lib/evas/canvas/evas_line.eo \
               lib/evas/canvas/evas_polygon.eo \
@@ -53,6 +54,9 @@ EXTRA_DIST += \
               lib/evas/canvas/evas_image.eo \
               lib/evas/canvas/evas_out.eo 
 
+EXTRA_DIST += \
+              ${evaseolianfiles_DATA}
+
 lib_LTLIBRARIES += lib/evas/libevas.la
 noinst_LTLIBRARIES =