jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=596c15af37b12ae5fd10dae5fe8037cdcf8529f4
commit 596c15af37b12ae5fd10dae5fe8037cdcf8529f4
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Wed Jan 6 17:18:57 2016 +0900
Evas: Fix the build... I hope
I forgot to modify some lines. Of course randomness made things
work for me.
---
src/Makefile_Evas.am | 20 ++++++++------------
src/Makefile_Evas_Cxx.am | 4 ++--
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index a38e25f..4355a38 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -51,16 +51,17 @@ evas_eolian_priv_files = \
evas_eolian_type_files = \
lib/evas/canvas/evas_types.eot
-evas_eolian_pub_c = $(evas_eolian_pub_files:%.eo=%.eo.c)
-evas_eolian_priv_c = $(evas_eolian_priv_files:%.eo=%.eo.h)
+evas_eolian_priv_c = $(evas_eolian_priv_files:%.eo=%.eo.c)
+evas_eolian_priv_h = $(evas_eolian_priv_files:%.eo=%.eo.h)
evas_eolian_pub_c = $(evas_eolian_pub_files:%.eo=%.eo.c)
evas_eolian_pub_h = $(evas_eolian_pub_files:%.eo=%.eo.h) \
$(evas_eolian_pub_files:%.eo=%.eo.legacy.h) \
$(evas_eolian_type_files:%.eot=%.eot.h)
-evas_eolian_files = $(evas_eolian_pub_files) $(evas_eolian_priv_files)
-evas_eolian_c = $(evas_eolian_pub_c) $(evas_eolian_pub_h)
+evas_eolian_files = $(evas_eolian_pub_files) $(evas_eolian_priv_files)
$(evas_eolian_type_files)
+evas_eolian_c = $(evas_eolian_pub_c) $(evas_eolian_priv_c)
+evas_eolian_h = $(evas_eolian_pub_h) $(evas_eolian_priv_h)
BUILT_SOURCES += \
$(evas_eolian_c) \
@@ -71,9 +72,7 @@ CLEANFILES += \
$(evas_eolian_h)
evaseolianfilesdir = $(datadir)/eolian/include/evas-@VMAJ@
-evaseolianfiles_DATA = \
- $(evas_eolian_files) \
- $(evas_eolian_type_files)
+evaseolianfiles_DATA = $(evas_eolian_files)
EXTRA_DIST += \
${evaseolianfiles_DATA}
@@ -91,13 +90,10 @@ lib/evas/Evas_GL.h \
lib/evas/Evas_Loader.h
installed_evascanvasheadersdir = $(includedir)/evas-@VMAJ@/canvas
-nodist_installed_evascanvasheaders_DATA = \
- $(evas_eolian_pub_h)
+nodist_installed_evascanvasheaders_DATA = $(evas_eolian_pub_h)
+noinst_DATA = $(evas_eolian_priv_h)
noinst_HEADERS = \
-$(evas_eolian_priv_h)
-
-noinst_HEADERS += \
lib/evas/include/evas_inline.x \
lib/evas/include/evas_private.h \
lib/evas/include/evas_options.h \
diff --git a/src/Makefile_Evas_Cxx.am b/src/Makefile_Evas_Cxx.am
index 61e11dd..40cacee 100644
--- a/src/Makefile_Evas_Cxx.am
+++ b/src/Makefile_Evas_Cxx.am
@@ -3,8 +3,8 @@ if HAVE_CXX11
### Generated headers
-generated_evas_canvas_cxx_bindings = $(evas_public_eo_files:%.eo=%.eo.hh)
-generated_evas_canvas_cxx_impl_bindings =
$(evas_public_eo_files:%.eo=%.eo.impl.hh)
+generated_evas_canvas_cxx_bindings = $(evas_eolian_pub_files:%.eo=%.eo.hh)
+generated_evas_canvas_cxx_impl_bindings =
$(evas_eolian_pub_files:%.eo=%.eo.impl.hh)
lib/evas/Evas.hh: $(generated_evas_canvas_cxx_bindings)
@echo @ECHO_E@ "#ifndef EFL_CXX_EVAS_HH\n#define EFL_CXX_EVAS_HH\n" >
$(top_builddir)/src/lib/evas/Evas.hh
--
