From 11403a4ec408b060b984c711ed850531b7925968 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Andre <jp.andre@samsung.com>
Date: Tue, 12 Apr 2016 14:11:37 +0900
Subject: [PATCH] Elm: Compile in box and grid

Ui.Grid is definitely not complete.
Ui.Box still needs a few adjustments:
- alternative layout
- aspect ratio support
- RTL support
- remove evas box
---
 src/Makefile_Elementary.am         | 17 ++++++++++++++---
 src/lib/elementary/Elementary.h.in |  4 ++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 00427baf48..0cc250a9c3 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -118,7 +118,10 @@ elm_eolian_files = \
 	lib/elementary/elm_list_item.eo \
 	lib/elementary/elm_toolbar_item.eo \
 	lib/elementary/elm_diskselector_item.eo \
-	lib/elementary/elm_popup_item.eo
+	lib/elementary/elm_popup_item.eo \
+	lib/elementary/efl_ui_box.eo \
+	lib/elementary/efl_ui_grid.eo \
+	$(NULL)
 
 elm_eolian_type_files = \
 	lib/elementary/elm_general.eot
@@ -492,7 +495,10 @@ includesub_HEADERS = \
 	lib/elementary/elm_win_eo.h \
 	lib/elementary/elm_win_legacy.h \
 	lib/elementary/elm_win_standard.h \
-	lib/elementary/elm_helper.h
+	lib/elementary/elm_helper.h \
+	lib/elementary/efl_ui_box_private.h \
+	$(NULL)
+
 includesubdir = $(includedir)/elementary-@VMAJ@/
 
 lib_elementary_libelementary_la_SOURCES = \
@@ -617,7 +623,11 @@ lib_elementary_libelementary_la_SOURCES = \
 	lib/elementary/els_box.c \
 	lib/elementary/els_cursor.c \
 	lib/elementary/els_tooltip.c \
-	lib/elementary/elu_ews_wm.c
+	lib/elementary/elu_ews_wm.c \
+	lib/elementary/efl_ui_box.c \
+	lib/elementary/efl_ui_box_layout.c \
+	lib/elementary/efl_ui_grid.c \
+	$(NULL)
 
 lib_elementary_libelementary_la_CFLAGS = @ELEMENTARY_CFLAGS@
 lib_elementary_libelementary_la_LIBADD = \
@@ -768,6 +778,7 @@ bin/elementary/test_toolbar.c \
 bin/elementary/test_tooltip.c \
 bin/elementary/test_transit.c \
 bin/elementary/test_transit_bezier.c \
+bin/elementary/test_ui_box.c \
 bin/elementary/test_video.c \
 bin/elementary/test_weather.c \
 bin/elementary/test_web.c \
diff --git a/src/lib/elementary/Elementary.h.in b/src/lib/elementary/Elementary.h.in
index 1723c5844e..686502b69a 100644
--- a/src/lib/elementary/Elementary.h.in
+++ b/src/lib/elementary/Elementary.h.in
@@ -268,6 +268,10 @@ EAPI extern Elm_Version *elm_version;
 #include <elm_win.h>
 #include <elm_win_standard.h>
 
+#ifdef EFL_EO_API_SUPPORT
+# include <efl_ui_box.eo.h>
+#endif
+
 /* include deprecated calls last of all */
 #include <elm_deprecated.h>