cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d78620e00191c5268d6ab2271db7949228d06e0f
commit d78620e00191c5268d6ab2271db7949228d06e0f
Author: Lauro Moura <lauromo...@expertisesolutions.com.br>
Date: Tue Mar 6 17:42:00 2018 -0800
elm: fix location of legacy include for elm_code.
Summary:
Instead of including the legacy header on the main header, just include
it where it is actually used (diff_widget.c), like in elm_code_widget.c.
Test Plan: Try to compile edi with the tarball from `make dist`. It should
not fail with elm_code related errors.
Reviewers: raster, stefan_schmidt, felipealmeida
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D5807
Signed-off-by: Cedric Bail <ced...@osg.samsung.com>
---
src/Makefile_Elementary.am | 1 -
src/lib/elementary/elm_code.h | 1 -
src/lib/elementary/elm_code_diff_widget.c | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 96fd075f4c..d4802313e6 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -381,7 +381,6 @@ includesunstable_HEADERS = \
lib/elementary/elm_code.h \
lib/elementary/elm_code_widget_legacy.h \
lib/elementary/elm_code_widget_selection.h \
- lib/elementary/elm_code_widget_legacy.eo.h \
lib/elementary/elm_code_diff_widget.h \
lib/elementary/elm_code_common.h \
lib/elementary/elm_code_line.h \
diff --git a/src/lib/elementary/elm_code.h b/src/lib/elementary/elm_code.h
index 3a0887b9cd..9ffd0e9ad1 100644
--- a/src/lib/elementary/elm_code.h
+++ b/src/lib/elementary/elm_code.h
@@ -11,7 +11,6 @@
#include "elm_code_parse.h"
#include "elm_code_syntax.h"
#include "elm_code_widget.eo.h"
-#include "elm_code_widget_legacy.eo.h"
#include "elm_code_widget_legacy.h"
#include "elm_code_widget_selection.h"
#include "elm_code_diff_widget.h"
diff --git a/src/lib/elementary/elm_code_diff_widget.c
b/src/lib/elementary/elm_code_diff_widget.c
index d8ec1495de..593f044bc7 100644
--- a/src/lib/elementary/elm_code_diff_widget.c
+++ b/src/lib/elementary/elm_code_diff_widget.c
@@ -5,6 +5,7 @@
#include "Elementary.h"
#include "elm_code_private.h"
+#include "elm_code_widget_legacy.eo.h"
#define _ELM_CODE_DIFF_WIDGET_LEFT "diffwidgetleft"
#define _ELM_CODE_DIFF_WIDGET_RIGHT "diffwidgetright"
--
