From 620d4d3e74690d46fe46c25562b7c52c92ff5fbe Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@samsung.com>
Date: Fri, 15 Jun 2018 16:40:23 -0400
Subject: [PATCH] eina: don't init subcomponents inside eina_debug

this should be done in a single location to avoid dependency conflicts
and make the code easier to read

Differential Revision: https://phab.enlightenment.org/D6301
---
 src/lib/eina/eina_debug.c | 3 ---
 src/lib/eina/eina_main.c  | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/lib/eina/eina_debug.c b/src/lib/eina/eina_debug.c
index 9dd1a09..4ffb8d1 100644
--- a/src/lib/eina/eina_debug.c
+++ b/src/lib/eina/eina_debug.c
@@ -711,9 +711,6 @@ eina_debug_init(void)
      }
    // mark as initted
    _inited = EINA_TRUE;
-   eina_module_init();
-   eina_mempool_init();
-   eina_list_init();
    // For Windows support GetModuleFileName can be used
    // set up thread things
    eina_spinlock_new(&_eina_debug_lock);
diff --git a/src/lib/eina/eina_main.c b/src/lib/eina/eina_main.c
index 8591878..3aa7e24 100644
--- a/src/lib/eina/eina_main.c
+++ b/src/lib/eina/eina_main.c
@@ -170,6 +170,9 @@ struct eina_desc_setup
 static const struct eina_desc_setup _eina_desc_setup[] = {
 #define S(x) {# x, eina_ ## x ## _init, eina_ ## x ## _shutdown}
    /* log is a special case as it needs printf */
+   S(module),
+   S(mempool),
+   S(list),
    S(debug),
    S(evlog),
    S(stringshare),
@@ -180,9 +183,6 @@ static const struct eina_desc_setup _eina_desc_setup[] = {
    S(accessor),
    S(inarray),
    S(array),
-   S(module),
-   S(mempool),
-   S(list),
    S(binshare),
    S(ustringshare),
    S(matrixsparse),
-- 
2.7.4