tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7c187acbf2cbebc1af2ffe496ac398a5d51f9fce
commit 7c187acbf2cbebc1af2ffe496ac398a5d51f9fce
Author: Tom Hacohen <t...@stosb.com>
Date: Sun Jun 5 10:40:02 2016 +0100
Generic modules: Fix out of source build.
Autotools really really really sucks.
Because of the above, we need to manually list both source dirs and
build dirs, because some of the include files are in the source dirs and
some are in the build dir (generated).
---
src/Makefile_Emotion.am | 3 ++-
src/Makefile_Evas.am | 11 +++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index a4746c7..69f38e3 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -366,11 +366,12 @@ emotiongenericplayers_PROGRAMS += generic/emotion/vlc/vlc
generic_emotion_vlc_vlc_SOURCES = generic/emotion/vlc/emotion_generic_vlc.c
generic_emotion_vlc_vlc_CPPFLAGS = \
-I$(top_srcdir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
-I$(top_srcdir)/src/lib/eo \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_srcdir)/src/modules/emotion/generic \
--I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index a72f809..bf3208f 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -2404,12 +2404,16 @@ generic/evas/common/shmfile.c \
generic/evas/common/timeout.c
generic_evas_pdf_evas_image_loader_pdf_CFLAGS = \
-I$(top_srcdir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
-I$(top_srcdir)/src/generic/evas/common \
@POPPLER_CFLAGS@
generic_evas_pdf_evas_image_loader_pdf_CXXFLAGS = \
-I$(top_srcdir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
-I$(top_srcdir)/src/generic/evas/common \
@POPPLER_CFLAGS@
generic_evas_pdf_evas_image_loader_pdf_LDADD = @USE_EINA_LIBS@ @POPPLER_LIBS@
@SHM_LIBS@
@@ -2451,7 +2455,9 @@ generic_evas_ps_evas_image_loader_ps_LDADD =
@USE_EINA_LIBS@ @SPECTRE_LIBS@ @SHM
generic_evas_ps_evas_image_loader_ps_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
generic_evas_ps_evas_image_loader_ps_CFLAGS = \
-I$(top_srcdir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
-I$(top_srcdir)/src/generic/evas/common
endif
@@ -2468,7 +2474,9 @@ generic_evas_raw_evas_image_loader_raw_LDADD =
@USE_EINA_LIBS@ @SHM_LIBS@ @LIBRA
generic_evas_raw_evas_image_loader_raw_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
generic_evas_raw_evas_image_loader_raw_CFLAGS = \
-I$(top_srcdir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
-I$(top_srcdir)/src/generic/evas/common \
@LIBRAW_CFLAGS@
@@ -2505,7 +2513,9 @@ generic/evas/common/shmfile.c \
generic/evas/common/timeout.c
generic_evas_svg_evas_image_loader_svg_CFLAGS = \
-I$(top_srcdir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
-I$(top_srcdir)/src/generic/evas/common \
@RSVG_CFLAGS@
generic_evas_svg_evas_image_loader_svg_LDADD = @USE_EINA_LIBS@ @RSVG_LIBS@
@SHM_LIBS@ -lm
@@ -2529,6 +2539,7 @@ generic/evas/common/timeout.c
generic_evas_xcf_evas_image_loader_xcf_CFLAGS = \
-I$(top_srcdir)/src/lib/efl \
-I$(top_srcdir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eina \
-I$(top_srcdir)/src/generic/evas/common
generic_evas_xcf_evas_image_loader_xcf_LDADD = @USE_EINA_LIBS@ @SHM_LIBS@ -lm
-lz
generic_evas_xcf_evas_image_loader_xcf_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
--
