summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSangHyeon Jade Lee <dltkdgus1764@gmail.com>2017-11-17 20:06:46 +0900
committerSangHyeon Jade Lee <dltkdgus1764@gmail.com>2017-11-17 20:06:46 +0900
commit0886ce0ab0f3ddc1d54351c90ea9f6965ca8cbff (patch)
treefc0029a37bd30f6d9edd293276ba3f799dce584c
parent480970d62feb0fec4292dc2410aef762c2d1814d (diff)
fix merge conflict errorsdevs/sanghyeonlee/list_scroll
-rw-r--r--src/Makefile_Elementary.am44
1 files changed, 7 insertions, 37 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index d3cfd53152..6b3de504b2 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -173,42 +173,6 @@ elm_legacy_eolian_files = \
173 lib/elementary/elm_actionslider_part.eo \ 173 lib/elementary/elm_actionslider_part.eo \
174 lib/elementary/elm_bubble_part.eo \ 174 lib/elementary/elm_bubble_part.eo \
175 lib/elementary/elm_fileselector_part.eo \ 175 lib/elementary/elm_fileselector_part.eo \
176 lib/elementary/elm_multibuttonentry_part.eo \
177 lib/elementary/elm_code_widget.eo \
178 lib/elementary/efl_ui_text_interactive.eo \
179 lib/elementary/efl_ui_text.eo \
180 lib/elementary/efl_ui_text_editable.eo \
181 lib/elementary/efl_ui_text_async.eo \
182 lib/elementary/efl_config_global.eo \
183 lib/elementary/efl_ui_clock.eo \
184 lib/elementary/efl_ui_cursor.eo \
185 lib/elementary/efl_ui_image_factory.eo \
186 lib/elementary/efl_ui_focus_manager.eo \
187 lib/elementary/efl_ui_focus_manager_calc.eo \
188 lib/elementary/efl_ui_focus_manager_sub.eo \
189 lib/elementary/efl_ui_focus_manager_root_focus.eo \
190 lib/elementary/efl_ui_focus_object.eo \
191 lib/elementary/efl_ui_focus_user.eo \
192 lib/elementary/efl_ui_textpath.eo \
193 lib/elementary/efl_ui_textpath_part.eo \
194 lib/elementary/efl_ui_list.eo \
195 lib/elementary/efl_ui_list_model.eo \
196 lib/elementary/efl_ui_list_relayout.eo \
197 lib/elementary/efl_ui_list_precise_layouter.eo \
198 lib/elementary/efl_ui_list_pan.eo \
199 lib/elementary/efl_ui_layout_factory.eo \
200 $(NULL)
201
202# Private classes (not exposed or shipped)
203elm_private_eolian_files = \
204 lib/elementary/efl_ui_internal_text_interactive.eo \
205 lib/elementary/efl_ui_win_part.eo \
206 tests/elementary/focus_test.eo \
207 tests/elementary/focus_test_sub_main.eo \
208 $(NULL)
209
210# Legacy classes - not part of public EO API
211elm_legacy_eolian_files = \
212 lib/elementary/elm_access.eo \ 176 lib/elementary/elm_access.eo \
213 lib/elementary/elm_actionslider.eo \ 177 lib/elementary/elm_actionslider.eo \
214 lib/elementary/elm_box.eo \ 178 lib/elementary/elm_box.eo \
@@ -235,11 +199,17 @@ elm_legacy_eolian_files = \
235 lib/elementary/elm_slideshow_item.eo \ 199 lib/elementary/elm_slideshow_item.eo \
236 lib/elementary/elm_table.eo \ 200 lib/elementary/elm_table.eo \
237 lib/elementary/elm_thumb.eo \ 201 lib/elementary/elm_thumb.eo \
202 lib/elementary/efl_ui_list.eo \
203 lib/elementary/efl_ui_list_model.eo \
204 lib/elementary/efl_ui_list_relayout.eo \
205 lib/elementary/efl_ui_list_precise_layouter.eo \
206 lib/elementary/efl_ui_list_pan.eo \
207 lib/elementary/efl_ui_layout_factory.eo \
238 $(NULL) 208 $(NULL)
239 209
240elm_eolian_type_files = \ 210elm_eolian_type_files = \
241 lib/elementary/elm_general.eot \ 211 lib/elementary/elm_general.eot \
242 lib/elementary/efl_ui.eot 212 lib/elementary/efl_ui.eot \
243 lib/elementary/efl_ui_list_types.eot 213 lib/elementary/efl_ui_list_types.eot
244 214
245elm_public_eolian_c = $(elm_public_eolian_files:%.eo=%.eo.c) 215elm_public_eolian_c = $(elm_public_eolian_files:%.eo=%.eo.c)