diff options
| author | SangHyeon Jade Lee <dltkdgus1764@gmail.com> | 2017-11-17 20:06:46 +0900 |
|---|---|---|
| committer | SangHyeon Jade Lee <dltkdgus1764@gmail.com> | 2017-11-17 20:06:46 +0900 |
| commit | 0886ce0ab0f3ddc1d54351c90ea9f6965ca8cbff (patch) | |
| tree | fc0029a37bd30f6d9edd293276ba3f799dce584c | |
| parent | 480970d62feb0fec4292dc2410aef762c2d1814d (diff) | |
| download | efl-devs/sanghyeonlee/list_scroll.tar.gz | |
fix merge conflict errorsdevs/sanghyeonlee/list_scroll
| -rw-r--r-- | src/Makefile_Elementary.am | 44 |
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 = \ lib/elementary/elm_actionslider_part.eo \ lib/elementary/elm_bubble_part.eo \ lib/elementary/elm_fileselector_part.eo \ - lib/elementary/elm_multibuttonentry_part.eo \ - lib/elementary/elm_code_widget.eo \ - lib/elementary/efl_ui_text_interactive.eo \ - lib/elementary/efl_ui_text.eo \ - lib/elementary/efl_ui_text_editable.eo \ - lib/elementary/efl_ui_text_async.eo \ - lib/elementary/efl_config_global.eo \ - lib/elementary/efl_ui_clock.eo \ - lib/elementary/efl_ui_cursor.eo \ - lib/elementary/efl_ui_image_factory.eo \ - lib/elementary/efl_ui_focus_manager.eo \ - lib/elementary/efl_ui_focus_manager_calc.eo \ - lib/elementary/efl_ui_focus_manager_sub.eo \ - lib/elementary/efl_ui_focus_manager_root_focus.eo \ - lib/elementary/efl_ui_focus_object.eo \ - lib/elementary/efl_ui_focus_user.eo \ - lib/elementary/efl_ui_textpath.eo \ - lib/elementary/efl_ui_textpath_part.eo \ - lib/elementary/efl_ui_list.eo \ - lib/elementary/efl_ui_list_model.eo \ - lib/elementary/efl_ui_list_relayout.eo \ - lib/elementary/efl_ui_list_precise_layouter.eo \ - lib/elementary/efl_ui_list_pan.eo \ - lib/elementary/efl_ui_layout_factory.eo \ - $(NULL) - -# Private classes (not exposed or shipped) -elm_private_eolian_files = \ - lib/elementary/efl_ui_internal_text_interactive.eo \ - lib/elementary/efl_ui_win_part.eo \ - tests/elementary/focus_test.eo \ - tests/elementary/focus_test_sub_main.eo \ - $(NULL) - -# Legacy classes - not part of public EO API -elm_legacy_eolian_files = \ lib/elementary/elm_access.eo \ lib/elementary/elm_actionslider.eo \ lib/elementary/elm_box.eo \ @@ -235,11 +199,17 @@ elm_legacy_eolian_files = \ lib/elementary/elm_slideshow_item.eo \ lib/elementary/elm_table.eo \ lib/elementary/elm_thumb.eo \ + lib/elementary/efl_ui_list.eo \ + lib/elementary/efl_ui_list_model.eo \ + lib/elementary/efl_ui_list_relayout.eo \ + lib/elementary/efl_ui_list_precise_layouter.eo \ + lib/elementary/efl_ui_list_pan.eo \ + lib/elementary/efl_ui_layout_factory.eo \ $(NULL) elm_eolian_type_files = \ lib/elementary/elm_general.eot \ - lib/elementary/efl_ui.eot + lib/elementary/efl_ui.eot \ lib/elementary/efl_ui_list_types.eot elm_public_eolian_c = $(elm_public_eolian_files:%.eo=%.eo.c) |