summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2017-12-13 12:36:21 -0200
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2017-12-13 14:13:09 -0200
commite67d6484b8b5dd75904b6d2368663eab4886229b (patch)
tree36be61a5368fe203d482c9063abba25f1cee8a44 /src
parentfd92dec358bf6d98b4b334e938140049b6f5f12e (diff)
efl-cxx: Fixes to make dist
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am15
-rw-r--r--src/Makefile_Cxx.am176
-rw-r--r--src/Makefile_Ecore.am2
-rw-r--r--src/Makefile_Edje.am2
-rw-r--r--src/Makefile_Efl.am2
-rw-r--r--src/Makefile_Efl_Mono.am91
-rw-r--r--src/Makefile_Eldbus.am2
-rw-r--r--src/Makefile_Elementary.am2
-rw-r--r--src/Makefile_Eo.am2
-rw-r--r--src/Makefile_Eolian_Cxx.am9
-rw-r--r--src/Makefile_Evas.am2
-rw-r--r--src/examples/efl_mono/Makefile.am15
-rw-r--r--src/examples/eina_cxx/Makefile.am4
-rw-r--r--src/examples/elementary/Makefile.am8
-rw-r--r--src/examples/eolian_cxx/Makefile.am48
-rw-r--r--src/examples/evas/Makefile.am2
-rw-r--r--src/lib/elementary/efl_ui_list.c18
-rw-r--r--src/lib/elementary/efl_ui_list_precise_layouter.c3
-rw-r--r--src/lib/elementary/efl_ui_list_segarray.c1
19 files changed, 200 insertions, 204 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 68e66b5ef1..b87c91c561 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -126,24 +126,15 @@ examples/emotion \
126examples/emile \ 126examples/emile \
127examples/elocation \ 127examples/elocation \
128examples/ethumb_client \ 128examples/ethumb_client \
129examples/eina_cxx \
130examples/eolian_cxx \
131examples/efl_mono \
129examples/elementary 132examples/elementary
130 133
131if HAVE_ELUA 134if HAVE_ELUA
132EXAMPLES_SUBDIRS += examples/elua 135EXAMPLES_SUBDIRS += examples/elua
133endif 136endif
134 137
135EXAMPLES_CXX = \
136examples/eina_cxx \
137examples/eolian_cxx
138
139if HAVE_CXX11
140EXAMPLES_SUBDIRS += $(EXAMPLES_CXX)
141endif
142
143if HAVE_CSHARP
144EXAMPLES_SUBDIRS += examples/efl_mono
145endif
146
147if ALWAYS_BUILD_EXAMPLES 138if ALWAYS_BUILD_EXAMPLES
148SUBDIRS += . $(EXAMPLES_SUBDIRS) 139SUBDIRS += . $(EXAMPLES_SUBDIRS)
149endif 140endif
diff --git a/src/Makefile_Cxx.am b/src/Makefile_Cxx.am
index bc9f3749f7..ab4b55204b 100644
--- a/src/Makefile_Cxx.am
+++ b/src/Makefile_Cxx.am
@@ -1,10 +1,13 @@
1if HAVE_CXX11
2 1
3### Eo C++ 2### Eo C++
4CLEANFILES += $(eo_eolian_cxx_hh) $(eo_eolian_cxx_impl_hh) 3installed_eetcxxheadersdir = $(includedir)/eet-cxx-@VMAJ@
4dist_installed_eetcxxheaders_DATA = \
5bindings/cxx/eet_cxx/eet_composite.hh \
6bindings/cxx/eet_cxx/eet_register.hh \
7bindings/cxx/eet_cxx/eet_type.hh \
8bindings/cxx/eet_cxx/Eet.hh
5 9
6installed_eocxxheadersdir = $(includedir)/eo-cxx-@VMAJ@/ 10installed_eocxxheadersdir = $(includedir)/eo-cxx-@VMAJ@/
7nodist_installed_eocxxheaders_DATA = $(eo_eolian_cxx_hh) $(eo_eolian_cxx_impl_hh)
8dist_installed_eocxxheaders_DATA = \ 11dist_installed_eocxxheaders_DATA = \
9bindings/cxx/eo_cxx/eo_concrete.hh \ 12bindings/cxx/eo_cxx/eo_concrete.hh \
10bindings/cxx/eo_cxx/eo_cxx_interop.hh \ 13bindings/cxx/eo_cxx/eo_cxx_interop.hh \
@@ -19,54 +22,16 @@ bindings/cxx/eo_cxx/eo_promise_meta.hh \
19bindings/cxx/eo_cxx/eo_private.hh \ 22bindings/cxx/eo_cxx/eo_private.hh \
20bindings/cxx/eo_cxx/efl_object_impl.hh 23bindings/cxx/eo_cxx/efl_object_impl.hh
21 24
22### Elementary C++
23installed_elementarycxxmainheadersdir = $(includedir)/elementary-cxx-@VMAJ@/
24nodist_installed_elementarycxxmainheaders_DATA = $(elementary_eolian_cxx_hh) $(elementary_eolian_cxx_impl_hh) \
25lib/elementary/Elementary.eo.hh
26dist_installed_elementarycxxmainheaders_DATA = lib/elementary/Elementary.hh
27
28lib/elementary/Elementary.eo.hh: $(elm_public_eolian_files) $(_EOLIAN_CXX_DEP)
29 $(AM_V_EOLCXX) \
30 $(MKDIR_P) $(dir $@); \
31 $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^)
32
33CLEANFILES += $(elementary_eolian_cxx_hh) $(elementary_eolian_cxx_impl_hh) lib/elementary/Elementary.eo.hh
34
35### Efl C++
36installed_eflcxxmainheadersdir = $(includedir)/efl-cxx-@VMAJ@/ 25installed_eflcxxmainheadersdir = $(includedir)/efl-cxx-@VMAJ@/
37nodist_installed_eflcxxmainheaders_DATA = $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl_hh) lib/efl/Efl.eo.hh
38dist_installed_eflcxxmainheaders_DATA = lib/efl/Efl.hh lib/efl/cxx/efl_part_impl.hh 26dist_installed_eflcxxmainheaders_DATA = lib/efl/Efl.hh lib/efl/cxx/efl_part_impl.hh
39 27
40lib/efl/Efl.eo.hh: $(efl_eolian_files) $(_EOLIAN_CXX_DEP) 28installed_elementarycxxmainheadersdir = $(includedir)/elementary-cxx-@VMAJ@/
41 $(AM_V_EOLCXX) \ 29dist_installed_elementarycxxmainheaders_DATA = lib/elementary/Elementary.hh
42 $(MKDIR_P) $(dir $@); \
43 $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^)
44
45CLEANFILES += $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl_hh) lib/efl/Efl.eo.hh
46 30
47### Evas C++
48installed_evascxxmainheadersdir = $(includedir)/evas-cxx-@VMAJ@/ 31installed_evascxxmainheadersdir = $(includedir)/evas-cxx-@VMAJ@/
49dist_installed_evascxxmainheaders_DATA = lib/evas/Evas.hh 32dist_installed_evascxxmainheaders_DATA = lib/evas/Evas.hh
50nodist_installed_evascxxmainheaders_DATA = lib/evas/Evas.eo.hh
51
52installed_evascxxcanvasheadersdir = $(includedir)/evas-cxx-@VMAJ@/canvas
53nodist_installed_evascxxcanvasheaders_DATA = $(evas_canvas_eolian_cxx_hh) $(evas_canvas_eolian_cxx_impl_hh)
54
55installed_evascxxgestureheadersdir = $(includedir)/evas-cxx-@VMAJ@/gesture
56nodist_installed_evascxxgestureheaders_DATA = $(evas_gesture_eolian_cxx_hh) $(evas_gesture_eolian_cxx_impl_hh)
57
58lib/evas/Evas.eo.hh: $(evas_canvas_eolian_pub_files) $(evas_gesture_eolian_pub_files) $(_EOLIAN_CXX_DEP)
59 $(AM_V_EOLCXX) \
60 $(MKDIR_P) $(dir $@); \
61 $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^)
62 33
63CLEANFILES += $(evas_canvas_eolian_cxx_hh) $(evas_canvas_eolian_cxx_impl_hh) \
64 $(evas_gesture_eolian_cxx_hh) $(evas_gesture_eolian_cxx_impl_hh) \
65 lib/evas/Evas.eo.hh
66
67### Eldbus C++
68installed_eldbuscxxmainheadersdir = $(includedir)/eldbus_cxx-@VMAJ@ 34installed_eldbuscxxmainheadersdir = $(includedir)/eldbus_cxx-@VMAJ@
69nodist_installed_eldbuscxxmainheaders_DATA = $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl_hh) lib/eldbus/Eldbus_Model.eo.hh
70dist_installed_eldbuscxxmainheaders_DATA = \ 35dist_installed_eldbuscxxmainheaders_DATA = \
71bindings/cxx/eldbus_cxx/eldbus_basic.hh \ 36bindings/cxx/eldbus_cxx/eldbus_basic.hh \
72bindings/cxx/eldbus_cxx/eldbus_error.hh \ 37bindings/cxx/eldbus_cxx/eldbus_error.hh \
@@ -81,50 +46,13 @@ bindings/cxx/eldbus_cxx/eldbus_service.hh \
81bindings/cxx/eldbus_cxx/eldbus_signature_traits.hh \ 46bindings/cxx/eldbus_cxx/eldbus_signature_traits.hh \
82bindings/cxx/eldbus_cxx/Eldbus_Model.hh 47bindings/cxx/eldbus_cxx/Eldbus_Model.hh
83 48
84lib/eldbus/Eldbus_Model.eo.hh: $(eldbus_eolian_files) $(_EOLIAN_CXX_DEP)
85 $(AM_V_EOLCXX) \
86 $(MKDIR_P) $(dir $@); \
87 $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^)
88
89CLEANFILES += $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl_hh) lib/eldbus/Eldbus_Model.eo.hh
90
91### Eet C++
92installed_eetcxxheadersdir = $(includedir)/eet-cxx-@VMAJ@
93dist_installed_eetcxxheaders_DATA = \
94bindings/cxx/eet_cxx/eet_composite.hh \
95bindings/cxx/eet_cxx/eet_register.hh \
96bindings/cxx/eet_cxx/eet_type.hh \
97bindings/cxx/eet_cxx/Eet.hh
98
99### Generated headers src/lib/edje
100installed_edjecxxmainheadersdir = $(includedir)/edje-cxx-@VMAJ@/ 49installed_edjecxxmainheadersdir = $(includedir)/edje-cxx-@VMAJ@/
101dist_installed_edjecxxmainheaders_DATA = lib/edje/Edje.hh
102nodist_installed_edjecxxmainheaders_DATA = $(edje_eolian_cxx_hh) $(edje_eolian_cxx_impl_hh) lib/edje/Edje.eo.hh
103
104lib/edje/Edje.eo.hh: $(edje_eolian_files) $(_EOLIAN_CXX_DEP)
105 $(AM_V_EOLCXX) \
106 $(MKDIR_P) $(dir $@); \
107 $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^)
108 50
109CLEANFILES += $(edje_eolian_cxx_hh) $(edje_eolian_cxx_impl_hh) lib/edje/Edje.eo.hh
110
111### Ecore src/lib/ecore
112installed_ecorecxxheadersdir = $(includedir)/ecore-cxx-@VMAJ@ 51installed_ecorecxxheadersdir = $(includedir)/ecore-cxx-@VMAJ@
113dist_installed_ecorecxxheaders_DATA = \ 52dist_installed_ecorecxxheaders_DATA = \
114bindings/cxx/ecore_cxx/Ecore.hh \ 53bindings/cxx/ecore_cxx/Ecore.hh \
115bindings/cxx/ecore_cxx/Ecore_Manual.hh 54bindings/cxx/ecore_cxx/Ecore_Manual.hh
116 55
117nodist_installed_ecorecxxheaders_DATA = $(ecore_eolian_cxx_hh) $(ecore_eolian_cxx_impl_hh) \
118lib/ecore/Ecore.eo.hh
119
120lib/ecore/Ecore.eo.hh: $(ecore_eolian_files_public) $(_EOLIAN_CXX_DEP)
121 $(AM_V_EOLCXX) \
122 $(MKDIR_P) $(dir $@); \
123 $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^)
124
125CLEANFILES += $(ecore_eolian_cxx_hh) $(ecore_eolian_cxx_impl_hh) lib/ecore/Ecore.eo.hh
126
127## Eina src/lib/eina
128installed_einacxxheadersdir = $(includedir)/eina-cxx-@VMAJ@ 56installed_einacxxheadersdir = $(includedir)/eina-cxx-@VMAJ@
129dist_installed_einacxxheaders_DATA = \ 57dist_installed_einacxxheaders_DATA = \
130bindings/cxx/eina_cxx/eina_accessor.hh \ 58bindings/cxx/eina_cxx/eina_accessor.hh \
@@ -166,11 +94,91 @@ bindings/cxx/eina_cxx/eina_copy_traits.hh \
166bindings/cxx/eina_cxx/eina_variant.hh \ 94bindings/cxx/eina_cxx/eina_variant.hh \
167bindings/cxx/eina_cxx/Eina.hh 95bindings/cxx/eina_cxx/Eina.hh
168 96
169### Eio
170installed_eiocxxmainheadersdir = $(includedir)/eio-cxx-@VMAJ@/ 97installed_eiocxxmainheadersdir = $(includedir)/eio-cxx-@VMAJ@/
171nodist_installed_eiocxxmainheaders_DATA = $(eio_eolian_cxx_hh) $(eio_eolian_cxx_impl_hh) lib/eio/Eio.eo.hh
172dist_installed_eiocxxmainheaders_DATA = lib/eio/Eio.hh 98dist_installed_eiocxxmainheaders_DATA = lib/eio/Eio.hh
173 99
100if HAVE_CXX
101nodist_installed_edjecxxmainheaders_DATA = $(edje_eolian_cxx_hh) $(edje_eolian_cxx_impl_hh) lib/edje/Edje.eo.hh
102nodist_installed_eocxxheaders_DATA = $(eo_eolian_cxx_hh) $(eo_eolian_cxx_impl_hh)
103nodist_installed_eflcxxmainheaders_DATA = $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl_hh) lib/efl/Efl.eo.hh
104nodist_installed_elementarycxxmainheaders_DATA = $(elementary_eolian_cxx_hh) $(elementary_eolian_cxx_impl_hh) \
105lib/elementary/Elementary.eo.hh
106nodist_installed_eldbuscxxmainheaders_DATA = $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl_hh) lib/eldbus/Eldbus_Model.eo.hh
107
108CLEANFILES = $(eo_eolian_cxx_hh) $(eo_eolian_cxx_impl_hh)
109
110### Elementary C++
111
112lib/elementary/Elementary.eo.hh: $(elm_public_eolian_files) $(_EOLIAN_CXX_DEP)
113 $(AM_V_EOLCXX) \
114 $(MKDIR_P) $(dir $@); \
115 $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^)
116
117CLEANFILES += $(elementary_eolian_cxx_hh) $(elementary_eolian_cxx_impl_hh) lib/elementary/Elementary.eo.hh
118
119### Efl C++
120lib/efl/Efl.eo.hh: $(efl_eolian_files) $(_EOLIAN_CXX_DEP)
121 $(AM_V_EOLCXX) \
122 $(MKDIR_P) $(dir $@); \
123 $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^)
124
125CLEANFILES += $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl_hh) lib/efl/Efl.eo.hh
126
127### Evas C++
128nodist_installed_evascxxmainheaders_DATA = lib/evas/Evas.eo.hh
129
130installed_evascxxcanvasheadersdir = $(includedir)/evas-cxx-@VMAJ@/canvas
131nodist_installed_evascxxcanvasheaders_DATA = $(evas_canvas_eolian_cxx_hh) $(evas_canvas_eolian_cxx_impl_hh)
132
133installed_evascxxgestureheadersdir = $(includedir)/evas-cxx-@VMAJ@/gesture
134nodist_installed_evascxxgestureheaders_DATA = $(evas_gesture_eolian_cxx_hh) $(evas_gesture_eolian_cxx_impl_hh)
135
136
137lib/evas/Evas.eo.hh: $(evas_canvas_eolian_pub_files) $(evas_gesture_eolian_pub_files) $(_EOLIAN_CXX_DEP)
138 $(AM_V_EOLCXX) \
139 $(MKDIR_P) $(dir $@); \
140 $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^)
141
142CLEANFILES += $(evas_canvas_eolian_cxx_hh) $(evas_canvas_eolian_cxx_impl_hh) \
143 $(evas_gesture_eolian_cxx_hh) $(evas_gesture_eolian_cxx_impl_hh) \
144 lib/evas/Evas.eo.hh
145
146
147lib/eldbus/Eldbus_Model.eo.hh: $(eldbus_eolian_files) $(_EOLIAN_CXX_DEP)
148 $(AM_V_EOLCXX) \
149 $(MKDIR_P) $(dir $@); \
150 $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^)
151
152CLEANFILES += $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl_hh) lib/eldbus/Eldbus_Model.eo.hh
153
154### Eet C++
155
156### Generated headers src/lib/edje
157dist_installed_edjecxxmainheaders_DATA = lib/edje/Edje.hh
158
159lib/edje/Edje.eo.hh: $(edje_eolian_files) $(_EOLIAN_CXX_DEP)
160 $(AM_V_EOLCXX) \
161 $(MKDIR_P) $(dir $@); \
162 $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^)
163
164CLEANFILES += $(edje_eolian_cxx_hh) $(edje_eolian_cxx_impl_hh) lib/edje/Edje.eo.hh
165
166### Ecore src/lib/ecore
167nodist_installed_ecorecxxheaders_DATA = $(ecore_eolian_cxx_hh) $(ecore_eolian_cxx_impl_hh) \
168lib/ecore/Ecore.eo.hh
169
170lib/ecore/Ecore.eo.hh: $(ecore_eolian_files_public) $(_EOLIAN_CXX_DEP)
171 $(AM_V_EOLCXX) \
172 $(MKDIR_P) $(dir $@); \
173 $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^)
174
175CLEANFILES += $(ecore_eolian_cxx_hh) $(ecore_eolian_cxx_impl_hh) lib/ecore/Ecore.eo.hh
176
177## Eina src/lib/eina
178
179### Eio
180nodist_installed_eiocxxmainheaders_DATA = $(eio_eolian_cxx_hh) $(eio_eolian_cxx_impl_hh) lib/eio/Eio.eo.hh
181
174lib/eio/Eio.eo.hh: $(eio_eolian_files) $(_EOLIAN_CXX_DEP) 182lib/eio/Eio.eo.hh: $(eio_eolian_files) $(_EOLIAN_CXX_DEP)
175 $(AM_V_EOLCXX) \ 183 $(AM_V_EOLCXX) \
176 $(MKDIR_P) $(dir $@); \ 184 $(MKDIR_P) $(dir $@); \
@@ -382,7 +390,7 @@ tests_elementary_cxx_cxx_dummy_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib
382 390
383endif 391endif
384 392
393endif
394
385EXTRA_DIST2 += \ 395EXTRA_DIST2 += \
386tests/eina_cxx/simple.eo 396tests/eina_cxx/simple.eo
387
388endif
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 02b06f0353..d1d79cd7e4 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -340,7 +340,7 @@ GENERATED_JS_BINDINGS += $(generated_ecore_js_bindings)
340 340
341endif 341endif
342 342
343if HAVE_CXX11 343if HAVE_CXX
344 344
345ecore_eolian_cxx_hh = $(ecore_eolian_files_public:%.eo=%.eo.hh) 345ecore_eolian_cxx_hh = $(ecore_eolian_files_public:%.eo=%.eo.hh)
346ecore_eolian_cxx_impl_hh = $(ecore_eolian_files_public:%.eo=%.eo.impl.hh) 346ecore_eolian_cxx_impl_hh = $(ecore_eolian_files_public:%.eo=%.eo.impl.hh)
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 0831e01dba..c57f11130e 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -372,7 +372,7 @@ GENERATED_JS_BINDINGS += $(generated_edje_js_bindings)
372 372
373endif 373endif
374 374
375if HAVE_CXX11 375if HAVE_CXX
376edje_eolian_cxx_hh = $(edje_eolian_files:%.eo=%.eo.hh) 376edje_eolian_cxx_hh = $(edje_eolian_files:%.eo=%.eo.hh)
377edje_eolian_cxx_impl_hh = $(edje_eolian_files:%.eo=%.eo.impl.hh) 377edje_eolian_cxx_impl_hh = $(edje_eolian_files:%.eo=%.eo.impl.hh)
378endif 378endif
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index c80d81c950..8ddbe80c38 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -174,7 +174,7 @@ generated_efl_js_bindings = $(efl_eolian_files:%.eo=%.eo.js.cc)
174GENERATED_JS_BINDINGS += $(generated_efl_js_bindings) 174GENERATED_JS_BINDINGS += $(generated_efl_js_bindings)
175endif 175endif
176 176
177if HAVE_CXX11 177if HAVE_CXX
178efl_eolian_cxx_hh = $(efl_eolian_files:%.eo=%.eo.hh) 178efl_eolian_cxx_hh = $(efl_eolian_files:%.eo=%.eo.hh)
179efl_eolian_cxx_impl_hh = $(efl_eolian_files:%.eo=%.eo.impl.hh) 179efl_eolian_cxx_impl_hh = $(efl_eolian_files:%.eo=%.eo.impl.hh)
180endif 180endif
diff --git a/src/Makefile_Efl_Mono.am b/src/Makefile_Efl_Mono.am
index 00f4dbb43e..b40cacf69e 100644
--- a/src/Makefile_Efl_Mono.am
+++ b/src/Makefile_Efl_Mono.am
@@ -1,3 +1,50 @@
1
2efl_custom_exports_mono_files = \
3 lib/efl_mono/efl_custom_exports_mono.c
4
5efl_eo_mono_files = \
6 bindings/mono/eo_mono/object.cs \
7 bindings/mono/eo_mono/iwrapper.cs \
8 bindings/mono/eo_mono/workaround.cs
9
10efl_eina_mono_files = \
11 bindings/mono/eina_mono/eina_config.cs \
12 bindings/mono/eina_mono/eina_array.cs \
13 bindings/mono/eina_mono/eina_hash.cs \
14 bindings/mono/eina_mono/eina_list.cs \
15 bindings/mono/eina_mono/eina_inarray.cs \
16 bindings/mono/eina_mono/eina_inlist.cs \
17 bindings/mono/eina_mono/eina_iterator.cs \
18 bindings/mono/eina_mono/eina_container_common.cs \
19 bindings/mono/eina_mono/eina_common.cs \
20 bindings/mono/eina_mono/eina_log.cs \
21 bindings/mono/eina_mono/eina_binbuf.cs \
22 bindings/mono/eina_mono/eina_slice.cs \
23 bindings/mono/eina_mono/eina_stringshare.cs \
24 bindings/mono/eina_mono/eina_error.cs \
25 bindings/mono/eina_mono/eina_value.cs
26
27efl_eldbus_mono_files = \
28 bindings/mono/eldbus_mono/eldbus_common.cs \
29 bindings/mono/eldbus_mono/eldbus_config.cs \
30 bindings/mono/eldbus_mono/eldbus_connection.cs \
31 bindings/mono/eldbus_mono/eldbus_message.cs \
32 bindings/mono/eldbus_mono/eldbus_object.cs \
33 bindings/mono/eldbus_mono/eldbus_pending.cs \
34 bindings/mono/eldbus_mono/eldbus_proxy.cs \
35 bindings/mono/eldbus_mono/eldbus_service.cs
36
37efl_ecore_evas_mono_files = \
38 bindings/mono/ecore_evas_mono/ecore_evas.cs
39
40lib_efl_mono_libefl_mono_dll_SOURCES = \
41 bindings/mono/efl_mono/efl_all.cs \
42 $(builddir)/bindings/mono/efl_mono/efl_libs.cs \
43 $(efl_eo_mono_files) \
44 $(efl_eina_mono_files) \
45 $(efl_eldbus_mono_files) \
46 $(efl_ecore_evas_mono_files)
47
1if HAVE_CSHARP 48if HAVE_CSHARP
2 49
3bin_PROGRAMS += bin/eolian_mono/eolian_mono 50bin_PROGRAMS += bin/eolian_mono/eolian_mono
@@ -117,8 +164,6 @@ MCS_FLAGS += -define:WIN32
117endif 164endif
118 165
119# Efl Custom Exports Mono auxiliary library 166# Efl Custom Exports Mono auxiliary library
120efl_custom_exports_mono_files = \
121 lib/efl_mono/efl_custom_exports_mono.c
122 167
123lib_LTLIBRARIES += \ 168lib_LTLIBRARIES += \
124lib/efl_mono/libeflcustomexportsmono.la 169lib/efl_mono/libeflcustomexportsmono.la
@@ -137,48 +182,6 @@ lib_efl_mono_libeflcustomexportsmono_la_DEPENDENCIES = @EFL_CUSTOM_EXPORTS_MONO_
137#Efl Mono - C Sharp binding library 182#Efl Mono - C Sharp binding library
138bin_PROGRAMS += lib/efl_mono/libefl_mono.dll 183bin_PROGRAMS += lib/efl_mono/libefl_mono.dll
139 184
140efl_eo_mono_files = \
141 bindings/mono/eo_mono/object.cs \
142 bindings/mono/eo_mono/iwrapper.cs \
143 bindings/mono/eo_mono/workaround.cs
144
145efl_eina_mono_files = \
146 bindings/mono/eina_mono/eina_config.cs \
147 bindings/mono/eina_mono/eina_array.cs \
148 bindings/mono/eina_mono/eina_hash.cs \
149 bindings/mono/eina_mono/eina_list.cs \
150 bindings/mono/eina_mono/eina_inarray.cs \
151 bindings/mono/eina_mono/eina_inlist.cs \
152 bindings/mono/eina_mono/eina_iterator.cs \
153 bindings/mono/eina_mono/eina_container_common.cs \
154 bindings/mono/eina_mono/eina_common.cs \
155 bindings/mono/eina_mono/eina_log.cs \
156 bindings/mono/eina_mono/eina_binbuf.cs \
157 bindings/mono/eina_mono/eina_slice.cs \
158 bindings/mono/eina_mono/eina_stringshare.cs \
159 bindings/mono/eina_mono/eina_error.cs \
160 bindings/mono/eina_mono/eina_value.cs
161
162efl_eldbus_mono_files = \
163 bindings/mono/eldbus_mono/eldbus_common.cs \
164 bindings/mono/eldbus_mono/eldbus_config.cs \
165 bindings/mono/eldbus_mono/eldbus_connection.cs \
166 bindings/mono/eldbus_mono/eldbus_message.cs \
167 bindings/mono/eldbus_mono/eldbus_object.cs \
168 bindings/mono/eldbus_mono/eldbus_pending.cs \
169 bindings/mono/eldbus_mono/eldbus_proxy.cs \
170 bindings/mono/eldbus_mono/eldbus_service.cs
171
172efl_ecore_evas_mono_files = \
173 bindings/mono/ecore_evas_mono/ecore_evas.cs
174
175lib_efl_mono_libefl_mono_dll_SOURCES = \
176 bindings/mono/efl_mono/efl_all.cs \
177 $(builddir)/bindings/mono/efl_mono/efl_libs.cs \
178 $(efl_eo_mono_files) \
179 $(efl_eina_mono_files) \
180 $(efl_eldbus_mono_files) \
181 $(efl_ecore_evas_mono_files)
182 185
183lib/efl_mono/libefl_mono.dll: $(lib_efl_mono_libefl_mono_dll_SOURCES) lib/efl_mono/$(am__dirstamp) $(efl_eolian_mono_files) lib/efl_mono/libefl_mono.dll.config 186lib/efl_mono/libefl_mono.dll: $(lib_efl_mono_libefl_mono_dll_SOURCES) lib/efl_mono/$(am__dirstamp) $(efl_eolian_mono_files) lib/efl_mono/libefl_mono.dll.config
184 @rm -f lib/efl_mono/libefl_mono.dll 187 @rm -f lib/efl_mono/libefl_mono.dll
diff --git a/src/Makefile_Eldbus.am b/src/Makefile_Eldbus.am
index 988e892f88..c612b3cac1 100644
--- a/src/Makefile_Eldbus.am
+++ b/src/Makefile_Eldbus.am
@@ -108,7 +108,7 @@ bin_eldbus_eldbus_codegen_LDADD = @USE_ELDBUS_LIBS@
108endif 108endif
109bin_eldbus_eldbus_codegen_DEPENDENCIES = @USE_ELDBUS_INTERNAL_LIBS@ 109bin_eldbus_eldbus_codegen_DEPENDENCIES = @USE_ELDBUS_INTERNAL_LIBS@
110 110
111if HAVE_CXX11 111if HAVE_CXX
112eldbus_eolian_cxx_hh = $(eldbus_eolian_files:%.eo=%.eo.hh) 112eldbus_eolian_cxx_hh = $(eldbus_eolian_files:%.eo=%.eo.hh)
113eldbus_eolian_cxx_impl_hh = $(eldbus_eolian_files:%.eo=%.eo.impl.hh) 113eldbus_eolian_cxx_impl_hh = $(eldbus_eolian_files:%.eo=%.eo.impl.hh)
114endif 114endif
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 17b689f07c..d95ddd9774 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -1478,7 +1478,7 @@ GENERATED_JS_BINDINGS += $(generated_elementary_js_bindings)
1478 1478
1479endif 1479endif
1480 1480
1481if HAVE_CXX11 1481if HAVE_CXX
1482elementary_eolian_cxx_hh = $(elm_public_eolian_files:%.eo=%.eo.hh) 1482elementary_eolian_cxx_hh = $(elm_public_eolian_files:%.eo=%.eo.hh)
1483elementary_eolian_cxx_impl_hh = $(elm_public_eolian_files:%.eo=%.eo.impl.hh) 1483elementary_eolian_cxx_impl_hh = $(elm_public_eolian_files:%.eo=%.eo.impl.hh)
1484endif 1484endif
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index e2551bce88..438fbf222a 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -237,7 +237,7 @@ GENERATED_JS_BINDINGS += $(generated_eo_js_bindings)
237 237
238endif 238endif
239 239
240if HAVE_CXX11 240if HAVE_CXX
241 241
242eo_eolian_cxx_hh = $(eo_eolian_files:%.eo=%.eo.hh) 242eo_eolian_cxx_hh = $(eo_eolian_files:%.eo=%.eo.hh)
243eo_eolian_cxx_impl_hh = $(eo_eolian_files:%.eo=%.eo.impl.hh) 243eo_eolian_cxx_impl_hh = $(eo_eolian_files:%.eo=%.eo.impl.hh)
diff --git a/src/Makefile_Eolian_Cxx.am b/src/Makefile_Eolian_Cxx.am
index 6abb3d6a40..3bc12415ca 100644
--- a/src/Makefile_Eolian_Cxx.am
+++ b/src/Makefile_Eolian_Cxx.am
@@ -1,7 +1,6 @@
1 1
2### Library 2### Library
3 3
4if HAVE_CXX11
5installed_eoliancxxmainheadersdir = $(includedir)/eolian-cxx-@VMAJ@/ 4installed_eoliancxxmainheadersdir = $(includedir)/eolian-cxx-@VMAJ@/
6dist_installed_eoliancxxmainheaders_DATA = \ 5dist_installed_eoliancxxmainheaders_DATA = \
7lib/eolian_cxx/Eolian_Cxx.hh 6lib/eolian_cxx/Eolian_Cxx.hh
@@ -33,6 +32,7 @@ lib/eolian_cxx/grammar/header_include_directive.hpp \
33lib/eolian_cxx/grammar/implementation_include_directive.hpp \ 32lib/eolian_cxx/grammar/implementation_include_directive.hpp \
34lib/eolian_cxx/grammar/impl_header.hpp \ 33lib/eolian_cxx/grammar/impl_header.hpp \
35lib/eolian_cxx/grammar/indentation.hpp \ 34lib/eolian_cxx/grammar/indentation.hpp \
35lib/eolian_cxx/grammar/integral.hpp \
36lib/eolian_cxx/grammar/keyword.hpp \ 36lib/eolian_cxx/grammar/keyword.hpp \
37lib/eolian_cxx/grammar/klass_def.hpp \ 37lib/eolian_cxx/grammar/klass_def.hpp \
38lib/eolian_cxx/grammar/kleene.hpp \ 38lib/eolian_cxx/grammar/kleene.hpp \
@@ -40,14 +40,19 @@ lib/eolian_cxx/grammar/list.hpp \
40lib/eolian_cxx/grammar/meta.hpp \ 40lib/eolian_cxx/grammar/meta.hpp \
41lib/eolian_cxx/grammar/namespace.hpp \ 41lib/eolian_cxx/grammar/namespace.hpp \
42lib/eolian_cxx/grammar/parameter.hpp \ 42lib/eolian_cxx/grammar/parameter.hpp \
43lib/eolian_cxx/grammar/part_declaration.hpp \
44lib/eolian_cxx/grammar/part_implementation.hpp \
43lib/eolian_cxx/grammar/qualifier_def.hpp \ 45lib/eolian_cxx/grammar/qualifier_def.hpp \
44lib/eolian_cxx/grammar/sequence.hpp \ 46lib/eolian_cxx/grammar/sequence.hpp \
45lib/eolian_cxx/grammar/string.hpp \ 47lib/eolian_cxx/grammar/string.hpp \
48lib/eolian_cxx/grammar/type_function_declaration.hpp \
46lib/eolian_cxx/grammar/type.hpp \ 49lib/eolian_cxx/grammar/type.hpp \
47lib/eolian_cxx/grammar/type_impl.hpp \ 50lib/eolian_cxx/grammar/type_impl.hpp \
51lib/eolian_cxx/grammar/types_definition.hpp \
48lib/eolian_cxx/grammar/type_traits.hpp 52lib/eolian_cxx/grammar/type_traits.hpp
49 53
50### Binary 54### Binary
55if HAVE_CXX
51 56
52bin_PROGRAMS += bin/eolian_cxx/eolian_cxx 57bin_PROGRAMS += bin/eolian_cxx/eolian_cxx
53 58
@@ -176,6 +181,7 @@ tests_eolian_cxx_eolian_cxx_suite_LDADD = \
176tests_eolian_cxx_eolian_cxx_suite_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@ 181tests_eolian_cxx_eolian_cxx_suite_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@
177 182
178endif 183endif
184endif
179 185
180EXTRA_DIST2 += \ 186EXTRA_DIST2 += \
181tests/eolian_cxx/simple.eo \ 187tests/eolian_cxx/simple.eo \
@@ -194,4 +200,3 @@ tests/eolian_cxx/cyclic2.eo
194 200
195include Makefile_Eolian_Cxx_Helper.am 201include Makefile_Eolian_Cxx_Helper.am
196 202
197endif
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 43ad9f7f7a..cf8a6606a3 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -2573,7 +2573,7 @@ GENERATED_JS_BINDINGS += $(generated_evas_js_bindings)
2573 2573
2574endif 2574endif
2575 2575
2576if HAVE_CXX11 2576if HAVE_CXX
2577evas_canvas_eolian_cxx_hh = $(evas_canvas_eolian_pub_files:%.eo=%.eo.hh) \ 2577evas_canvas_eolian_cxx_hh = $(evas_canvas_eolian_pub_files:%.eo=%.eo.hh) \
2578 $(evas_eolian_legacy_files:%.eo=%.eo.hh) 2578 $(evas_eolian_legacy_files:%.eo=%.eo.hh)
2579evas_canvas_eolian_cxx_impl_hh = $(evas_canvas_eolian_pub_files:%.eo=%.eo.impl.hh) \ 2579evas_canvas_eolian_cxx_impl_hh = $(evas_canvas_eolian_pub_files:%.eo=%.eo.impl.hh) \
diff --git a/src/examples/efl_mono/Makefile.am b/src/examples/efl_mono/Makefile.am
index 273ede1264..49fc1c2cb3 100644
--- a/src/examples/efl_mono/Makefile.am
+++ b/src/examples/efl_mono/Makefile.am
@@ -1,17 +1,17 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3if HAVE_CSHARP
4
5include $(top_srcdir)/src/Makefile_Eolian_Helper.am 3include $(top_srcdir)/src/Makefile_Eolian_Helper.am
6include $(top_srcdir)/src/Makefile_Eolian_Mono_Helper.am 4include $(top_srcdir)/src/Makefile_Eolian_Mono_Helper.am
7include $(top_srcdir)/src/Makefile_Efl_Mono_MSBuild_Gen_Helper.am 5include $(top_srcdir)/src/Makefile_Efl_Mono_MSBuild_Gen_Helper.am
8 6
9SRCS = 7SRCS = example_numberwrapper.c
10EXTRA_FILES = 8EXTRA_FILES = example_numberwrapper.eo
11EXTRA_PROGRAMS = 9EXTRA_PROGRAMS =
12GENERATED = 10GENERATED =
13CLEANFILES = 11CLEANFILES =
14 12
13if HAVE_CSHARP
14
15# Simple object used by the examples 15# Simple object used by the examples
16 16
17EOLIAN_FLAGS := $(EOLIAN_FLAGS) 17EOLIAN_FLAGS := $(EOLIAN_FLAGS)
@@ -54,8 +54,6 @@ libexample_numberwrapper_la_SOURCES = example_numberwrapper.c
54libexample_numberwrapper_la_LDFLAGS = -shared 54libexample_numberwrapper_la_LDFLAGS = -shared
55libexample_numberwrapper_la_CFLAGS = $(COMMON_FLAGS) -DEFL_BETA_API_SUPPORT 55libexample_numberwrapper_la_CFLAGS = $(COMMON_FLAGS) -DEFL_BETA_API_SUPPORT
56 56
57SRCS += example_numberwrapper.c
58EXTRA_FILES += example_numberwrapper.eo
59GENERATED += example_numberwrapper.eo.h example_numberwrapper.eo.c EoInherit01.exe.config 57GENERATED += example_numberwrapper.eo.h example_numberwrapper.eo.c EoInherit01.exe.config
60 58
61# CSharp examples 59# CSharp examples
@@ -108,11 +106,11 @@ GENERATED += example_numberwrapper.eo.cs
108 106
109 107
110# Finishing 108# Finishing
109CLEANFILES += $(GENERATED)
110endif
111 111
112EXTRA_DIST = $(EXTRA_FILES) 112EXTRA_DIST = $(EXTRA_FILES)
113 113
114CLEANFILES += $(GENERATED)
115
116examples: $(EXTRA_PROGRAMS) 114examples: $(EXTRA_PROGRAMS)
117 115
118clean-local: 116clean-local:
@@ -131,4 +129,3 @@ if ALWAYS_BUILD_EXAMPLES
131noinst_PROGRAMS = $(EXTRA_PROGRAMS) 129noinst_PROGRAMS = $(EXTRA_PROGRAMS)
132endif 130endif
133 131
134endif
diff --git a/src/examples/eina_cxx/Makefile.am b/src/examples/eina_cxx/Makefile.am
index 6e51415850..4dfd7ebb49 100644
--- a/src/examples/eina_cxx/Makefile.am
+++ b/src/examples/eina_cxx/Makefile.am
@@ -13,6 +13,8 @@ SRCS = \
13eina_cxx_list_01.cc \ 13eina_cxx_list_01.cc \
14eina_cxx_thread_01.cc 14eina_cxx_thread_01.cc
15 15
16if HAVE_CXX
17
16EXTRA_PROGRAMS = \ 18EXTRA_PROGRAMS = \
17eina_cxx_list_01 \ 19eina_cxx_list_01 \
18eina_cxx_thread_01 20eina_cxx_thread_01
@@ -23,6 +25,8 @@ eina_cxx_list_01.cc
23eina_cxx_thread_01_SOURCES = \ 25eina_cxx_thread_01_SOURCES = \
24eina_cxx_thread_01.cc 26eina_cxx_thread_01.cc
25 27
28endif
29
26examples: $(EXTRA_PROGRAMS) 30examples: $(EXTRA_PROGRAMS)
27 31
28clean-local: 32clean-local:
diff --git a/src/examples/elementary/Makefile.am b/src/examples/elementary/Makefile.am
index 879a38f824..00cf29e307 100644
--- a/src/examples/elementary/Makefile.am
+++ b/src/examples/elementary/Makefile.am
@@ -185,7 +185,6 @@ efl_ui_list_example_1.c \
185efl_ui_list_example_2.c \ 185efl_ui_list_example_2.c \
186efl_ui_list_example_3.c 186efl_ui_list_example_3.c
187 187
188if HAVE_CXX11
189SRCS += \ 188SRCS += \
190bg_cxx_example_01.cc \ 189bg_cxx_example_01.cc \
191bg_cxx_example_02.cc \ 190bg_cxx_example_02.cc \
@@ -208,7 +207,6 @@ table_cxx_example_01.cc \
208table_cxx_example_02.cc \ 207table_cxx_example_02.cc \
209toolbar_cxx_example_01.cc \ 208toolbar_cxx_example_01.cc \
210$(NULL) 209$(NULL)
211endif
212 210
213EDCS = \ 211EDCS = \
214twitter_example_01.edc \ 212twitter_example_01.edc \
@@ -422,7 +420,7 @@ efl_ui_list_example_3
422 $(MKDIR_P) sphere_hunter/; \ 420 $(MKDIR_P) sphere_hunter/; \
423 $(EDJE_CC) $(EDJE_CC_FLAGS) -id sphere_hunter/ -id $(top_srcdir)/data/elementary/themes $< $@ 421 $(EDJE_CC) $(EDJE_CC_FLAGS) -id sphere_hunter/ -id $(top_srcdir)/data/elementary/themes $< $@
424 422
425if HAVE_CXX11 423if HAVE_CXX
426examples_PROGRAMS += \ 424examples_PROGRAMS += \
427bg_cxx_example_01 \ 425bg_cxx_example_01 \
428bg_cxx_example_02 \ 426bg_cxx_example_02 \
@@ -459,7 +457,7 @@ efl_thread_2_SOURCES = efl_thread_2.c
459efl_thread_3_SOURCES = efl_thread_3.c 457efl_thread_3_SOURCES = efl_thread_3.c
460efl_thread_4_SOURCES = efl_thread_4.c 458efl_thread_4_SOURCES = efl_thread_4.c
461 459
462if HAVE_CXX11 460if HAVE_CXX
463bg_cxx_example_01_SOURCES = bg_cxx_example_01.cc 461bg_cxx_example_01_SOURCES = bg_cxx_example_01.cc
464bg_cxx_example_02_SOURCES = bg_cxx_example_02.cc 462bg_cxx_example_02_SOURCES = bg_cxx_example_02.cc
465box_cxx_example_02_SOURCES = box_cxx_example_02.cc 463box_cxx_example_02_SOURCES = box_cxx_example_02.cc
@@ -568,7 +566,7 @@ table_example_01:table_example_01.png:0.0 \
568table_example_02:table_example_02.png:0.0 \ 566table_example_02:table_example_02.png:0.0 \
569menu_example_01:menu_example_01.png:0.5 567menu_example_01:menu_example_01.png:0.5
570 568
571if HAVE_CXX11 569if HAVE_CXX
572SCREENSHOTS += \ 570SCREENSHOTS += \
573 bg_cxx_example_01:bg_cxx_example_01.png:0.0 \ 571 bg_cxx_example_01:bg_cxx_example_01.png:0.0 \
574 bg_cxx_example_02:bg_cxx_example_02.png:0.0 \ 572 bg_cxx_example_02:bg_cxx_example_02.png:0.0 \
diff --git a/src/examples/eolian_cxx/Makefile.am b/src/examples/eolian_cxx/Makefile.am
index df5a370b19..a908170856 100644
--- a/src/examples/eolian_cxx/Makefile.am
+++ b/src/examples/eolian_cxx/Makefile.am
@@ -69,6 +69,24 @@ LDADD = \
69 $(top_builddir)/src/lib/evas/libevas.la \ 69 $(top_builddir)/src/lib/evas/libevas.la \
70 $(top_builddir)/src/lib/ecore_evas/libecore_evas.la 70 $(top_builddir)/src/lib/ecore_evas/libecore_evas.la
71 71
72IMPL = \
73 colourable.c \
74 colourable_cxx.cc \
75 colourablesquare.c \
76 colourablesquare_cxx.cc
77
78SRCS = \
79 eolian_cxx_simple_01.cc \
80 eolian_cxx_callbacks_01.cc \
81 $(IMPL)
82
83ECXX_EXAMPLE_EOS = \
84 ns_colourable.eo \
85 ns_colourablesquare.eo
86
87dist_example_eos_SOURCES = $(ECXX_EXAMPLE_EOS)
88
89if HAVE_CXX
72GENERATED = \ 90GENERATED = \
73 ns_colourable.eo.c \ 91 ns_colourable.eo.c \
74 ns_colourable.eo.h \ 92 ns_colourable.eo.h \
@@ -82,30 +100,10 @@ GENERATED = \
82BUILT_SOURCES = $(GENERATED) 100BUILT_SOURCES = $(GENERATED)
83CLEANFILES += $(BUILT_SOURCES) 101CLEANFILES += $(BUILT_SOURCES)
84 102
85ECXX_EXAMPLE_EOS = \
86 ns_colourable.eo \
87 ns_colourablesquare.eo
88
89IMPL = \
90 colourable.c \
91 colourable_cxx.cc \
92 colourablesquare.c \
93 colourablesquare_cxx.cc
94
95SRCS = \
96 eolian_cxx_simple_01.cc \
97 eolian_cxx_callbacks_01.cc \
98 $(IMPL)
99# eolian_cxx_inherit_01.cc
100
101EXTRA_PROGRAMS = \ 103EXTRA_PROGRAMS = \
102 eolian_cxx_simple_01 \ 104 eolian_cxx_simple_01 \
103 eolian_cxx_simple_01_cxx_impl \ 105 eolian_cxx_simple_01_cxx_impl \
104 eolian_cxx_callbacks_01 106 eolian_cxx_callbacks_01
105# eolian_cxx_inherit_01
106
107DATA_FILES = Makefile.examples $(ECXX_EXAMPLE_EOS)
108EXTRA_DIST = $(DATA_FILES)
109 107
110eolian_cxx_simple_01_SOURCES = \ 108eolian_cxx_simple_01_SOURCES = \
111 eolian_cxx_simple_01.cc \ 109 eolian_cxx_simple_01.cc \
@@ -123,13 +121,11 @@ eolian_cxx_simple_01_cxx_impl_SOURCES = \
123 colourablesquare_cxx.cc 121 colourablesquare_cxx.cc
124eolian_cxx_simple_01_cxx_impl.$(OBJEXT): $(GENERATED) 122eolian_cxx_simple_01_cxx_impl.$(OBJEXT): $(GENERATED)
125 123
126# eolian_cxx_inherit_01_SOURCES = \
127# eolian_cxx_inherit_01.cc \
128# colourable.c \
129# colourablesquare.c
130# eolian_cxx_inherit_01.$(OBJEXT): $(GENERATED)
131
132eolian_cxx_callbacks_01_SOURCES = eolian_cxx_callbacks_01.cc 124eolian_cxx_callbacks_01_SOURCES = eolian_cxx_callbacks_01.cc
125endif
126
127DATA_FILES = Makefile.examples $(ECXX_EXAMPLE_EOS)
128EXTRA_DIST = $(DATA_FILES)
133 129
134%.eo.hh: %.eo 130%.eo.hh: %.eo
135 $(AM_V_EOLCXX)$(EOLIAN_CXX) $(EOLIAN_FLAGS) -I${abs_srcdir} -o $@ $< 131 $(AM_V_EOLCXX)$(EOLIAN_CXX) $(EOLIAN_FLAGS) -I${abs_srcdir} -o $@ $<
diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am
index 2fc462ea2e..2c5416e3cf 100644
--- a/src/examples/evas/Makefile.am
+++ b/src/examples/evas/Makefile.am
@@ -356,7 +356,7 @@ evas_aspect_hints_SOURCES = evas-aspect-hints.c
356evas_aspect_hints_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 356evas_aspect_hints_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
357evas_aspect_hints_LDADD = $(EDJE_COMMON_LDADD) 357evas_aspect_hints_LDADD = $(EDJE_COMMON_LDADD)
358 358
359if HAVE_CXX11 359if HAVE_CXX
360 360
361EXTRA_PROGRAMS += evas_cxx_rectangle 361EXTRA_PROGRAMS += evas_cxx_rectangle
362evas_cxx_rectangle_SOURCES = evas_cxx_rectangle.cc 362evas_cxx_rectangle_SOURCES = evas_cxx_rectangle.cc
diff --git a/src/lib/elementary/efl_ui_list.c b/src/lib/elementary/efl_ui_list.c
index 4a70ab5bf4..1b3d8ce9ee 100644
--- a/src/lib/elementary/efl_ui_list.c
+++ b/src/lib/elementary/efl_ui_list.c
@@ -323,12 +323,6 @@ _efl_ui_list_efl_canvas_group_group_del(Eo *obj, Efl_Ui_List_Data *pd)
323 efl_canvas_group_del(efl_super(obj, MY_CLASS)); 323 efl_canvas_group_del(efl_super(obj, MY_CLASS));
324} 324}
325 325
326EOLIAN static void
327_efl_ui_list_efl_ui_focus_manager_focus_set(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd, Efl_Ui_Focus_Object *focus)
328{
329 efl_ui_focus_manager_focus_set(pd->manager, focus);
330}
331
332EOLIAN static Efl_Ui_Focus_Manager* 326EOLIAN static Efl_Ui_Focus_Manager*
333_efl_ui_list_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root) 327_efl_ui_list_elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd EINA_UNUSED, Efl_Ui_Focus_Object *root)
334{ 328{
@@ -408,7 +402,7 @@ _efl_ui_list_layout_factory_set(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd, Efl_U
408} 402}
409 403
410EOLIAN static void 404EOLIAN static void
411_efl_ui_list_efl_ui_view_model_set(Eo *obj, Efl_Ui_List_Data *pd, Efl_Model *model) 405_efl_ui_list_efl_ui_view_model_set(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd, Efl_Model *model)
412{ 406{
413 if (pd->model == model) 407 if (pd->model == model)
414 return; 408 return;
@@ -478,19 +472,19 @@ _efl_ui_list_efl_access_selection_selected_child_deselect(Eo *obj EINA_UNUSED, E
478} 472}
479 473
480EOLIAN Eina_Bool 474EOLIAN Eina_Bool
481_efl_ui_list_efl_access_selection_is_child_selected(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd, int child_index) 475_efl_ui_list_efl_access_selection_is_child_selected(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd EINA_UNUSED, int child_index EINA_UNUSED)
482{ 476{
483 return EINA_FALSE; 477 return EINA_FALSE;
484} 478}
485 479
486EOLIAN Eina_Bool 480EOLIAN Eina_Bool
487_efl_ui_list_efl_access_selection_all_children_select(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd) 481_efl_ui_list_efl_access_selection_all_children_select(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd EINA_UNUSED)
488{ 482{
489 return EINA_TRUE; 483 return EINA_TRUE;
490} 484}
491 485
492EOLIAN Eina_Bool 486EOLIAN Eina_Bool
493_efl_ui_list_efl_access_selection_clear(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd) 487_efl_ui_list_efl_access_selection_clear(Eo *obj EINA_UNUSED, Efl_Ui_List_Data *pd EINA_UNUSED)
494{ 488{
495 return EINA_TRUE; 489 return EINA_TRUE;
496} 490}
@@ -502,13 +496,13 @@ _efl_ui_list_efl_access_selection_child_deselect(Eo *obj EINA_UNUSED, Efl_Ui_Lis
502} 496}
503 497
504static Eina_Bool 498static Eina_Bool
505_key_action_move(Evas_Object *obj, const char *params) 499_key_action_move(Evas_Object *obj EINA_UNUSED, const char *params EINA_UNUSED)
506{ 500{
507 return EINA_FALSE; 501 return EINA_FALSE;
508} 502}
509 503
510static Eina_Bool 504static Eina_Bool
511_key_action_select(Evas_Object *obj, const char *params EINA_UNUSED) 505_key_action_select(Evas_Object *obj EINA_UNUSED, const char *params EINA_UNUSED)
512{ 506{
513 return EINA_FALSE; 507 return EINA_FALSE;
514} 508}
diff --git a/src/lib/elementary/efl_ui_list_precise_layouter.c b/src/lib/elementary/efl_ui_list_precise_layouter.c
index 7f37b7f4b6..ce66239be3 100644
--- a/src/lib/elementary/efl_ui_list_precise_layouter.c
+++ b/src/lib/elementary/efl_ui_list_precise_layouter.c
@@ -264,7 +264,8 @@ _child_removed_cb(void *data, const Efl_Event *event)
264 264
265 if (nodedata->min.w == litem->min.w) 265 if (nodedata->min.w == litem->min.w)
266 nodedata->min.w = 0; 266 nodedata->min.w = 0;
267 for (i = 0; i != itemnode->length; ++i) 267
268 for (i = 0; i != itemnode->length; ++i)
268 { 269 {
269 layout_item = (Efl_Ui_List_LayoutItem *)itemnode->pointers[i]; 270 layout_item = (Efl_Ui_List_LayoutItem *)itemnode->pointers[i];
270 if (nodedata->min.w < layout_item->min.w) 271 if (nodedata->min.w < layout_item->min.w)
diff --git a/src/lib/elementary/efl_ui_list_segarray.c b/src/lib/elementary/efl_ui_list_segarray.c
index 79c55fbbe4..08740b6c4d 100644
--- a/src/lib/elementary/efl_ui_list_segarray.c
+++ b/src/lib/elementary/efl_ui_list_segarray.c
@@ -76,7 +76,6 @@ _alloc_node(Efl_Ui_List_SegArray* segarray, int first, int max)
76 node = calloc(1, sizeof(Efl_Ui_List_SegArray_Node) + max*sizeof(Efl_Ui_List_Item*)); 76 node = calloc(1, sizeof(Efl_Ui_List_SegArray_Node) + max*sizeof(Efl_Ui_List_Item*));
77 node->first = first; 77 node->first = first;
78 node->max = max; 78 node->max = max;
79 void* tmp = segarray->root;
80 segarray->root = (void*)eina_rbtree_inline_insert(EINA_RBTREE_GET(segarray->root), EINA_RBTREE_GET(node), 79 segarray->root = (void*)eina_rbtree_inline_insert(EINA_RBTREE_GET(segarray->root), EINA_RBTREE_GET(node),
81 EINA_RBTREE_CMP_NODE_CB(&_rbtree_compare), NULL); 80 EINA_RBTREE_CMP_NODE_CB(&_rbtree_compare), NULL);
82 segarray->node_count++; 81 segarray->node_count++;