summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-05-23 12:01:30 -0300
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-05-23 15:05:50 -0300
commite3c8b280c639058c54f5576f189d0dc288105fc7 (patch)
treee313fa05bd9d2b2cb88623f6adea2c3b396b66e8
parent930f39b91b12b311f40cd96b4cf2e85085b01832 (diff)
c++: Reorganized C++ binding generation
Moved all generation to a single Makefile_Cxx.am file instead of throughout the whole project. And fixed C++ generation on Elementary after elm merge.
-rw-r--r--m4/efl.m42
-rw-r--r--src/Makefile.am12
-rw-r--r--src/Makefile_Cxx.am351
-rw-r--r--src/Makefile_Ecore.am7
-rw-r--r--src/Makefile_Ecore_Audio.am1
-rw-r--r--src/Makefile_Ecore_Audio_Cxx.am52
-rw-r--r--src/Makefile_Ecore_Cxx.am66
-rw-r--r--src/Makefile_Edje.am5
-rw-r--r--src/Makefile_Edje_Cxx.am44
-rw-r--r--src/Makefile_Eet_Cxx.am35
-rw-r--r--src/Makefile_Efl.am4
-rw-r--r--src/Makefile_Efl_Cxx.am24
-rw-r--r--src/Makefile_Eina_Cxx.am101
-rw-r--r--src/Makefile_Eio.am19
-rw-r--r--src/Makefile_Eio_Cxx.am23
-rw-r--r--src/Makefile_Eldbus.am5
-rw-r--r--src/Makefile_Eldbus_Cxx.am73
-rw-r--r--src/Makefile_Elementary.am5
-rw-r--r--src/Makefile_Elementary_Cxx.am54
-rw-r--r--src/Makefile_Eo.am7
-rw-r--r--src/Makefile_Eo_Cxx.am34
-rw-r--r--src/Makefile_Eolian_Cxx.am1
-rw-r--r--src/Makefile_Evas.am5
-rw-r--r--src/Makefile_Evas_Cxx.am48
-rw-r--r--src/bin/eolian_cxx/type_lookup_table.cc18
-rw-r--r--src/bindings/cxx/ecore_cxx/Ecore.hh (renamed from src/bindings/ecore_cxx/Ecore.hh)0
-rw-r--r--src/bindings/cxx/eet_cxx/Eet.hh (renamed from src/bindings/eet_cxx/Eet.hh)0
-rw-r--r--src/bindings/cxx/eet_cxx/eet_composite.hh (renamed from src/bindings/eet_cxx/eet_composite.hh)0
-rw-r--r--src/bindings/cxx/eet_cxx/eet_register.hh (renamed from src/bindings/eet_cxx/eet_register.hh)0
-rw-r--r--src/bindings/cxx/eet_cxx/eet_type.hh (renamed from src/bindings/eet_cxx/eet_type.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/Eina.hh (renamed from src/bindings/eina_cxx/Eina.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_accessor.hh (renamed from src/bindings/eina_cxx/eina_accessor.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_array.hh (renamed from src/bindings/eina_cxx/eina_array.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_clone_allocators.hh (renamed from src/bindings/eina_cxx/eina_clone_allocators.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_eo_concrete_fwd.hh (renamed from src/bindings/eina_cxx/eina_eo_concrete_fwd.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_error.hh (renamed from src/bindings/eina_cxx/eina_error.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_fold.hh (renamed from src/bindings/eina_cxx/eina_fold.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_function.hh (renamed from src/bindings/eina_cxx/eina_function.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_inarray.hh (renamed from src/bindings/eina_cxx/eina_inarray.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_inlist.hh (renamed from src/bindings/eina_cxx/eina_inlist.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_integer_sequence.hh (renamed from src/bindings/eina_cxx/eina_integer_sequence.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_iterator.hh (renamed from src/bindings/eina_cxx/eina_iterator.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_list.hh (renamed from src/bindings/eina_cxx/eina_list.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_lists_auxiliary.hh (renamed from src/bindings/eina_cxx/eina_lists_auxiliary.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_log.hh (renamed from src/bindings/eina_cxx/eina_log.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_logical.hh (renamed from src/bindings/eina_cxx/eina_logical.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_optional.hh (renamed from src/bindings/eina_cxx/eina_optional.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_pp.hh (renamed from src/bindings/eina_cxx/eina_pp.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_ptrarray.hh (renamed from src/bindings/eina_cxx/eina_ptrarray.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_ptrlist.hh (renamed from src/bindings/eina_cxx/eina_ptrlist.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_range_types.hh (renamed from src/bindings/eina_cxx/eina_range_types.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_ref.hh (renamed from src/bindings/eina_cxx/eina_ref.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_string_view.hh (renamed from src/bindings/eina_cxx/eina_string_view.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_stringshare.hh (renamed from src/bindings/eina_cxx/eina_stringshare.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_thread.hh (renamed from src/bindings/eina_cxx/eina_thread.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_throw.hh (renamed from src/bindings/eina_cxx/eina_throw.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_tuple.hh (renamed from src/bindings/eina_cxx/eina_tuple.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_tuple_c.hh (renamed from src/bindings/eina_cxx/eina_tuple_c.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_tuple_unwrap.hh (renamed from src/bindings/eina_cxx/eina_tuple_unwrap.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_type_traits.hh (renamed from src/bindings/eina_cxx/eina_type_traits.hh)0
-rw-r--r--src/bindings/cxx/eina_cxx/eina_value.hh (renamed from src/bindings/eina_cxx/eina_value.hh)0
-rw-r--r--src/bindings/cxx/eldbus_cxx/Eldbus.hh (renamed from src/bindings/eldbus_cxx/Eldbus.hh)0
-rw-r--r--src/bindings/cxx/eldbus_cxx/eldbus_basic.hh (renamed from src/bindings/eldbus_cxx/eldbus_basic.hh)0
-rw-r--r--src/bindings/cxx/eldbus_cxx/eldbus_error.hh (renamed from src/bindings/eldbus_cxx/eldbus_error.hh)0
-rw-r--r--src/bindings/cxx/eldbus_cxx/eldbus_freedesktop.hh (renamed from src/bindings/eldbus_cxx/eldbus_freedesktop.hh)0
-rw-r--r--src/bindings/cxx/eldbus_cxx/eldbus_integer_sequence.hh (renamed from src/bindings/eldbus_cxx/eldbus_integer_sequence.hh)0
-rw-r--r--src/bindings/cxx/eldbus_cxx/eldbus_message.hh (renamed from src/bindings/eldbus_cxx/eldbus_message.hh)0
-rw-r--r--src/bindings/cxx/eldbus_cxx/eldbus_message_arguments.hh (renamed from src/bindings/eldbus_cxx/eldbus_message_arguments.hh)0
-rw-r--r--src/bindings/cxx/eldbus_cxx/eldbus_proxy_call.hh (renamed from src/bindings/eldbus_cxx/eldbus_proxy_call.hh)0
-rw-r--r--src/bindings/cxx/eldbus_cxx/eldbus_raw_tuple.hh (renamed from src/bindings/eldbus_cxx/eldbus_raw_tuple.hh)0
-rw-r--r--src/bindings/cxx/eldbus_cxx/eldbus_service.hh (renamed from src/bindings/eldbus_cxx/eldbus_service.hh)0
-rw-r--r--src/bindings/cxx/eldbus_cxx/eldbus_signature_traits.hh (renamed from src/bindings/eldbus_cxx/eldbus_signature_traits.hh)0
-rw-r--r--src/bindings/cxx/eo_cxx/Eo.hh (renamed from src/bindings/eo_cxx/Eo.hh)0
-rw-r--r--src/bindings/cxx/eo_cxx/eo_concrete.hh (renamed from src/bindings/eo_cxx/eo_concrete.hh)0
-rw-r--r--src/bindings/cxx/eo_cxx/eo_cxx_interop.hh (renamed from src/bindings/eo_cxx/eo_cxx_interop.hh)0
-rw-r--r--src/bindings/cxx/eo_cxx/eo_event.hh (renamed from src/bindings/eo_cxx/eo_event.hh)0
-rw-r--r--src/bindings/cxx/eo_cxx/eo_inherit.hh (renamed from src/bindings/eo_cxx/eo_inherit.hh)0
-rw-r--r--src/bindings/cxx/eo_cxx/eo_inherit_bindings.hh (renamed from src/bindings/eo_cxx/eo_inherit_bindings.hh)0
-rw-r--r--src/bindings/cxx/eo_cxx/eo_init.hh (renamed from src/bindings/eo_cxx/eo_init.hh)0
-rw-r--r--src/bindings/cxx/eo_cxx/eo_ops.hh (renamed from src/bindings/eo_cxx/eo_ops.hh)0
-rw-r--r--src/bindings/cxx/eo_cxx/eo_private.hh (renamed from src/bindings/eo_cxx/eo_private.hh)0
-rw-r--r--src/bindings/cxx/eo_cxx/eo_wref.hh (renamed from src/bindings/eo_cxx/eo_wref.hh)0
-rw-r--r--src/lib/elementary/elm_image.eo2
-rw-r--r--src/tests/elementary_cxx/cxx_compile_test.cc14
84 files changed, 429 insertions, 583 deletions
diff --git a/m4/efl.m4 b/m4/efl.m4
index ea686b7..990f629 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -412,7 +412,7 @@ m4_defn([UP])_LIBS=" ${m4_defn([UP])_LDFLAGS} ${EFLALL_COV_LIBS} ${EFLALL_LIBS}
412m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}" 412m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}"
413USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la" 413USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la"
414USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la" 414USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la"
415m4_defn([UP])_CFLAGS="${EFLALL_COV_CFLAGS} ${EFLALL_CFLAGS} ${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} -I\$(top_srcdir)/src/bindings/${libdirname} -I\$(top_builddir)/src/bindings/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_eflall} -DEFL_[]m4_defn([UP])_BUILD=1" 415m4_defn([UP])_CFLAGS="${EFLALL_COV_CFLAGS} ${EFLALL_CFLAGS} ${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} -I\$(top_srcdir)/src/bindings/cxx/${libdirname} -I\$(top_builddir)/src/bindings/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_eflall} -DEFL_[]m4_defn([UP])_BUILD=1"
416requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_eflall}" 416requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_eflall}"
417requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_eflall}" 417requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_eflall}"
418 418
diff --git a/src/Makefile.am b/src/Makefile.am
index eaf7569..af019a7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,7 +57,6 @@ include Makefile_Eeze.am
57include Makefile_Ecore_Drm.am 57include Makefile_Ecore_Drm.am
58include Makefile_Ecore_Evas.am 58include Makefile_Ecore_Evas.am
59include Makefile_Ecore_Audio.am 59include Makefile_Ecore_Audio.am
60include Makefile_Ecore_Audio_Cxx.am
61include Makefile_Ecore_Avahi.am 60include Makefile_Ecore_Avahi.am
62include Makefile_Embryo.am 61include Makefile_Embryo.am
63include Makefile_Eio.am 62include Makefile_Eio.am
@@ -72,17 +71,8 @@ include Makefile_Elocation.am
72include Makefile_Elementary.am 71include Makefile_Elementary.am
73include Makefile_Elput.am 72include Makefile_Elput.am
74 73
75include Makefile_Eina_Cxx.am 74include Makefile_Cxx.am
76include Makefile_Ecore_Cxx.am
77include Makefile_Eldbus_Cxx.am
78include Makefile_Eolian_Cxx.am 75include Makefile_Eolian_Cxx.am
79include Makefile_Eet_Cxx.am
80include Makefile_Eo_Cxx.am
81include Makefile_Efl_Cxx.am
82include Makefile_Edje_Cxx.am
83include Makefile_Evas_Cxx.am
84include Makefile_Eio_Cxx.am
85include Makefile_Elementary_Cxx.am
86 76
87include Makefile_Elua.am 77include Makefile_Elua.am
88 78
diff --git a/src/Makefile_Cxx.am b/src/Makefile_Cxx.am
new file mode 100644
index 0000000..809ce99
--- /dev/null
+++ b/src/Makefile_Cxx.am
@@ -0,0 +1,351 @@
1if HAVE_CXX11
2
3### Eo C++
4CLEANFILES += $(eo_eolian_cxx_hh) $(eo_eolian_cxx_impl_hh)
5
6installed_eocxxheadersdir = $(includedir)/eo-cxx-@VMAJ@/
7nodist_installed_eocxxheaders_DATA = $(eo_eolian_cxx_hh) $(eo_eolian_cxx_impl)
8dist_installed_eocxxheaders_DATA = \
9bindings/cxx/eo_cxx/eo_concrete.hh \
10bindings/cxx/eo_cxx/eo_event.hh \
11bindings/cxx/eo_cxx/eo_init.hh \
12bindings/cxx/eo_cxx/eo_wref.hh \
13bindings/cxx/eo_cxx/eo_inherit.hh \
14bindings/cxx/eo_cxx/eo_ops.hh \
15bindings/cxx/eo_cxx/eo_private.hh \
16bindings/cxx/eo_cxx/eo_inherit_bindings.hh \
17bindings/cxx/eo_cxx/eo_cxx_interop.hh \
18bindings/cxx/eo_cxx/Eo.hh
19
20### Elementary C++
21installed_elementarycxxmainheadersdir = $(includedir)/elementary-cxx-@VMAJ@/
22nodist_installed_elementarycxxmainheaders_DATA = $(elementary_eolian_cxx_hh) $(elementary_eolian_cxx_impl) \
23lib/elementary/Elementary.hh
24
25lib/elementary/Elementary.hh: $(elementary_eolian_cxx_hh)
26 @echo @ECHO_E@ "#ifndef EFL_CXX_ELEMENTARY_HH\n#define EFL_CXX_ELEMENTARY_HH\n" > $(top_builddir)/src/lib/elementary/Elementary.hh
27 @echo @ECHO_E@ "#if defined(ELEMENTARY_H) || defined(ELM_WIDGET_H)" >> $(top_builddir)/src/lib/elementary/Elementary.hh
28 @echo @ECHO_E@ "#error Do not include Elm C API headers before including Elementary.hh" >> $(top_builddir)/src/lib/elementary/Elementary.hh
29 @echo @ECHO_E@ "#endif" >> $(top_builddir)/src/lib/elementary/Elementary.hh
30 @echo @ECHO_E@ "" >> $(top_builddir)/src/lib/elementary/Elementary.hh
31 @echo @ECHO_E@ "#ifndef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/elementary/Elementary.hh
32 @echo @ECHO_E@ "#define EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/elementary/Elementary.hh
33 @echo @ECHO_E@ "#endif\n" >> $(top_builddir)/src/lib/elementary/Elementary.hh
34 @echo @ECHO_E@ "#ifndef ELM_INTERNAL_API_ARGESFSDFEFC" >> $(top_builddir)/src/lib/elementary/Elementary.hh
35 @echo @ECHO_E@ "#define ELM_INTERNAL_API_ARGESFSDFEFC" >> $(top_builddir)/src/lib/elementary/Elementary.hh
36 @echo @ECHO_E@ "#endif\n" >> $(top_builddir)/src/lib/elementary/Elementary.hh
37 @echo @ECHO_E@ "extern \"C\" {" >> $(top_builddir)/src/lib/elementary/Elementary.hh
38 @echo @ECHO_E@ "#include \"Elementary.h\"" >> $(top_builddir)/src/lib/elementary/Elementary.hh
39 @echo @ECHO_E@ "#include \"elm_widget.h\"" >> $(top_builddir)/src/lib/elementary/Elementary.hh
40 @echo @ECHO_E@ "}" >> $(top_builddir)/src/lib/elementary/Elementary.hh
41 @echo @ECHO_E@ "" >> $(top_builddir)/src/lib/elementary/Elementary.hh
42 @for i in $(elementary_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/elementary/Elementary.hh; done
43 @echo @ECHO_E@ "#endif\n" >> $(top_builddir)/src/lib/elementary/Elementary.hh
44
45CLEANFILES += $(elementary_eolian_cxx_hh) $(elementary_eolian_cxx_impl) lib/elementary/Elementary.hh
46
47### Efl C++
48installed_eflcxxmainheadersdir = $(includedir)/efl-cxx-@VMAJ@/
49nodist_installed_eflcxxmainheaders_DATA = $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl) lib/efl/Efl.hh
50
51lib/efl/Efl.hh: $(efl_eolian_cxx_hh)
52 @echo @ECHO_E@ "#ifndef EFL_CXX_HH\n#define EFL_CXX_HH\n" > $(top_builddir)/src/lib/efl/Efl.hh
53 @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/efl/Efl.hh
54 @for i in $(efl_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/efl/Efl.hh; done
55 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/efl/Efl.hh
56
57CLEANFILES += $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl) lib/efl/Efl.hh
58
59### Evas C++
60installed_evascxxmainheadersdir = $(includedir)/evas-cxx-@VMAJ@/
61nodist_installed_evascxxmainheaders_DATA = lib/evas/Evas.hh
62
63installed_evascxxcanvasheadersdir = $(includedir)/evas-cxx-@VMAJ@/canvas
64nodist_installed_evascxxcanvasheaders_DATA = $(evas_eolian_cxx_hh) $(evas_eolian_cxx_impl)
65
66lib/evas/Evas.hh: $(evas_eolian_cxx_hh)
67 @echo @ECHO_E@ "#ifndef EFL_CXX_EVAS_HH\n#define EFL_CXX_EVAS_HH\n" > $(top_builddir)/src/lib/evas/Evas.hh
68 @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/evas/Evas.hh
69 @for i in $(evas_eolian_cxx_hh); do echo "#include <canvas/$$(basename $$i)>" >> $(top_builddir)/src/lib/evas/Evas.hh; done
70 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/evas/Evas.hh
71
72CLEANFILES += $(evas_eolian_cxx_hh) $(evas_eolian_cxx_impl) lib/evas/Evas.hh
73
74### Eldbus C++
75installed_eldbuscxxmainheadersdir = $(includedir)/eldbus_cxx-@VMAJ@
76nodist_installed_eldbuscxxmainheaders_DATA = $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl) lib/eldbus/Eldbus_Model.hh
77dist_installed_eldbuscxxmainheaders_DATA = \
78bindings/cxx/eldbus_cxx/eldbus_basic.hh \
79bindings/cxx/eldbus_cxx/eldbus_error.hh \
80bindings/cxx/eldbus_cxx/eldbus_freedesktop.hh \
81bindings/cxx/eldbus_cxx/Eldbus.hh \
82bindings/cxx/eldbus_cxx/eldbus_integer_sequence.hh \
83bindings/cxx/eldbus_cxx/eldbus_message_arguments.hh \
84bindings/cxx/eldbus_cxx/eldbus_message.hh \
85bindings/cxx/eldbus_cxx/eldbus_proxy_call.hh \
86bindings/cxx/eldbus_cxx/eldbus_raw_tuple.hh \
87bindings/cxx/eldbus_cxx/eldbus_service.hh \
88bindings/cxx/eldbus_cxx/eldbus_signature_traits.hh
89
90lib/eldbus/Eldbus_Model.hh: $(eldbus_eolian_cxx_hh)
91 @echo @ECHO_E@ "#ifndef EFL_CXX_ELDBUS_MODEL_HH\n#define EFL_CXX_ELDBUS_MODEL_HH\n" > $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh
92 @echo @ECHO_E@ "#include <Eldbus_Model.h>" >> $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh
93 @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh
94 @for i in $(eldbus_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh; done
95 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh
96
97CLEANFILES += $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl) lib/eldbus/Eldbus_Model.hh
98
99### Eet C++
100installed_eetcxxheadersdir = $(includedir)/eet-cxx-@VMAJ@
101dist_installed_eetcxxheaders_DATA = \
102bindings/cxx/eet_cxx/eet_composite.hh \
103bindings/cxx/eet_cxx/eet_register.hh \
104bindings/cxx/eet_cxx/eet_type.hh \
105bindings/cxx/eet_cxx/Eet.hh
106
107### Generated headers src/lib/edje
108installed_edjecxxmainheadersdir = $(includedir)/edje-cxx-@VMAJ@/
109nodist_installed_edjecxxmainheaders_DATA = $(edje_eolian_cxx_hh) $(edje_eolian_cxx_impl) lib/edje/Edje.hh
110
111lib/edje/Edje.hh: $(edje_eolian_cxx_hh)
112 @echo @ECHO_E@ "#ifndef EFL_CXX_EDJE_HH\n#define EFL_CXX_EDJE_HH\n" > $(top_builddir)/src/lib/edje/Edje.hh
113 @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/edje/Edje.hh
114 @for i in $(edje_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/edje/Edje.hh; done
115 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/edje/Edje.hh
116
117CLEANFILES += $(edje_eolian_cxx_hh) $(edje_eolian_cxx_impl) lib/edje/Edje.hh
118
119### Ecore src/lib/ecore
120installed_ecorecxxheadersdir = $(includedir)/ecore-cxx-@VMAJ@
121nodist_installed_ecorecxxheaders_DATA = $(ecore_eolian_cxx_hh) $(ecore_eolian_cxx_impl) \
122bindings/cxx/ecore_cxx/Ecore.hh \
123lib/ecore/Ecore.eo.hh
124
125lib/ecore/Ecore.eo.hh: $(ecore_eolian_cxx_hh)
126 @echo @ECHO_E@ "#ifndef EFL_CXX_ECORE_HH\n#define EFL_CXX_ECORE_HH\n" > $(top_builddir)/src/lib/ecore/Ecore.eo.hh
127 @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh
128 @for i in $(ecore_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh; done
129 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh
130
131CLEANFILES += $(ecore_eolian_cxx_hh) $(ecore_eolian_cxx_impl) llib/ecore/Ecore.eo.hh
132
133## Eina src/lib/eina
134installed_einacxxheadersdir = $(includedir)/eina-cxx-@VMAJ@
135dist_installed_einacxxheaders_DATA = \
136bindings/cxx/eina_cxx/eina_accessor.hh \
137bindings/cxx/eina_cxx/eina_array.hh \
138bindings/cxx/eina_cxx/eina_clone_allocators.hh \
139bindings/cxx/eina_cxx/eina_error.hh \
140bindings/cxx/eina_cxx/eina_eo_concrete_fwd.hh \
141bindings/cxx/eina_cxx/eina_fold.hh \
142bindings/cxx/eina_cxx/eina_function.hh \
143bindings/cxx/eina_cxx/eina_inarray.hh \
144bindings/cxx/eina_cxx/eina_inlist.hh \
145bindings/cxx/eina_cxx/eina_integer_sequence.hh \
146bindings/cxx/eina_cxx/eina_iterator.hh \
147bindings/cxx/eina_cxx/eina_lists_auxiliary.hh \
148bindings/cxx/eina_cxx/eina_list.hh \
149bindings/cxx/eina_cxx/eina_log.hh \
150bindings/cxx/eina_cxx/eina_logical.hh \
151bindings/cxx/eina_cxx/eina_optional.hh \
152bindings/cxx/eina_cxx/eina_pp.hh \
153bindings/cxx/eina_cxx/eina_ptrarray.hh \
154bindings/cxx/eina_cxx/eina_ptrlist.hh \
155bindings/cxx/eina_cxx/eina_range_types.hh \
156bindings/cxx/eina_cxx/eina_ref.hh \
157bindings/cxx/eina_cxx/eina_stringshare.hh \
158bindings/cxx/eina_cxx/eina_string_view.hh \
159bindings/cxx/eina_cxx/eina_thread.hh \
160bindings/cxx/eina_cxx/eina_throw.hh \
161bindings/cxx/eina_cxx/eina_tuple.hh \
162bindings/cxx/eina_cxx/eina_tuple_c.hh \
163bindings/cxx/eina_cxx/eina_tuple_unwrap.hh \
164bindings/cxx/eina_cxx/eina_type_traits.hh \
165bindings/cxx/eina_cxx/eina_value.hh \
166bindings/cxx/eina_cxx/Eina.hh
167
168### Eio
169installed_eiocxxmainheadersdir = $(includedir)/eio-cxx-@VMAJ@/
170nodist_installed_eiocxxmainheaders_DATA = $(eio_eolian_cxx_hh) $(eio_eolian_cxx_impl) lib/eio/Eio.hh
171
172lib/eio/Eio.hh: $(eio_eolian_cxx_hh)
173 @echo @ECHO_E@ "#ifndef EFL_CXX_EIO_HH\n#define EFL_CXX_EIO_HH\n" > $(top_builddir)/src/lib/eio/Eio.hh
174 @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/eio/Eio.hh
175 @for i in $(eio_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/eio/Eio.hh; done
176 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/eio/Eio.hh
177
178CLEANFILES += $(eio_eolian_cxx_hh) $(eio_eolian_cxx_impl) lib/eio/Eio.hh
179
180### Tests
181
182if EFL_ENABLE_TESTS
183
184### Tests for Eina
185check_PROGRAMS += tests/eina_cxx/eina_cxx_suite
186TESTS += tests/eina_cxx/eina_cxx_suite
187
188tests_eina_cxx_eina_cxx_suite_SOURCES = \
189tests/eina_cxx/eina_cxx_suite.cc \
190tests/eina_cxx/eina_cxx_test_inlist.cc \
191tests/eina_cxx/eina_cxx_test_log.cc \
192tests/eina_cxx/eina_cxx_test_inarray.cc \
193tests/eina_cxx/eina_cxx_test_iterator.cc \
194tests/eina_cxx/eina_cxx_test_ptrarray.cc \
195tests/eina_cxx/eina_cxx_test_ptrlist.cc \
196tests/eina_cxx/eina_cxx_test_stringshare.cc \
197tests/eina_cxx/eina_cxx_test_error.cc \
198tests/eina_cxx/eina_cxx_test_accessor.cc \
199tests/eina_cxx/eina_cxx_test_thread.cc \
200tests/eina_cxx/eina_cxx_test_optional.cc \
201tests/eina_cxx/eina_cxx_test_value.cc \
202tests/eina_cxx/simple.c \
203tests/eina_cxx/eina_cxx_suite.h
204
205tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-eina_cxx_test_accessor.$(OBJEXT): tests/eina_cxx/simple.eo.hh tests/eina_cxx/simple.eo.h
206tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-eina_cxx_test_ptrarray.$(OBJEXT): tests/eina_cxx/simple.eo.hh tests/eina_cxx/simple.eo.h
207tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-eina_cxx_test_ptrlist.$(OBJEXT): tests/eina_cxx/simple.eo.hh tests/eina_cxx/simple.eo.h
208tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-eina_cxx_test_iterator.$(OBJEXT): tests/eina_cxx/simple.eo.hh tests/eina_cxx/simple.eo.h
209
210tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-simple.$(OBJEXT): tests/eina_cxx/simple.eo.c tests/eina_cxx/simple.eo.h
211
212CLEANFILES += \
213tests/eina_cxx/simple.eo.c \
214tests/eina_cxx/simple.eo.h \
215tests/eina_cxx/simple.eo.hh \
216tests/eina_cxx/simple.eo.impl.hh
217
218tests_eina_cxx_eina_cxx_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
219-DTESTS_WD=\"`pwd`\" \
220-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eina_cxx\" \
221-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eina_cxx\" \
222-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eina_cxx\" \
223-I$(top_builddir)/src/lib/efl \
224-I$(top_builddir)/src/lib/efl/interfaces \
225-I$(top_srcdir)/src/bin/eina_cxx \
226-I$(top_builddir)/src/tests/eina_cxx \
227@CHECK_CFLAGS@ \
228@EO_CFLAGS@ \
229@ECORE_CFLAGS@ \
230@EO_CXX_CFLAGS@ \
231@EINA_CXX_CFLAGS@
232tests_eina_cxx_eina_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EINA_LIBS@ @USE_EO_LIBS@
233tests_eina_cxx_eina_cxx_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
234
235EXTRA_DIST += \
236tests/eina_cxx/simple.eo
237
238### Tests for ecore
239
240check_PROGRAMS += tests/ecore_cxx/ecore_cxx_suite tests/ecore_cxx/cxx_compile_test
241TESTS += tests/ecore_cxx/ecore_cxx_suite tests/ecore_cxx/cxx_compile_test
242
243tests_ecore_cxx_ecore_cxx_suite_SOURCES = \
244tests/ecore_cxx/ecore_cxx_suite.cc \
245tests/ecore_cxx/ecore_cxx_test_safe_call.cc \
246tests/ecore_cxx/ecore_cxx_suite.h
247
248tests_ecore_cxx_ecore_cxx_suite_CPPFLAGS = \
249-I$(top_builddir)/src/lib/efl \
250-I$(top_builddir)/src/lib/efl/interfaces \
251-I$(top_builddir)/src/lib/ecore \
252-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_cxx\" \
253-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_cxx\" \
254@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @EINA_CFLAGS@ \
255@ECORE_CFLAGS@ @EVAS_CFLAGS@ @EO_CFLAGS@ @EO_CXX_CFLAGS@
256
257tests_ecore_cxx_ecore_cxx_suite_LDADD = @CHECK_LIBS@ @USE_ECORE_LIBS@
258tests_ecore_cxx_ecore_cxx_suite_DEPENDENCIES = @USE_ECORE_INTERNAL_LIBS@
259
260tests_ecore_cxx_cxx_compile_test_SOURCES = tests/ecore_cxx/cxx_compile_test.cc
261tests_ecore_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
262-I$(top_builddir)/src/lib/efl \
263-I$(top_builddir)/src/lib/efl/interfaces \
264-I$(top_builddir)/src/lib/ecore \
265-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_cxx\" \
266-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_cxx\" \
267@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EINA_CFLAGS@ \
268@ECORE_CFLAGS@ @EO_CFLAGS@ @EO_CXX_CFLAGS@
269
270tests_ecore_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_ECORE_LIBS@
271tests_ecore_cxx_cxx_compile_test_DEPENDENCIES = @USE_ECORE_INTERNAL_LIBS@
272
273### Tests for Eet
274check_PROGRAMS += tests/eet_cxx/eet_cxx_suite
275TESTS += tests/eet_cxx/eet_cxx_suite
276
277tests_eet_cxx_eet_cxx_suite_SOURCES = \
278tests/eet_cxx/eet_cxx_suite.cc \
279tests/eet_cxx/eet_cxx_test_descriptors.cc \
280tests/eet_cxx/eet_cxx_suite.h
281
282tests_eet_cxx_eet_cxx_suite_CPPFLAGS = \
283-I$(top_builddir)/src/lib/efl \
284-DTESTS_WD=\"`pwd`\" \
285-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet_cxx\" \
286-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eet_cxx\" \
287-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eet_cxx\" \
288@EO_CFLAGS@ @CHECK_CFLAGS@ @EET_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EET_CFLAGS@ @EINA_CFLAGS@
289tests_eet_cxx_eet_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EET_LIBS@
290tests_eet_cxx_eet_cxx_suite_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@
291
292### Tests for eldbus
293check_PROGRAMS += tests/eldbus_cxx/eldbus_cxx_suite
294TESTS += tests/eldbus_cxx/eldbus_cxx_suite
295
296tests_eldbus_cxx_eldbus_cxx_suite_SOURCES = \
297tests/eldbus_cxx/eldbus_cxx_suite.cc \
298tests/eldbus_cxx/eldbus_cxx_test_eldbus_connect.cc \
299tests/eldbus_cxx/eldbus_cxx_test_eldbus_client.cc \
300tests/eldbus_cxx/eldbus_cxx_suite.h
301
302tests_eldbus_cxx_eldbus_cxx_suite_CPPFLAGS = \
303-I$(top_builddir)/src/bindings/cxx/eina_cxx \
304-I$(top_srcdir)/src/bindings/cxx/eina_cxx \
305-I$(top_builddir)/src/bindings/cxx/ecore_cxx \
306-I$(top_srcdir)/src/bindings/cxx/ecore_cxx \
307-I$(top_builddir)/src/bindings/cxx/eldbus_cxx \
308-I$(top_srcdir)/src/bindings/cxx/eldbus_cxx \
309-I$(top_builddir)/src/lib/efl \
310-I$(top_builddir)/src/lib/efl/interfaces \
311-I$(top_builddir)/src/lib/ecore \
312-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eldbus\" \
313@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EINA_CFLAGS@ \
314@ECORE_CFLAGS@ @EO_CFLAGS@ @EO_CXX_CFLAGS@ @ELDBUS_CFLAGS@
315
316tests_eldbus_cxx_eldbus_cxx_suite_LDADD = @CHECK_LIBS@ @USE_ELDBUS_LIBS@
317tests_eldbus_cxx_eldbus_cxx_suite_DEPENDENCIES = @USE_ELDBUS_INTERNAL_LIBS@
318
319### Tests for Evas
320check_PROGRAMS += tests/evas_cxx/cxx_compile_test
321TESTS += tests/evas_cxx/cxx_compile_test
322
323tests_evas_cxx_cxx_compile_test_SOURCES = tests/evas_cxx/cxx_compile_test.cc
324tests_evas_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
325 -I$(top_builddir)/src/lib/efl/interfaces/ \
326 -I$(top_builddir)/src/lib/evas/canvas/ \
327 -I$(top_builddir)/src/lib/evas/include/ \
328 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/evas_cxx\" \
329 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/evas_cxx\" \
330 @CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @EO_CXX_CFLAGS@ \
331 @ECORE_CFLAGS@ @EINA_CFLAGS@ @EVAS_CFLAGS@ @EO_CFLAGS@
332tests_evas_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_EVAS_LIBS@
333tests_evas_cxx_cxx_compile_test_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
334
335### Tests for Elementary
336check_PROGRAMS += tests/elementary_cxx/cxx_compile_test
337TESTS += tests/elementary_cxx/cxx_compile_test
338
339tests_elementary_cxx_cxx_compile_test_SOURCES = tests/elementary_cxx/cxx_compile_test.cc
340tests_elementary_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
341-I$(top_builddir)/src/lib/evas/canvas/ \
342-I$(top_builddir)/src/lib/efl/interfaces/ \
343-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/elementary_cxx\" \
344-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/elementary_cxx\" \
345@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @ELEMENTARY_CXX_CFLAGS@ @EO_CXX_CFLAGS@ \
346@ECORE_CFLAGS@ @EINA_CFLAGS@ @EVAS_CFLAGS@ @ELEMENTARY_CFLAGS@ @EO_CFLAGS@
347tests_elementary_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_ELEMENTARY_LIBS@
348tests_elementary_cxx_cxx_compile_test_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
349
350endif
351endif
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index f419270..f0ad37d 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -286,3 +286,10 @@ CLEANFILES += $(generated_ecore_js_bindings)
286GENERATED_JS_BINDINGS += $(generated_ecore_js_bindings) 286GENERATED_JS_BINDINGS += $(generated_ecore_js_bindings)
287 287
288endif 288endif
289
290if HAVE_CXX11
291
292ecore_eolian_cxx_hh = $(ecore_eolian_files:%.eo=%.eo.hh)
293ecore_eolian_cxx_impl = $(ecore_eolian_files:%.eo=%.eo.impl.hh)
294
295endif
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index 245ef9c..2a3dfd8 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -111,4 +111,3 @@ GENERATED_JS_BINDINGS += $(generated_ecore_audio_js_bindings)
111endif 111endif
112 112
113endif 113endif
114
diff --git a/src/Makefile_Ecore_Audio_Cxx.am b/src/Makefile_Ecore_Audio_Cxx.am
deleted file mode 100644
index e8833ba..0000000
--- a/src/Makefile_Ecore_Audio_Cxx.am
+++ /dev/null
@@ -1,52 +0,0 @@
1if HAVE_ECORE_AUDIO
2if HAVE_CXX11
3
4### Generated headers
5
6generated_ecore_audio_cxx_bindings = $(ecore_audio_eolian_files:%.eo=%.eo.hh)
7generated_ecore_audio_impl_cxx_bindings = $(ecore_audio_eolian_files:%.eo=%.eo.impl.hh)
8
9lib/ecore_audio/Ecore_Audio.hh: $(generated_ecore_audio_cxx_bindings)
10 @echo @ECHO_E@ "#ifndef EFL_CXX_ECORE_AUDIO_HH\n#define EFL_CXX_ECORE_AUDIO_HH\n" > $(top_builddir)/src/lib/ecore_audio/Ecore_Audio.hh
11 @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/ecore_audio/Ecore_Audio.hh
12 @for i in $(generated_ecore_audio_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/ecore_audio/Ecore_Audio.hh; done
13 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/ecore_audio/Ecore_Audio.hh
14
15generated_ecore_audio_cxx_all = \
16 $(generated_ecore_audio_cxx_bindings) \
17 $(generated_ecore_audio_impl_cxx_bindings) \
18 lib/ecore_audio/Ecore_Audio.hh
19
20CLEANFILES += $(generated_ecore_audio_cxx_all)
21
22installed_ecoreaudiocxxmainheadersdir = $(includedir)/ecore-audio-cxx-@VMAJ@
23nodist_installed_ecoreaudiocxxmainheaders_DATA = $(generated_ecore_audio_cxx_all)
24
25### Unit tests
26
27if EFL_ENABLE_TESTS
28
29check_PROGRAMS += tests/ecore_audio_cxx/cxx_compile_test
30TESTS += tests/ecore_audio_cxx/cxx_compile_test
31
32tests_ecore_audio_cxx_cxx_compile_test_SOURCES = tests/ecore_audio_cxx/cxx_compile_test.cc
33tests_ecore_audio_cxx_cxx_compile_test_CPPFLAGS = \
34-I$(top_builddir)/src/lib/efl \
35-I$(top_srcdir)/src/lib/efl \
36-I$(builddir)/src/lib/efl \
37-I$(srcdir)/src/lib/efl \
38-I$(top_builddir)/src/lib/evas/canvas/ \
39-DTESTS_WD=\"`pwd`\" \
40-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_audio_cxx\" \
41-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/ecore_audio_cxx\" \
42-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_audio_cxx\" \
43@CHECK_CFLAGS@ @ECORE_CFLAGS@ @EINA_CFLAGS@ @EVAS_CFLAGS@ @EO_CFLAGS@ @ECORE_AUDIO_CFLAGS@ \
44@ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @EO_CXX_CFLAGS@ @ECORE_AUDIO_CXX_CFLAGS@
45
46tests_ecore_audio_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_ECORE_LIBS@
47tests_ecore_audio_cxx_cxx_compile_test_DEPENDENCIES = @USE_ECORE_INTERNAL_LIBS@
48
49endif
50
51endif
52endif
diff --git a/src/Makefile_Ecore_Cxx.am b/src/Makefile_Ecore_Cxx.am
deleted file mode 100644
index ef97d5f..0000000
--- a/src/Makefile_Ecore_Cxx.am
+++ /dev/null
@@ -1,66 +0,0 @@
1
2### Library
3
4if HAVE_CXX11
5
6installed_ecorecxxmainheadersdir = $(includedir)/ecore-cxx-@VMAJ@
7dist_installed_ecorecxxmainheaders_DATA = bindings/ecore_cxx/Ecore.hh
8
9generated_ecore_cxx_bindings = $(ecore_eolian_files:%.eo=%.eo.hh)
10generated_ecore_cxx_impl_bindings = $(ecore_eolian_files:%.eo=%.eo.impl.hh)
11
12lib/ecore/Ecore.eo.hh: $(generated_ecore_cxx_bindings)
13 @echo @ECHO_E@ "#ifndef EFL_CXX_ECORE_HH\n#define EFL_CXX_ECORE_HH\n" > $(top_builddir)/src/lib/ecore/Ecore.eo.hh
14 @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh
15 @for i in $(generated_ecore_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh; done
16 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh
17
18generated_ecore_cxx_all = \
19 $(generated_ecore_cxx_bindings) \
20 $(generated_ecore_cxx_impl_bindings) \
21 lib/ecore/Ecore.eo.hh
22
23CLEANFILES += $(generated_ecore_cxx_all)
24
25installed_ecorecxxheadersdir = $(includedir)/ecore-cxx-@VMAJ@
26nodist_installed_ecorecxxheaders_DATA = $(generated_ecore_cxx_all)
27
28### Unit tests
29
30if EFL_ENABLE_TESTS
31
32check_PROGRAMS += tests/ecore_cxx/ecore_cxx_suite tests/ecore_cxx/cxx_compile_test
33TESTS += tests/ecore_cxx/ecore_cxx_suite tests/ecore_cxx/cxx_compile_test
34
35tests_ecore_cxx_ecore_cxx_suite_SOURCES = \
36tests/ecore_cxx/ecore_cxx_suite.cc \
37tests/ecore_cxx/ecore_cxx_test_safe_call.cc \
38tests/ecore_cxx/ecore_cxx_suite.h
39
40tests_ecore_cxx_ecore_cxx_suite_CPPFLAGS = \
41-I$(top_builddir)/src/lib/efl \
42-I$(top_builddir)/src/lib/efl/interfaces \
43-I$(top_builddir)/src/lib/ecore \
44-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_cxx\" \
45-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_cxx\" \
46@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @EINA_CFLAGS@ \
47@ECORE_CFLAGS@ @EVAS_CFLAGS@ @EO_CFLAGS@ @EO_CXX_CFLAGS@
48
49tests_ecore_cxx_ecore_cxx_suite_LDADD = @CHECK_LIBS@ @USE_ECORE_LIBS@
50tests_ecore_cxx_ecore_cxx_suite_DEPENDENCIES = @USE_ECORE_INTERNAL_LIBS@
51
52tests_ecore_cxx_cxx_compile_test_SOURCES = tests/ecore_cxx/cxx_compile_test.cc
53tests_ecore_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
54-I$(top_builddir)/src/lib/ecore \
55-I$(top_builddir)/src/lib/efl/interfaces/ \
56-I$(top_builddir)/src/lib/evas/canvas/ \
57-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_cxx\" \
58-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_cxx\" \
59@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EINA_CFLAGS@ \
60@ECORE_CFLAGS@ @EO_CFLAGS@ @EO_CXX_CFLAGS@
61
62tests_ecore_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_ECORE_LIBS@
63tests_ecore_cxx_cxx_compile_test_DEPENDENCIES = @USE_ECORE_INTERNAL_LIBS@
64
65endif
66endif
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index c3f96e4..45934d6 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -345,3 +345,8 @@ CLEANFILES += $(generated_edje_js_bindings)
345GENERATED_JS_BINDINGS += $(generated_edje_js_bindings) 345GENERATED_JS_BINDINGS += $(generated_edje_js_bindings)
346 346
347endif 347endif
348
349if HAVE_CXX11
350edje_eolian_cxx_hh = $(edje_eolian_files:%.eo=%.eo.hh)
351edje_eolian_cxx_impl = $(edje_eolian_files:%.eo=%.eo.impl.hh)
352endif
diff --git a/src/Makefile_Edje_Cxx.am b/src/Makefile_Edje_Cxx.am
deleted file mode 100644
index 93ae9ab..0000000
--- a/src/Makefile_Edje_Cxx.am
+++ /dev/null
@@ -1,44 +0,0 @@
1
2if HAVE_CXX11
3
4### Generated headers
5generated_edje_cxx_bindings = $(edje_eolian_files:%.eo=%.eo.hh)
6generated_edje_cxx_impl_bindings = $(edje_eolian_files:%.eo=%.eo.impl.hh)
7
8lib/edje/Edje.hh: $(generated_edje_cxx_bindings)
9 @echo @ECHO_E@ "#ifndef EFL_CXX_EDJE_HH\n#define EFL_CXX_EDJE_HH\n" > $(top_builddir)/src/lib/edje/Edje.hh
10 @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/edje/Edje.hh
11 @for i in $(generated_edje_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/edje/Edje.hh; done
12 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/edje/Edje.hh
13
14generated_edje_cxx_all = \
15 $(generated_edje_cxx_bindings) \
16 $(generated_edje_cxx_impl_bindings) \
17 lib/edje/Edje.hh
18
19CLEANFILES += $(generated_edje_cxx_all)
20
21installed_edjecxxmainheadersdir = $(includedir)/edje-cxx-@VMAJ@/
22nodist_installed_edjecxxmainheaders_DATA = $(generated_edje_cxx_all)
23
24### Unit tests
25
26if EFL_ENABLE_TESTS
27
28check_PROGRAMS += tests/edje_cxx/cxx_compile_test
29TESTS += tests/edje_cxx/cxx_compile_test
30
31tests_edje_cxx_cxx_compile_test_SOURCES = tests/edje_cxx/cxx_compile_test.cc
32tests_edje_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
33-I$(top_builddir)/src/lib/evas/canvas/ \
34-I$(top_builddir)/src/lib/efl/interfaces/ \
35-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/edje_cxx\" \
36-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/edje_cxx\" \
37@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @EDJE_CXX_CFLAGS@ @EO_CXX_CFLAGS@ \
38@ECORE_CFLAGS@ @EINA_CFLAGS@ @EVAS_CFLAGS@ @EDJE_CFLAGS@ @EO_CFLAGS@
39tests_edje_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_EDJE_LIBS@
40tests_edje_cxx_cxx_compile_test_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
41
42endif
43
44endif
diff --git a/src/Makefile_Eet_Cxx.am b/src/Makefile_Eet_Cxx.am
deleted file mode 100644
index 681e7bd..0000000
--- a/src/Makefile_Eet_Cxx.am
+++ /dev/null
@@ -1,35 +0,0 @@
1
2### Library
3
4if HAVE_CXX11
5installed_eetcxxmainheadersdir = $(includedir)/eet-cxx-@VMAJ@
6dist_installed_eetcxxmainheaders_DATA = bindings/eet_cxx/Eet.hh
7
8installed_eetcxxheadersdir = $(includedir)/eet-cxx-@VMAJ@/eet-cxx
9dist_installed_eetcxxheaders_DATA = \
10bindings/eet_cxx/eet_composite.hh \
11bindings/eet_cxx/eet_register.hh \
12bindings/eet_cxx/eet_type.hh
13
14### Unit tests
15
16if EFL_ENABLE_TESTS
17check_PROGRAMS += tests/eet_cxx/eet_cxx_suite
18TESTS += tests/eet_cxx/eet_cxx_suite
19
20tests_eet_cxx_eet_cxx_suite_SOURCES = \
21tests/eet_cxx/eet_cxx_suite.cc \
22tests/eet_cxx/eet_cxx_test_descriptors.cc \
23tests/eet_cxx/eet_cxx_suite.h
24
25tests_eet_cxx_eet_cxx_suite_CPPFLAGS = \
26-I$(top_builddir)/src/lib/efl \
27-DTESTS_WD=\"`pwd`\" \
28-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet_cxx\" \
29-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eet_cxx\" \
30-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eet_cxx\" \
31@EO_CFLAGS@ @CHECK_CFLAGS@ @EET_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EET_CFLAGS@ @EINA_CFLAGS@
32tests_eet_cxx_eet_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EET_LIBS@
33tests_eet_cxx_eet_cxx_suite_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@
34endif
35endif
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 8f40e93..e3b3248 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -117,7 +117,11 @@ generated_efl_js_bindings = $(efl_eolian_files:%.eo=%.eo.js.cc)
117CLEANFILES += $(generated_efl_js_bindings) 117CLEANFILES += $(generated_efl_js_bindings)
118 118
119GENERATED_JS_BINDINGS += $(generated_efl_js_bindings) 119GENERATED_JS_BINDINGS += $(generated_efl_js_bindings)
120endif
120 121
122if HAVE_CXX11
123efl_eolian_cxx_hh = $(efl_eolian_files:%.eo=%.eo.hh)
124efl_eolian_cxx_impl = $(efl_eolian_files:%.eo=%.eo.impl.hh)
121endif 125endif
122 126
123### Binary 127### Binary
diff --git a/src/Makefile_Efl_Cxx.am b/src/Makefile_Efl_Cxx.am
deleted file mode 100644
index 91e0291..0000000
--- a/src/Makefile_Efl_Cxx.am
+++ /dev/null
@@ -1,24 +0,0 @@
1if HAVE_CXX11
2
3### Generated headers
4
5generated_efl_cxx_bindings = $(efl_eolian_files:%.eo=%.eo.hh)
6generated_efl_cxx_impl_bindings = $(efl_eolian_files:%.eo=%.eo.impl.hh)
7
8lib/efl/Efl.hh: $(generated_efl_cxx_bindings)
9 @echo @ECHO_E@ "#ifndef EFL_CXX_HH\n#define EFL_CXX_HH\n" > $(top_builddir)/src/lib/efl/Efl.hh
10 @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/efl/Efl.hh
11 @for i in $(generated_efl_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/efl/Efl.hh; done
12 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/efl/Efl.hh
13
14generated_efl_cxx_all = \
15 $(generated_efl_cxx_bindings) \
16 $(generated_efl_cxx_impl_bindings) \
17 lib/efl/Efl.hh
18
19CLEANFILES += $(generated_efl_cxx_all)
20
21installed_eflcxxmainheadersdir = $(includedir)/efl-cxx-@VMAJ@/
22nodist_installed_eflcxxmainheaders_DATA = $(generated_efl_cxx_all)
23
24endif
diff --git a/src/Makefile_Eina_Cxx.am b/src/Makefile_Eina_Cxx.am
deleted file mode 100644
index 58c8afd..0000000
--- a/src/Makefile_Eina_Cxx.am
+++ /dev/null
@@ -1,101 +0,0 @@
1
2### Library
3
4if HAVE_CXX11
5installed_einacxxmainheadersdir = $(includedir)/eina-cxx-@VMAJ@
6dist_installed_einacxxmainheaders_DATA = \
7bindings/eina_cxx/Eina.hh
8
9installed_einacxxheadersdir = $(includedir)/eina-cxx-@VMAJ@/eina-cxx
10dist_installed_einacxxheaders_DATA = \
11bindings/eina_cxx/eina_accessor.hh \
12bindings/eina_cxx/eina_array.hh \
13bindings/eina_cxx/eina_clone_allocators.hh \
14bindings/eina_cxx/eina_error.hh \
15bindings/eina_cxx/eina_eo_concrete_fwd.hh \
16bindings/eina_cxx/eina_fold.hh \
17bindings/eina_cxx/eina_function.hh \
18bindings/eina_cxx/eina_inarray.hh \
19bindings/eina_cxx/eina_inlist.hh \
20bindings/eina_cxx/eina_integer_sequence.hh \
21bindings/eina_cxx/eina_iterator.hh \
22bindings/eina_cxx/eina_lists_auxiliary.hh \
23bindings/eina_cxx/eina_list.hh \
24bindings/eina_cxx/eina_log.hh \
25bindings/eina_cxx/eina_logical.hh \
26bindings/eina_cxx/eina_optional.hh \
27bindings/eina_cxx/eina_pp.hh \
28bindings/eina_cxx/eina_ptrarray.hh \
29bindings/eina_cxx/eina_ptrlist.hh \
30bindings/eina_cxx/eina_range_types.hh \
31bindings/eina_cxx/eina_ref.hh \
32bindings/eina_cxx/eina_stringshare.hh \
33bindings/eina_cxx/eina_string_view.hh \
34bindings/eina_cxx/eina_thread.hh \
35bindings/eina_cxx/eina_throw.hh \
36bindings/eina_cxx/eina_tuple.hh \
37bindings/eina_cxx/eina_tuple_c.hh \
38bindings/eina_cxx/eina_tuple_unwrap.hh \
39bindings/eina_cxx/eina_type_traits.hh \
40bindings/eina_cxx/eina_value.hh
41
42### Unit tests
43
44if EFL_ENABLE_TESTS
45
46check_PROGRAMS += tests/eina_cxx/eina_cxx_suite
47TESTS += tests/eina_cxx/eina_cxx_suite
48
49tests_eina_cxx_eina_cxx_suite_SOURCES = \
50tests/eina_cxx/eina_cxx_suite.cc \
51tests/eina_cxx/eina_cxx_test_inlist.cc \
52tests/eina_cxx/eina_cxx_test_log.cc \
53tests/eina_cxx/eina_cxx_test_inarray.cc \
54tests/eina_cxx/eina_cxx_test_iterator.cc \
55tests/eina_cxx/eina_cxx_test_ptrarray.cc \
56tests/eina_cxx/eina_cxx_test_ptrlist.cc \
57tests/eina_cxx/eina_cxx_test_stringshare.cc \
58tests/eina_cxx/eina_cxx_test_error.cc \
59tests/eina_cxx/eina_cxx_test_accessor.cc \
60tests/eina_cxx/eina_cxx_test_thread.cc \
61tests/eina_cxx/eina_cxx_test_optional.cc \
62tests/eina_cxx/eina_cxx_test_value.cc \
63tests/eina_cxx/simple.c \
64tests/eina_cxx/eina_cxx_suite.h
65
66tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-eina_cxx_test_accessor.$(OBJEXT): tests/eina_cxx/simple.eo.hh tests/eina_cxx/simple.eo.h
67tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-eina_cxx_test_ptrarray.$(OBJEXT): tests/eina_cxx/simple.eo.hh tests/eina_cxx/simple.eo.h
68tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-eina_cxx_test_ptrlist.$(OBJEXT): tests/eina_cxx/simple.eo.hh tests/eina_cxx/simple.eo.h
69tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-eina_cxx_test_iterator.$(OBJEXT): tests/eina_cxx/simple.eo.hh tests/eina_cxx/simple.eo.h
70
71tests/eina_cxx/tests_eina_cxx_eina_cxx_suite-simple.$(OBJEXT): tests/eina_cxx/simple.eo.c tests/eina_cxx/simple.eo.h
72
73CLEANFILES += \
74tests/eina_cxx/simple.eo.c \
75tests/eina_cxx/simple.eo.h \
76tests/eina_cxx/simple.eo.hh \
77tests/eina_cxx/simple.eo.impl.hh
78
79tests_eina_cxx_eina_cxx_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
80-DTESTS_WD=\"`pwd`\" \
81-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eina_cxx\" \
82-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eina_cxx\" \
83-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eina_cxx\" \
84-I$(top_builddir)/src/lib/efl \
85-I$(top_builddir)/src/lib/efl/interfaces \
86-I$(top_srcdir)/src/bin/eina_cxx \
87-I$(top_builddir)/src/tests/eina_cxx \
88@CHECK_CFLAGS@ \
89@EO_CFLAGS@ \
90@ECORE_CFLAGS@ \
91@EO_CXX_CFLAGS@ \
92@EINA_CXX_CFLAGS@
93tests_eina_cxx_eina_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EINA_LIBS@ @USE_EO_LIBS@
94tests_eina_cxx_eina_cxx_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
95
96endif
97
98EXTRA_DIST += \
99tests/eina_cxx/simple.eo
100
101endif
diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am
index 6a95841..64b7972 100644
--- a/src/Makefile_Eio.am
+++ b/src/Makefile_Eio.am
@@ -1,16 +1,16 @@
1 1
2### Library 2### Library
3 3
4EIO_EOS = \ 4eio_eolian_files = \
5 lib/eio/eio_model.eo 5 lib/eio/eio_model.eo
6 6
7EIO_EOS_H = $(EIO_EOS:%.eo=%.eo.h) 7eio_eolian_h = $(eio_eolian_files:%.eo=%.eo.h)
8EIO_EOS_C = $(EIO_EOS:%.eo=%.eo.c) 8eio_eolian_c = $(eio_eolian_files:%.eo=%.eo.c)
9 9
10BUILT_SOURCES += $(EIO_EOS_C) $(EIO_EOS_H) 10BUILT_SOURCES += $(eio_eolian_c) $(eio_eolian_h)
11 11
12eioeolianfilesdir = $(datadir)/eolian/include/eio-@VMAJ@ 12eioeolianfilesdir = $(datadir)/eolian/include/eio-@VMAJ@
13eioeolianfiles_DATA = $(EIO_EOS) 13eioeolianfiles_DATA = $(eio_eolian_files)
14 14
15lib_LTLIBRARIES += lib/eio/libeio.la 15lib_LTLIBRARIES += lib/eio/libeio.la
16EXTRA_DIST += \ 16EXTRA_DIST += \
@@ -21,7 +21,7 @@ lib/eio/Makefile.in
21installed_eiomainheadersdir = $(includedir)/eio-@VMAJ@ 21installed_eiomainheadersdir = $(includedir)/eio-@VMAJ@
22 22
23dist_installed_eiomainheaders_DATA = lib/eio/Eio.h lib/eio/eio_inline_helper.x 23dist_installed_eiomainheaders_DATA = lib/eio/Eio.h lib/eio/eio_inline_helper.x
24nodist_installed_eiomainheaders_DATA = $(EIO_EOS_H) 24nodist_installed_eiomainheaders_DATA = $(eio_eoolian_h)
25 25
26lib_eio_libeio_la_SOURCES = \ 26lib_eio_libeio_la_SOURCES = \
27lib/eio/eio_dir.c \ 27lib/eio/eio_dir.c \
@@ -62,6 +62,13 @@ if HAVE_NOTIFY_COCOA
62lib_eio_libeio_la_LDFLAGS += -framework CoreServices 62lib_eio_libeio_la_LDFLAGS += -framework CoreServices
63endif 63endif
64 64
65if HAVE_CXX11
66
67eio_eolian_cxx_hh = $(eio_eolian_files:%.eo=%.eo.hh)
68eio_eolian_cxx_impl = $(eio_eolian_files:%.eo=%.eo.impl.hh)
69
70endif
71
65if EFL_ENABLE_TESTS 72if EFL_ENABLE_TESTS
66 73
67check_PROGRAMS += tests/eio/eio_suite 74check_PROGRAMS += tests/eio/eio_suite
diff --git a/src/Makefile_Eio_Cxx.am b/src/Makefile_Eio_Cxx.am
deleted file mode 100644
index b6aeaa0..0000000
--- a/src/Makefile_Eio_Cxx.am
+++ /dev/null
@@ -1,23 +0,0 @@
1if HAVE_CXX11
2
3### Generated headers
4generated_eio_cxx_bindings = $(EIO_EOS:%.eo=%.eo.hh)
5generated_eio_cxx_impl_bindings = $(EIO_EOS:%.eo=%.eo.impl.hh)
6
7lib/eio/Eio.hh: $(generated_eio_cxx_bindings)
8 @echo @ECHO_E@ "#ifndef EFL_CXX_EIO_HH\n#define EFL_CXX_EIO_HH\n" > $(top_builddir)/src/lib/eio/Eio.hh
9 @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/eio/Eio.hh
10 @for i in $(generated_eio_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/eio/Eio.hh; done
11 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/eio/Eio.hh
12
13generated_eio_cxx_all = \
14 $(generated_eio_cxx_bindings) \
15 $(generated_eio_cxx_impl_bindings) \
16 lib/eio/Eio.hh
17
18CLEANFILES += $(generated_eio_cxx_all)
19
20installed_eiocxxmainheadersdir = $(includedir)/eio-cxx-@VMAJ@/
21nodist_installed_eiocxxmainheaders_DATA = $(generated_eio_cxx_all)
22
23endif
diff --git a/src/Makefile_Eldbus.am b/src/Makefile_Eldbus.am
index 194bdb0..7a5cc86 100644
--- a/src/Makefile_Eldbus.am
+++ b/src/Makefile_Eldbus.am
@@ -112,6 +112,11 @@ bin_eldbus_eldbus_codegen_LDADD = @USE_ELDBUS_LIBS@
112endif 112endif
113bin_eldbus_eldbus_codegen_DEPENDENCIES = @USE_ELDBUS_INTERNAL_LIBS@ 113bin_eldbus_eldbus_codegen_DEPENDENCIES = @USE_ELDBUS_INTERNAL_LIBS@
114 114
115if HAVE_CXX11
116eldbus_eolian_cxx_hh = $(eldbus_eolian_files:%.eo=%.eo.hh)
117eldbus_eolian_cxx_impl = $(eldbus_eolian_files:%.eo=%.eo.impl.hh)
118endif
119
115### Unit tests 120### Unit tests
116 121
117if EFL_ENABLE_TESTS 122if EFL_ENABLE_TESTS
diff --git a/src/Makefile_Eldbus_Cxx.am b/src/Makefile_Eldbus_Cxx.am
deleted file mode 100644
index 8f9b2cd..0000000
--- a/src/Makefile_Eldbus_Cxx.am
+++ /dev/null
@@ -1,73 +0,0 @@
1
2if HAVE_CXX11
3
4### Generated headers
5
6generated_eldbus_cxx_bindings = $(eldbus_eolian_files:%.eo=%.eo.hh)
7generated_eldbus_cxx_impl_bindings = $(eldbus_eolian_files:%.eo=%.eo.impl.hh)
8
9lib/eldbus/Eldbus_Model.hh: $(generated_eldbus_cxx_bindings)
10 @echo @ECHO_E@ "#ifndef EFL_CXX_ELDBUS_MODEL_HH\n#define EFL_CXX_ELDBUS_MODEL_HH\n" > $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh
11 @echo @ECHO_E@ "#include <Eldbus_Model.h>" >> $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh
12 @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh
13 @for i in $(generated_eldbus_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh; done
14 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh
15
16generated_eldbus_cxx_all = \
17 $(generated_eldbus_cxx_bindings) \
18 $(generated_eldbus_cxx_impl_bindings) \
19 lib/eldbus/Eldbus_Model.hh
20
21CLEANFILES += $(generated_eldbus_cxx_all)
22
23nodist_installed_eldbuscxxmainheaders_DATA = $(generated_eldbus_cxx_all)
24
25### Library
26
27installed_eldbuscxxmainheadersdir = $(includedir)/eldbus_cxx-@VMAJ@
28dist_installed_eldbuscxxmainheaders_DATA = \
29bindings/eldbus_cxx/eldbus_basic.hh \
30bindings/eldbus_cxx/eldbus_error.hh \
31bindings/eldbus_cxx/eldbus_freedesktop.hh \
32bindings/eldbus_cxx/Eldbus.hh \
33bindings/eldbus_cxx/eldbus_integer_sequence.hh \
34bindings/eldbus_cxx/eldbus_message_arguments.hh \
35bindings/eldbus_cxx/eldbus_message.hh \
36bindings/eldbus_cxx/eldbus_proxy_call.hh \
37bindings/eldbus_cxx/eldbus_raw_tuple.hh \
38bindings/eldbus_cxx/eldbus_service.hh \
39bindings/eldbus_cxx/eldbus_signature_traits.hh
40
41### Unit tests
42
43if EFL_ENABLE_TESTS
44
45check_PROGRAMS += tests/eldbus_cxx/eldbus_cxx_suite
46TESTS += tests/eldbus_cxx/eldbus_cxx_suite
47
48tests_eldbus_cxx_eldbus_cxx_suite_SOURCES = \
49tests/eldbus_cxx/eldbus_cxx_suite.cc \
50tests/eldbus_cxx/eldbus_cxx_test_eldbus_connect.cc \
51tests/eldbus_cxx/eldbus_cxx_test_eldbus_client.cc \
52tests/eldbus_cxx/eldbus_cxx_suite.h
53
54tests_eldbus_cxx_eldbus_cxx_suite_CPPFLAGS = \
55-I$(top_builddir)/src/bindings/eina_cxx \
56-I$(top_srcdir)/src/bindings/eina_cxx \
57-I$(top_builddir)/src/bindings/ecore_cxx \
58-I$(top_srcdir)/src/bindings/ecore_cxx \
59-I$(top_builddir)/src/bindings/eldbus_cxx \
60-I$(top_srcdir)/src/bindings/eldbus_cxx \
61-I$(top_builddir)/src/lib/efl \
62-I$(top_builddir)/src/lib/efl/interfaces \
63-I$(top_builddir)/src/lib/ecore \
64-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eldbus\" \
65@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EINA_CFLAGS@ \
66@ECORE_CFLAGS@ @EO_CFLAGS@ @EO_CXX_CFLAGS@ @ELDBUS_CFLAGS@
67
68tests_eldbus_cxx_eldbus_cxx_suite_LDADD = @CHECK_LIBS@ @USE_ELDBUS_LIBS@
69tests_eldbus_cxx_eldbus_cxx_suite_DEPENDENCIES = @USE_ELDBUS_INTERNAL_LIBS@
70
71endif
72
73endif
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 3d9a15f..c5f8e6f 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -1312,6 +1312,11 @@ GENERATED_JS_BINDINGS += $(generated_elementary_js_bindings)
1312 1312
1313endif 1313endif
1314 1314
1315if HAVE_CXX11
1316elementary_eolian_cxx_hh = $(elm_public_eolian_files:%.eo=%.eo.hh)
1317elementary_eolian_cxx_impl = $(elm_public_eolian_files:%.eo=%.eo.impl.hh)
1318endif
1319
1315EXTRA_DIST += \ 1320EXTRA_DIST += \
1316tests/elementary/elm_suite.h \ 1321tests/elementary/elm_suite.h \
1317tests/elementary/elm_test_helper.h \ 1322tests/elementary/elm_test_helper.h \
diff --git a/src/Makefile_Elementary_Cxx.am b/src/Makefile_Elementary_Cxx.am
deleted file mode 100644
index d88795c..0000000
--- a/src/Makefile_Elementary_Cxx.am
+++ /dev/null
@@ -1,54 +0,0 @@
1if HAVE_CXX11
2
3
4### Generated headers
5generated_elementary_cxx_bindings = $(elm_eolian_files:%.eo=%.eo.hh)
6generated_elementary_cxx_impl_bindings = $(elm_eolian_files:%.eo=%.eo.impl.hh)
7
8lib/elementary/Elementary.hh: $(generated_elementary_cxx_bindings)
9 @echo @ECHO_E@ "#ifndef EFL_CXX_ELEMENTARY_HH\n#define EFL_CXX_ELEMENTARY_HH\n" > $(top_builddir)/src/lib/elementary/Elementary.hh
10 @echo @ECHO_E@ "#if defined(ELEMENTARY_H) || defined(ELM_WIDGET_H)" >> $(top_builddir)/src/lib/elementary/Elementary.hh
11 @echo @ECHO_E@ "#error Do not include Elm C API headers before including Elementary.hh" >> $(top_builddir)/src/lib/elementary/Elementary.hh
12 @echo @ECHO_E@ "#endif" >> $(top_builddir)/src/lib/elementary/Elementary.hh
13 @echo @ECHO_E@ "" >> $(top_builddir)/src/lib/elementary/Elementary.hh
14 @echo @ECHO_E@ "extern \"C\" {" >> $(top_builddir)/src/lib/elementary/Elementary.hh
15 @echo @ECHO_E@ "#include \"Elementary.h\"" >> $(top_builddir)/src/lib/elementary/Elementary.hh
16 @echo @ECHO_E@ "#include \"elm_widget.h\"" >> $(top_builddir)/src/lib/elementary/Elementary.hh
17 @echo @ECHO_E@ "}" >> $(top_builddir)/src/lib/elementary/Elementary.hh
18 @echo @ECHO_E@ "" >> $(top_builddir)/src/lib/elementary/Elementary.hh
19 @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/elementary/Elementary.hh
20 @for i in $(generated_elementary_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/elementary/Elementary.hh; done
21 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/elementary/Elementary.hh
22
23generated_elementary_cxx_all = \
24 $(generated_elementary_cxx_bindings) \
25 $(generated_elementary_cxx_impl_bindings) \
26 lib/elementary/Elementary.hh
27
28CLEANFILES += $(generated_elementary_cxx_all)
29
30installed_elementarycxxmainheadersdir = $(includedir)/elementary-cxx-@VMAJ@/
31nodist_installed_elementarycxxmainheaders_DATA = $(generated_elementary_cxx_all)
32
33### Unit tests
34### To be reenable in the future when we do have a meaningful tests
35
36if EFL_ENABLE_TESTS
37
38check_PROGRAMS +=
39TESTS +=
40
41# tests_elementary_cxx_cxx_compile_test_SOURCES = tests/elementary_cxx/cxx_compile_test.cc
42# tests_elementary_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
43# -I$(top_builddir)/src/lib/evas/canvas/ \
44# -I$(top_builddir)/src/lib/efl/interfaces/ \
45# -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/elementary_cxx\" \
46# -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/elementary_cxx\" \
47# @CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @ELEMENTARY_CXX_CFLAGS@ @EO_CXX_CFLAGS@ \
48# @ECORE_CFLAGS@ @EINA_CFLAGS@ @EVAS_CFLAGS@ @ELEMENTARY_CFLAGS@ @EO_CFLAGS@
49# tests_elementary_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_ELEMENTARY_LIBS@
50# tests_elementary_cxx_cxx_compile_test_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
51
52endif
53
54endif
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index 6cf0b3a..c61822c 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -225,3 +225,10 @@ CLEANFILES += $(generated_eo_js_bindings)
225GENERATED_JS_BINDINGS += $(generated_eo_js_bindings) 225GENERATED_JS_BINDINGS += $(generated_eo_js_bindings)
226 226
227endif 227endif
228
229if HAVE_CXX11
230
231eo_eolian_cxx_hh = $(eo_eolian_files:%.eo=%.eo.hh)
232eo_eolian_cxx_impl_hh = $(eo_eolian_files:%.eo=%.eo.impl.hh)
233
234endif
diff --git a/src/Makefile_Eo_Cxx.am b/src/Makefile_Eo_Cxx.am
deleted file mode 100644
index 8153058..0000000
--- a/src/Makefile_Eo_Cxx.am
+++ /dev/null
@@ -1,34 +0,0 @@
1
2### Generated Headers
3
4generated_eo_cxx_bindings = \
5lib/eo/eo_base.eo.hh \
6lib/eo/eo_base.eo.impl.hh \
7lib/eo/eo_class.eo.hh \
8lib/eo/eo_class.eo.impl.hh
9
10### Library
11
12if HAVE_CXX11
13
14CLEANFILES += $(generated_eo_cxx_bindings)
15
16nodist_installed_eocxxheaders_DATA = $(generated_eo_cxx_bindings)
17
18installed_eocxxmainheadersdir = $(includedir)/eo-cxx-@VMAJ@/
19dist_installed_eocxxmainheaders_DATA = \
20bindings/eo_cxx/Eo.hh
21
22installed_eocxxheadersdir = $(includedir)/eo-cxx-@VMAJ@/
23dist_installed_eocxxheaders_DATA = \
24bindings/eo_cxx/eo_concrete.hh \
25bindings/eo_cxx/eo_event.hh \
26bindings/eo_cxx/eo_init.hh \
27bindings/eo_cxx/eo_wref.hh \
28bindings/eo_cxx/eo_inherit.hh \
29bindings/eo_cxx/eo_ops.hh \
30bindings/eo_cxx/eo_private.hh \
31bindings/eo_cxx/eo_inherit_bindings.hh \
32bindings/eo_cxx/eo_cxx_interop.hh
33
34endif
diff --git a/src/Makefile_Eolian_Cxx.am b/src/Makefile_Eolian_Cxx.am
index 2e08a84..98aa5e3 100644
--- a/src/Makefile_Eolian_Cxx.am
+++ b/src/Makefile_Eolian_Cxx.am
@@ -45,6 +45,7 @@ bin_eolian_cxx_eolian_cxx_SOURCES = \
45bin_eolian_cxx_eolian_cxx_CXXFLAGS = -I$(top_builddir)/src/lib/efl \ 45bin_eolian_cxx_eolian_cxx_CXXFLAGS = -I$(top_builddir)/src/lib/efl \
46-I$(top_srcdir)/src/lib/eolian_cxx/ \ 46-I$(top_srcdir)/src/lib/eolian_cxx/ \
47@CHECK_CFLAGS@ @EINA_CFLAGS@ @EINA_CXX_CFLAGS@ @EO_CFLAGS@ \ 47@CHECK_CFLAGS@ @EINA_CFLAGS@ @EINA_CXX_CFLAGS@ @EO_CFLAGS@ \
48-I$(top_srcdir)/src/bindings/cxx/eina_cxx \
48@EOLIAN_CXX_CFLAGS@ @EOLIAN_CFLAGS@ 49@EOLIAN_CXX_CFLAGS@ @EOLIAN_CFLAGS@
49 50
50bin_eolian_cxx_eolian_cxx_LDADD = @CHECK_LIBS@ @USE_EOLIAN_LIBS@ 51bin_eolian_cxx_eolian_cxx_LDADD = @CHECK_LIBS@ @USE_EOLIAN_LIBS@
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 10df07e..daa11b8 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -2375,3 +2375,8 @@ CLEANFILES += $(generated_evas_js_bindings)
2375GENERATED_JS_BINDINGS += $(generated_evas_js_bindings) 2375GENERATED_JS_BINDINGS += $(generated_evas_js_bindings)
2376 2376
2377endif 2377endif
2378
2379if HAVE_CXX11
2380evas_eolian_cxx_hh = $(evas_eolian_pub_files:%.eo=%.eo.hh)
2381evas_eolian_cxx_impl = $(evas_eolian_pub_files:%.eo=%.eo.impl.hh)
2382endif
diff --git a/src/Makefile_Evas_Cxx.am b/src/Makefile_Evas_Cxx.am
deleted file mode 100644
index 40cacee..0000000
--- a/src/Makefile_Evas_Cxx.am
+++ /dev/null
@@ -1,48 +0,0 @@
1
2if HAVE_CXX11
3
4### Generated headers
5
6generated_evas_canvas_cxx_bindings = $(evas_eolian_pub_files:%.eo=%.eo.hh)
7generated_evas_canvas_cxx_impl_bindings = $(evas_eolian_pub_files:%.eo=%.eo.impl.hh)
8
9lib/evas/Evas.hh: $(generated_evas_canvas_cxx_bindings)
10 @echo @ECHO_E@ "#ifndef EFL_CXX_EVAS_HH\n#define EFL_CXX_EVAS_HH\n" > $(top_builddir)/src/lib/evas/Evas.hh
11 @echo @ECHO_E@ "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/evas/Evas.hh
12 @for i in $(generated_evas_canvas_cxx_bindings); do echo "#include <canvas/$$(basename $$i)>" >> $(top_builddir)/src/lib/evas/Evas.hh; done
13 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/evas/Evas.hh
14
15generated_evas_canvas_cxx_all = \
16 $(generated_evas_canvas_cxx_bindings) \
17 $(generated_evas_canvas_cxx_impl_bindings) \
18 lib/evas/Evas.hh
19
20CLEANFILES += $(generated_evas_canvas_cxx_all)
21
22installed_evascxxmainheadersdir = $(includedir)/evas-cxx-@VMAJ@/
23nodist_installed_evascxxmainheaders_DATA = lib/evas/Evas.hh
24
25installed_evascxxcanvasheadersdir = $(includedir)/evas-cxx-@VMAJ@/canvas
26nodist_installed_evascxxcanvasheaders_DATA = $(generated_evas_canvas_cxx_all)
27
28### Unit tests
29
30if EFL_ENABLE_TESTS
31
32check_PROGRAMS += tests/evas_cxx/cxx_compile_test
33TESTS += tests/evas_cxx/cxx_compile_test
34
35tests_evas_cxx_cxx_compile_test_SOURCES = tests/evas_cxx/cxx_compile_test.cc
36tests_evas_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
37 -I$(top_builddir)/src/lib/efl/interfaces/ \
38 -I$(top_builddir)/src/lib/evas/canvas/ \
39 -I$(top_builddir)/src/lib/evas/include/ \
40 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/evas_cxx\" \
41 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/evas_cxx\" \
42 @CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @EO_CXX_CFLAGS@ \
43 @ECORE_CFLAGS@ @EINA_CFLAGS@ @EVAS_CFLAGS@ @EO_CFLAGS@
44tests_evas_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_EVAS_LIBS@
45tests_evas_cxx_cxx_compile_test_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
46
47endif
48endif
diff --git a/src/bin/eolian_cxx/type_lookup_table.cc b/src/bin/eolian_cxx/type_lookup_table.cc
index de65299..55a8e69 100644
--- a/src/bin/eolian_cxx/type_lookup_table.cc
+++ b/src/bin/eolian_cxx/type_lookup_table.cc
@@ -13,22 +13,22 @@ type_lookup_table
13 {"Ecore_Task_Cb", eolian_type::callback_, {"Ecore.h"}}, 13 {"Ecore_Task_Cb", eolian_type::callback_, {"Ecore.h"}},
14 {"Ecore_Timeline_Cb", eolian_type::callback_, {"Ecore.h"}}, 14 {"Ecore_Timeline_Cb", eolian_type::callback_, {"Ecore.h"}},
15 {"Edje_Signal_Cb", eolian_type::callback_, {"Edje.h"}}, 15 {"Edje_Signal_Cb", eolian_type::callback_, {"Edje.h"}},
16 {"Eina_Accessor *", eolian_type::complex_, false, false, true, false, "::efl::eina::accessor", {"eina-cxx/eina_accessor.hh"}}, 16 {"Eina_Accessor *", eolian_type::complex_, false, false, true, false, "::efl::eina::accessor", {"eina_accessor.hh"}},
17 {"Eina_Bool", eolian_type::simple_, false, false, false, false, "bool", {}}, 17 {"Eina_Bool", eolian_type::simple_, false, false, false, false, "bool", {}},
18 {"Eina_Bool *", eolian_type::simple_, false, false, false, false, "bool*", {}}, 18 {"Eina_Bool *", eolian_type::simple_, false, false, false, false, "bool*", {}},
19 {"Eina_Inlist *", eolian_type::complex_, false, false, true, true, "::efl::eina::range_inlist", {"eina-cxx/eina_inlist.hh"}}, 19 {"Eina_Inlist *", eolian_type::complex_, false, false, true, true, "::efl::eina::range_inlist", {"eina_inlist.hh"}},
20 {"Eina_Inlist *", eolian_type::complex_, false, true, true, true, "::efl::eina::inlist", {"eina-cxx/eina_inlist.hh"}}, 20 {"Eina_Inlist *", eolian_type::complex_, false, true, true, true, "::efl::eina::inlist", {"eina_inlist.hh"}},
21 {"Eina_Iterator *", eolian_type::complex_, false, false, true, true, "::efl::eina::iterator", {"eina-cxx/eina_iterator.hh"}}, 21 {"Eina_Iterator *", eolian_type::complex_, false, false, true, true, "::efl::eina::iterator", {"eina_iterator.hh"}},
22 {"Eina_List *", eolian_type::complex_, false, false, true, true, "::efl::eina::range_list", {"eina-cxx/eina_list.hh"}}, 22 {"Eina_List *", eolian_type::complex_, false, false, true, true, "::efl::eina::range_list", {"eina_list.hh"}},
23 {"Eina_List *", eolian_type::complex_, false, true, true, true, "::efl::eina::list", {"eina-cxx/eina_list.hh"}}, 23 {"Eina_List *", eolian_type::complex_, false, true, true, true, "::efl::eina::list", {"eina_list.hh"}},
24 {"const Eina_List *", eolian_type::complex_, true, false, true, true, "::efl::eina::crange_list", {"eina-cxx/eina_list.hh"}}, 24 {"const Eina_List *", eolian_type::complex_, true, false, true, true, "::efl::eina::crange_list", {"eina_list.hh"}},
25 {"Eio_Filter_Direct_Cb", eolian_type::callback_, {"Eio.h"}}, 25 {"Eio_Filter_Direct_Cb", eolian_type::callback_, {"Eio.h"}},
26 {"Eo *", eolian_type::simple_, false, true, true, false, "::efl::eo::concrete", {"eo_concrete.hh"}}, 26 {"Eo *", eolian_type::simple_, false, true, true, false, "::efl::eo::concrete", {"eo_concrete.hh"}},
27 {"Eo *", eolian_type::simple_, false, false, true, false, "::efl::eo::concrete", {"eo_concrete.hh"}}, 27 {"Eo *", eolian_type::simple_, false, false, true, false, "::efl::eo::concrete", {"eo_concrete.hh"}},
28 //{"Evas_Object_Box_Layout", eolian_type::callback_, {"Evas.h"}}, 28 //{"Evas_Object_Box_Layout", eolian_type::callback_, {"Evas.h"}},
29 //{"char *", eolian_type::simple_, false, true, true, false, "std::unique_ptr<char*>", {"memory"}}, 29 //{"char *", eolian_type::simple_, false, true, true, false, "std::unique_ptr<char*>", {"memory"}},
30 {"const Eina_Inlist *", eolian_type::complex_, false, false, true, true, "::efl::eina::range_inlist", {"eina-cxx/eina_inlist.hh"}}, 30 {"const Eina_Inlist *", eolian_type::complex_, false, false, true, true, "::efl::eina::range_inlist", {"eina_inlist.hh"}},
31 {"const Eina_List *", eolian_type::complex_, false, false, true, true, "::efl::eina::range_list", {"eina-cxx/eina_ptrlist.hh"}}, 31 {"const Eina_List *", eolian_type::complex_, false, false, true, true, "::efl::eina::range_list", {"eina_ptrlist.hh"}},
32 {"const char *", eolian_type::simple_, false, false, true, true, "::efl::eina::string_view", {"string"}}, 32 {"const char *", eolian_type::simple_, false, false, true, true, "::efl::eina::string_view", {"string"}},
33}; 33};
34 34
diff --git a/src/bindings/ecore_cxx/Ecore.hh b/src/bindings/cxx/ecore_cxx/Ecore.hh
index c671287..c671287 100644
--- a/src/bindings/ecore_cxx/Ecore.hh
+++ b/src/bindings/cxx/ecore_cxx/Ecore.hh
diff --git a/src/bindings/eet_cxx/Eet.hh b/src/bindings/cxx/eet_cxx/Eet.hh
index 002d73a..002d73a 100644
--- a/src/bindings/eet_cxx/Eet.hh
+++ b/src/bindings/cxx/eet_cxx/Eet.hh
diff --git a/src/bindings/eet_cxx/eet_composite.hh b/src/bindings/cxx/eet_cxx/eet_composite.hh
index 2c8f6be..2c8f6be 100644
--- a/src/bindings/eet_cxx/eet_composite.hh
+++ b/src/bindings/cxx/eet_cxx/eet_composite.hh
diff --git a/src/bindings/eet_cxx/eet_register.hh b/src/bindings/cxx/eet_cxx/eet_register.hh
index b18da36..b18da36 100644
--- a/src/bindings/eet_cxx/eet_register.hh
+++ b/src/bindings/cxx/eet_cxx/eet_register.hh
diff --git a/src/bindings/eet_cxx/eet_type.hh b/src/bindings/cxx/eet_cxx/eet_type.hh
index e12bc98..e12bc98 100644
--- a/src/bindings/eet_cxx/eet_type.hh
+++ b/src/bindings/cxx/eet_cxx/eet_type.hh
diff --git a/src/bindings/eina_cxx/Eina.hh b/src/bindings/cxx/eina_cxx/Eina.hh
index 8f54628..8f54628 100644
--- a/src/bindings/eina_cxx/Eina.hh
+++ b/src/bindings/cxx/eina_cxx/Eina.hh
diff --git a/src/bindings/eina_cxx/eina_accessor.hh b/src/bindings/cxx/eina_cxx/eina_accessor.hh
index 800c3fa..800c3fa 100644
--- a/src/bindings/eina_cxx/eina_accessor.hh
+++ b/src/bindings/cxx/eina_cxx/eina_accessor.hh
diff --git a/src/bindings/eina_cxx/eina_array.hh b/src/bindings/cxx/eina_cxx/eina_array.hh
index 7c8e798..7c8e798 100644
--- a/src/bindings/eina_cxx/eina_array.hh
+++ b/src/bindings/cxx/eina_cxx/eina_array.hh
diff --git a/src/bindings/eina_cxx/eina_clone_allocators.hh b/src/bindings/cxx/eina_cxx/eina_clone_allocators.hh
index 76ff620..76ff620 100644
--- a/src/bindings/eina_cxx/eina_clone_allocators.hh
+++ b/src/bindings/cxx/eina_cxx/eina_clone_allocators.hh
diff --git a/src/bindings/eina_cxx/eina_eo_concrete_fwd.hh b/src/bindings/cxx/eina_cxx/eina_eo_concrete_fwd.hh
index 3e96e8f..3e96e8f 100644
--- a/src/bindings/eina_cxx/eina_eo_concrete_fwd.hh
+++ b/src/bindings/cxx/eina_cxx/eina_eo_concrete_fwd.hh
diff --git a/src/bindings/eina_cxx/eina_error.hh b/src/bindings/cxx/eina_cxx/eina_error.hh
index 24e41a8..24e41a8 100644
--- a/src/bindings/eina_cxx/eina_error.hh
+++ b/src/bindings/cxx/eina_cxx/eina_error.hh
diff --git a/src/bindings/eina_cxx/eina_fold.hh b/src/bindings/cxx/eina_cxx/eina_fold.hh
index 167e0df..167e0df 100644
--- a/src/bindings/eina_cxx/eina_fold.hh
+++ b/src/bindings/cxx/eina_cxx/eina_fold.hh
diff --git a/src/bindings/eina_cxx/eina_function.hh b/src/bindings/cxx/eina_cxx/eina_function.hh
index cef6da5..cef6da5 100644
--- a/src/bindings/eina_cxx/eina_function.hh
+++ b/src/bindings/cxx/eina_cxx/eina_function.hh
diff --git a/src/bindings/eina_cxx/eina_inarray.hh b/src/bindings/cxx/eina_cxx/eina_inarray.hh
index 5a2c7f4..5a2c7f4 100644
--- a/src/bindings/eina_cxx/eina_inarray.hh
+++ b/src/bindings/cxx/eina_cxx/eina_inarray.hh
diff --git a/src/bindings/eina_cxx/eina_inlist.hh b/src/bindings/cxx/eina_cxx/eina_inlist.hh
index 0092989..0092989 100644
--- a/src/bindings/eina_cxx/eina_inlist.hh
+++ b/src/bindings/cxx/eina_cxx/eina_inlist.hh
diff --git a/src/bindings/eina_cxx/eina_integer_sequence.hh b/src/bindings/cxx/eina_cxx/eina_integer_sequence.hh
index f99c871..f99c871 100644
--- a/src/bindings/eina_cxx/eina_integer_sequence.hh
+++ b/src/bindings/cxx/eina_cxx/eina_integer_sequence.hh
diff --git a/src/bindings/eina_cxx/eina_iterator.hh b/src/bindings/cxx/eina_cxx/eina_iterator.hh
index dcada2c..dcada2c 100644
--- a/src/bindings/eina_cxx/eina_iterator.hh
+++ b/src/bindings/cxx/eina_cxx/eina_iterator.hh
diff --git a/src/bindings/eina_cxx/eina_list.hh b/src/bindings/cxx/eina_cxx/eina_list.hh
index a47a7d7..a47a7d7 100644
--- a/src/bindings/eina_cxx/eina_list.hh
+++ b/src/bindings/cxx/eina_cxx/eina_list.hh
diff --git a/src/bindings/eina_cxx/eina_lists_auxiliary.hh b/src/bindings/cxx/eina_cxx/eina_lists_auxiliary.hh
index 924dd73..924dd73 100644
--- a/src/bindings/eina_cxx/eina_lists_auxiliary.hh
+++ b/src/bindings/cxx/eina_cxx/eina_lists_auxiliary.hh
diff --git a/src/bindings/eina_cxx/eina_log.hh b/src/bindings/cxx/eina_cxx/eina_log.hh
index 5ec0744..5ec0744 100644
--- a/src/bindings/eina_cxx/eina_log.hh
+++ b/src/bindings/cxx/eina_cxx/eina_log.hh
diff --git a/src/bindings/eina_cxx/eina_logical.hh b/src/bindings/cxx/eina_cxx/eina_logical.hh
index d53d354..d53d354 100644
--- a/src/bindings/eina_cxx/eina_logical.hh
+++ b/src/bindings/cxx/eina_cxx/eina_logical.hh
diff --git a/src/bindings/eina_cxx/eina_optional.hh b/src/bindings/cxx/eina_cxx/eina_optional.hh
index 7cb2075..7cb2075 100644
--- a/src/bindings/eina_cxx/eina_optional.hh
+++ b/src/bindings/cxx/eina_cxx/eina_optional.hh
diff --git a/src/bindings/eina_cxx/eina_pp.hh b/src/bindings/cxx/eina_cxx/eina_pp.hh
index 22a6a22..22a6a22 100644
--- a/src/bindings/eina_cxx/eina_pp.hh
+++ b/src/bindings/cxx/eina_cxx/eina_pp.hh
diff --git a/src/bindings/eina_cxx/eina_ptrarray.hh b/src/bindings/cxx/eina_cxx/eina_ptrarray.hh
index f47202e..f47202e 100644
--- a/src/bindings/eina_cxx/eina_ptrarray.hh
+++ b/src/bindings/cxx/eina_cxx/eina_ptrarray.hh
diff --git a/src/bindings/eina_cxx/eina_ptrlist.hh b/src/bindings/cxx/eina_cxx/eina_ptrlist.hh
index f7254b1..f7254b1 100644
--- a/src/bindings/eina_cxx/eina_ptrlist.hh
+++ b/src/bindings/cxx/eina_cxx/eina_ptrlist.hh
diff --git a/src/bindings/eina_cxx/eina_range_types.hh b/src/bindings/cxx/eina_cxx/eina_range_types.hh
index 4f05d73..4f05d73 100644
--- a/src/bindings/eina_cxx/eina_range_types.hh
+++ b/src/bindings/cxx/eina_cxx/eina_range_types.hh
diff --git a/src/bindings/eina_cxx/eina_ref.hh b/src/bindings/cxx/eina_cxx/eina_ref.hh
index 8a3b4e8..8a3b4e8 100644
--- a/src/bindings/eina_cxx/eina_ref.hh
+++ b/src/bindings/cxx/eina_cxx/eina_ref.hh
diff --git a/src/bindings/eina_cxx/eina_string_view.hh b/src/bindings/cxx/eina_cxx/eina_string_view.hh
index cfa3ba0..cfa3ba0 100644
--- a/src/bindings/eina_cxx/eina_string_view.hh
+++ b/src/bindings/cxx/eina_cxx/eina_string_view.hh
diff --git a/src/bindings/eina_cxx/eina_stringshare.hh b/src/bindings/cxx/eina_cxx/eina_stringshare.hh
index e7e2f67..e7e2f67 100644
--- a/src/bindings/eina_cxx/eina_stringshare.hh
+++ b/src/bindings/cxx/eina_cxx/eina_stringshare.hh
diff --git a/src/bindings/eina_cxx/eina_thread.hh b/src/bindings/cxx/eina_cxx/eina_thread.hh
index f12c577..f12c577 100644
--- a/src/bindings/eina_cxx/eina_thread.hh
+++ b/src/bindings/cxx/eina_cxx/eina_thread.hh
diff --git a/src/bindings/eina_cxx/eina_throw.hh b/src/bindings/cxx/eina_cxx/eina_throw.hh
index 3eb382b..3eb382b 100644
--- a/src/bindings/eina_cxx/eina_throw.hh
+++ b/src/bindings/cxx/eina_cxx/eina_throw.hh
diff --git a/src/bindings/eina_cxx/eina_tuple.hh b/src/bindings/cxx/eina_cxx/eina_tuple.hh
index 45545c3..45545c3 100644
--- a/src/bindings/eina_cxx/eina_tuple.hh
+++ b/src/bindings/cxx/eina_cxx/eina_tuple.hh
diff --git a/src/bindings/eina_cxx/eina_tuple_c.hh b/src/bindings/cxx/eina_cxx/eina_tuple_c.hh
index 64d67c4..64d67c4 100644
--- a/src/bindings/eina_cxx/eina_tuple_c.hh
+++ b/src/bindings/cxx/eina_cxx/eina_tuple_c.hh
diff --git a/src/bindings/eina_cxx/eina_tuple_unwrap.hh b/src/bindings/cxx/eina_cxx/eina_tuple_unwrap.hh
index f2bbb00..f2bbb00 100644
--- a/src/bindings/eina_cxx/eina_tuple_unwrap.hh
+++ b/src/bindings/cxx/eina_cxx/eina_tuple_unwrap.hh
diff --git a/src/bindings/eina_cxx/eina_type_traits.hh b/src/bindings/cxx/eina_cxx/eina_type_traits.hh
index ff8bfbb..ff8bfbb 100644
--- a/src/bindings/eina_cxx/eina_type_traits.hh
+++ b/src/bindings/cxx/eina_cxx/eina_type_traits.hh
diff --git a/src/bindings/eina_cxx/eina_value.hh b/src/bindings/cxx/eina_cxx/eina_value.hh
index cc57191..cc57191 100644
--- a/src/bindings/eina_cxx/eina_value.hh
+++ b/src/bindings/cxx/eina_cxx/eina_value.hh
diff --git a/src/bindings/eldbus_cxx/Eldbus.hh b/src/bindings/cxx/eldbus_cxx/Eldbus.hh
index 67cbaf6..67cbaf6 100644
--- a/src/bindings/eldbus_cxx/Eldbus.hh
+++ b/src/bindings/cxx/eldbus_cxx/Eldbus.hh
diff --git a/src/bindings/eldbus_cxx/eldbus_basic.hh b/src/bindings/cxx/eldbus_cxx/eldbus_basic.hh
index aa287b4..aa287b4 100644
--- a/src/bindings/eldbus_cxx/eldbus_basic.hh
+++ b/src/bindings/cxx/eldbus_cxx/eldbus_basic.hh
diff --git a/src/bindings/eldbus_cxx/eldbus_error.hh b/src/bindings/cxx/eldbus_cxx/eldbus_error.hh
index dad1d1b..dad1d1b 100644
--- a/src/bindings/eldbus_cxx/eldbus_error.hh
+++ b/src/bindings/cxx/eldbus_cxx/eldbus_error.hh
diff --git a/src/bindings/eldbus_cxx/eldbus_freedesktop.hh b/src/bindings/cxx/eldbus_cxx/eldbus_freedesktop.hh
index 4af8c58..4af8c58 100644
--- a/src/bindings/eldbus_cxx/eldbus_freedesktop.hh
+++ b/src/bindings/cxx/eldbus_cxx/eldbus_freedesktop.hh
diff --git a/src/bindings/eldbus_cxx/eldbus_integer_sequence.hh b/src/bindings/cxx/eldbus_cxx/eldbus_integer_sequence.hh
index 282936a..282936a 100644
--- a/src/bindings/eldbus_cxx/eldbus_integer_sequence.hh
+++ b/src/bindings/cxx/eldbus_cxx/eldbus_integer_sequence.hh
diff --git a/src/bindings/eldbus_cxx/eldbus_message.hh b/src/bindings/cxx/eldbus_cxx/eldbus_message.hh
index 3f9e15d..3f9e15d 100644
--- a/src/bindings/eldbus_cxx/eldbus_message.hh
+++ b/src/bindings/cxx/eldbus_cxx/eldbus_message.hh
diff --git a/src/bindings/eldbus_cxx/eldbus_message_arguments.hh b/src/bindings/cxx/eldbus_cxx/eldbus_message_arguments.hh
index 6c57b02..6c57b02 100644
--- a/src/bindings/eldbus_cxx/eldbus_message_arguments.hh
+++ b/src/bindings/cxx/eldbus_cxx/eldbus_message_arguments.hh
diff --git a/src/bindings/eldbus_cxx/eldbus_proxy_call.hh b/src/bindings/cxx/eldbus_cxx/eldbus_proxy_call.hh
index f06f71a..f06f71a 100644
--- a/src/bindings/eldbus_cxx/eldbus_proxy_call.hh
+++ b/src/bindings/cxx/eldbus_cxx/eldbus_proxy_call.hh
diff --git a/src/bindings/eldbus_cxx/eldbus_raw_tuple.hh b/src/bindings/cxx/eldbus_cxx/eldbus_raw_tuple.hh
index ee17cfb..ee17cfb 100644
--- a/src/bindings/eldbus_cxx/eldbus_raw_tuple.hh
+++ b/src/bindings/cxx/eldbus_cxx/eldbus_raw_tuple.hh
diff --git a/src/bindings/eldbus_cxx/eldbus_service.hh b/src/bindings/cxx/eldbus_cxx/eldbus_service.hh
index 6a4919c..6a4919c 100644
--- a/src/bindings/eldbus_cxx/eldbus_service.hh
+++ b/src/bindings/cxx/eldbus_cxx/eldbus_service.hh
diff --git a/src/bindings/eldbus_cxx/eldbus_signature_traits.hh b/src/bindings/cxx/eldbus_cxx/eldbus_signature_traits.hh
index 8f2f324..8f2f324 100644
--- a/src/bindings/eldbus_cxx/eldbus_signature_traits.hh
+++ b/src/bindings/cxx/eldbus_cxx/eldbus_signature_traits.hh
diff --git a/src/bindings/eo_cxx/Eo.hh b/src/bindings/cxx/eo_cxx/Eo.hh
index a6f0423..a6f0423 100644
--- a/src/bindings/eo_cxx/Eo.hh
+++ b/src/bindings/cxx/eo_cxx/Eo.hh
diff --git a/src/bindings/eo_cxx/eo_concrete.hh b/src/bindings/cxx/eo_cxx/eo_concrete.hh
index c975bbc..c975bbc 100644
--- a/src/bindings/eo_cxx/eo_concrete.hh
+++ b/src/bindings/cxx/eo_cxx/eo_concrete.hh
diff --git a/src/bindings/eo_cxx/eo_cxx_interop.hh b/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh
index 1e35d0c..1e35d0c 100644
--- a/src/bindings/eo_cxx/eo_cxx_interop.hh
+++ b/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh
diff --git a/src/bindings/eo_cxx/eo_event.hh b/src/bindings/cxx/eo_cxx/eo_event.hh
index 320bfc9..320bfc9 100644
--- a/src/bindings/eo_cxx/eo_event.hh
+++ b/src/bindings/cxx/eo_cxx/eo_event.hh
diff --git a/src/bindings/eo_cxx/eo_inherit.hh b/src/bindings/cxx/eo_cxx/eo_inherit.hh
index a05d11f..a05d11f 100644
--- a/src/bindings/eo_cxx/eo_inherit.hh
+++ b/src/bindings/cxx/eo_cxx/eo_inherit.hh
diff --git a/src/bindings/eo_cxx/eo_inherit_bindings.hh b/src/bindings/cxx/eo_cxx/eo_inherit_bindings.hh
index bb29b9e..bb29b9e 100644
--- a/src/bindings/eo_cxx/eo_inherit_bindings.hh
+++ b/src/bindings/cxx/eo_cxx/eo_inherit_bindings.hh
diff --git a/src/bindings/eo_cxx/eo_init.hh b/src/bindings/cxx/eo_cxx/eo_init.hh
index a1cb3c2..a1cb3c2 100644
--- a/src/bindings/eo_cxx/eo_init.hh
+++ b/src/bindings/cxx/eo_cxx/eo_init.hh
diff --git a/src/bindings/eo_cxx/eo_ops.hh b/src/bindings/cxx/eo_cxx/eo_ops.hh
index f4c2f1e..f4c2f1e 100644
--- a/src/bindings/eo_cxx/eo_ops.hh
+++ b/src/bindings/cxx/eo_cxx/eo_ops.hh
diff --git a/src/bindings/eo_cxx/eo_private.hh b/src/bindings/cxx/eo_cxx/eo_private.hh
index ec4d92c..ec4d92c 100644
--- a/src/bindings/eo_cxx/eo_private.hh
+++ b/src/bindings/cxx/eo_cxx/eo_private.hh
diff --git a/src/bindings/eo_cxx/eo_wref.hh b/src/bindings/cxx/eo_cxx/eo_wref.hh
index fc32e47..fc32e47 100644
--- a/src/bindings/eo_cxx/eo_wref.hh
+++ b/src/bindings/cxx/eo_cxx/eo_wref.hh
diff --git a/src/lib/elementary/elm_image.eo b/src/lib/elementary/elm_image.eo
index b2940f5..1a57191 100644
--- a/src/lib/elementary/elm_image.eo
+++ b/src/lib/elementary/elm_image.eo
@@ -42,7 +42,7 @@ struct Elm.Image.Error
42} 42}
43 43
44class Elm.Image (Elm.Widget, Evas.Clickable_Interface, Evas.Draggable_Interface, 44class Elm.Image (Elm.Widget, Evas.Clickable_Interface, Evas.Draggable_Interface,
45 Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View, Efl.Player, 45 Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View,
46 Elm.Interface.Atspi_Image, Elm.Interface.Atspi_Widget_Action, 46 Elm.Interface.Atspi_Image, Elm.Interface.Atspi_Widget_Action,
47 Edje.Object, Efl.Orientation, Efl.Flipable) 47 Edje.Object, Efl.Orientation, Efl.Flipable)
48{ 48{
diff --git a/src/tests/elementary_cxx/cxx_compile_test.cc b/src/tests/elementary_cxx/cxx_compile_test.cc
new file mode 100644
index 0000000..0ff0f2a
--- /dev/null
+++ b/src/tests/elementary_cxx/cxx_compile_test.cc
@@ -0,0 +1,14 @@
1
2#ifdef HAVE_CONFIG_H
3# include "config.h"
4# include "elementary_config.h"
5#endif
6
7#include <Elementary.hh>
8
9#include <iostream>
10
11int main()
12{
13 return 0;
14}