publicapibasescrollabledir = $(publicapibasedir)/controls/scrollable
publicapibasescrollviewdir = $(publicapibasedir)/controls/scrollable/scroll-view
publicapibasetableviewdir = $(publicapibasedir)/controls/table-view
-publicapibasetextviewdir = $(publicapibasedir)/controls/text-view
-publicapibasetextinputdir = $(publicapibasedir)/controls/text-input
+publicapibasetextcontrolsdir = $(publicapibasedir)/controls/text-controls
+publicapibasetextdir = $(publicapibasedir)/text
+publicapibasetextrenderingdir = $(publicapibasedir)/text/rendering
+publicapibasetextrenderingbasicdir = $(publicapibasedir)/text/rendering/basic
+publicapibasetextrenderingshadersdir = $(publicapibasedir)/text/rendering/shaders
publicapibasefactorydir = $(publicapibasedir)/factory
publicapibasefocusmanagerdir = $(publicapibasedir)/focus-manager
publicapibasemarkupprocessordir = $(publicapibasedir)/markup-processor
publicapibasescrollable_HEADERS = $(public_api_base_scrollable_header_files)
publicapibasescrollview_HEADERS = $(public_api_base_scroll_view_header_files)
publicapibasetableview_HEADERS = $(public_api_base_table_view_header_files)
-publicapibasetextview_HEADERS = $(public_api_base_text_view_header_files)
-publicapibasetextinput_HEADERS = $(public_api_base_text_input_header_files)
+publicapibasetextcontrols_HEADERS = $(public_api_base_text_controls_header_files)
+publicapibasetext_HEADERS = $(public_api_base_text_header_files)
+publicapibasetextrendering_HEADERS = $(public_api_base_text_rendering_header_files)
+publicapibasetextrenderingbasic_HEADERS = $(public_api_base_text_rendering_basic_header_files)
+publicapibasetextrenderingshaders_HEADERS = $(public_api_base_text_rendering_shaders_header_files)
publicapibasefocusmanager_HEADERS = $(public_api_base_focus_manager_header_files)
publicapibasemarkupprocessor_HEADERS = $(public_api_base_markup_processor_header_files)
publicapibaseshadereffects_HEADERS = $(public_api_base_shader_effects_header_files)