kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Evas: Fix make check after ector gl work 

evas_ector is not meant to be public so remove it from
the C++ bindings
This commit is contained in:
Jean-Philippe Andre 2016-01-04 12:21:03 +09:00
parent 9e0670a705
commit a02c810059
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Makefile_Evas.am
View File

@ -1,7 +1,7 @@
### Library
evas_eolian_files = \
evas_public_eo_files = \
lib/evas/canvas/evas_object.eo \
lib/evas/canvas/evas_line.eo \
lib/evas/canvas/evas_polygon.eo \
@ -42,6 +42,9 @@ evas_eolian_files = \
lib/evas/canvas/efl_vg_gradient_radial.eo \
lib/evas/canvas/efl_vg_gradient_linear.eo \
lib/evas/canvas/evas_filter.eo \
$(NULL)
evas_eolian_files = $(evas_public_eo_files) \
lib/evas/include/evas_ector_buffer.eo \
$(NULL)
@ -2245,7 +2248,7 @@ tests/evas/images/bg_gray.png
if HAVE_ELUA
evas_eolian_lua = $(evas_eolian_files:%.eo=%.eo.lua)
evas_eolian_lua = $(evas_public_eo_files:%.eo=%.eo.lua)
generated_evas_lua_all = $(evas_eolian_lua)
@ -2266,7 +2269,7 @@ dist_installed_evasfilters_DATA = $(evas_filters_lua)
if HAVE_JS
generated_evas_js_bindings = $(evas_eolian_files:%.eo=%.eo.js.cc)
generated_evas_js_bindings = $(evas_public_eo_files:%.eo=%.eo.js.cc)
CLEANFILES += $(generated_evas_js_bindings)

5
src/Makefile_Evas_Cxx.am
View File

@ -3,8 +3,8 @@ if HAVE_CXX11
### Generated headers
generated_evas_canvas_cxx_bindings = $(evas_eolian_files:%.eo=%.eo.hh)
generated_evas_canvas_cxx_impl_bindings = $(evas_eolian_files:%.eo=%.eo.impl.hh)
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)
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
@ -36,6 +36,7 @@ tests_evas_cxx_cxx_compile_test_SOURCES = tests/evas_cxx/cxx_compile_test.cc
tests_evas_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_builddir)/src/lib/efl/interfaces/ \
-I$(top_builddir)/src/lib/evas/canvas/ \
-I$(top_builddir)/src/lib/evas/include/ \
-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/evas_cxx\" \
-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/evas_cxx\" \
@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @EO_CXX_CFLAGS@ \