summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2020-05-10 12:47:58 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-05-26 10:15:30 +0200
commit3ec1101652a9fedbfa40a29bcfe4842b1c86051e (patch)
tree59176e1e6e48eb2fff038673b884774d875814cb /src/lib/elementary
parentb13534196167d6e8db11005b3e4cb16a6c82dd85 (diff)
Merge efreet_mime efreet_trash into efreet
efreet_mime and efreet_trash are now included in libefreet.so. There are compatible libs for libefreet_mime.so libefreet_trash.so, which simple drag in libefreet.so. .pc files also are in place for compatibility. efreet_init & shutdown now initializes and shutdowns trash and mime. The old init functions now simply call efreet_init, efreet_init will then init the trash or mime libs. Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org> Differential Revision: https://phab.enlightenment.org/D11807
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/meson.build4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index f2e7ed96fb..fb4431d3f7 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -949,9 +949,9 @@ elementary_src = [
949 'efl_ui_spotlight_animation_manager.c', 949 'efl_ui_spotlight_animation_manager.c',
950] 950]
951 951
952elementary_deps = [emile, eo, efl, edje, ethumb, ethumb_client, emotion, ecore_imf, ecore_con, eldbus, efreet, efreet_mime, efreet_trash, eio, atspi, dl, intl] 952elementary_deps = [emile, eo, efl, edje, ethumb, ethumb_client, emotion, ecore_imf, ecore_con, eldbus, efreet, eio, atspi, dl, intl]
953elementary_pub_deps = [eina, eet, evas, ecore, ecore_evas, ecore_file, ecore_input, ecore_imf, ecore_con, 953elementary_pub_deps = [eina, eet, evas, ecore, ecore_evas, ecore_file, ecore_input, ecore_imf, ecore_con,
954 edje, eldbus, efreet, efreet_mime, efreet_trash, ethumb_client, efl] 954 edje, eldbus, efreet, ethumb_client, efl]
955 955
956elm_options = configuration_data() 956elm_options = configuration_data()
957 957