summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-09-20 10:16:28 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-09-20 10:47:23 +0100
commit95328255b1503602e53bd600dd41fdd01c0f8024 (patch)
treee8ccc586b27516ed561f5eed170a897026b22eac
parent17e375c5a7600c76e02efdec3e96c3edf5d27bbb (diff)
wiz - remove e module src support as .libs dirs no longer exist
it wouldnt work anyway and i removed it for e modules themselbves already - now fix this for wizard too as it'd not work anyway.
-rw-r--r--src/modules/wizard/e_mod_main.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/modules/wizard/e_mod_main.c b/src/modules/wizard/e_mod_main.c
index ce6c884..51d62b5 100644
--- a/src/modules/wizard/e_mod_main.c
+++ b/src/modules/wizard/e_mod_main.c
@@ -64,16 +64,11 @@ e_modapi_init(E_Module *m)
64 Eina_List *files; 64 Eina_List *files;
65 char buf[PATH_MAX]; 65 char buf[PATH_MAX];
66 char *file; 66 char *file;
67 const char *src_path;
68 67
69 wiz_module = m; 68 wiz_module = m;
70 wizard_init(); 69 wizard_init();
71 70
72 src_path = getenv("E_MODULE_SRC_PATH"); 71 snprintf(buf, sizeof(buf), "%s/%s", e_module_dir_get(m), MODULE_ARCH);
73 if (src_path)
74 snprintf(buf, sizeof(buf), "%s/.libs", e_module_dir_get(m));
75 else
76 snprintf(buf, sizeof(buf), "%s/%s", e_module_dir_get(m), MODULE_ARCH);
77 files = ecore_file_ls(buf); 72 files = ecore_file_ls(buf);
78 files = eina_list_sort(files, 0, (Eina_Compare_Cb)_cb_sort_files); 73 files = eina_list_sort(files, 0, (Eina_Compare_Cb)_cb_sort_files);
79 EINA_LIST_FREE(files, file) 74 EINA_LIST_FREE(files, file)
@@ -82,11 +77,8 @@ e_modapi_init(E_Module *m)
82 { 77 {
83 void *handle; 78 void *handle;
84 79
85 if (src_path) 80 snprintf(buf, sizeof(buf), "%s/%s/%s",
86 snprintf(buf, sizeof(buf), "%s/.libs/%s", e_module_dir_get(m), file); 81 e_module_dir_get(m), MODULE_ARCH, file);
87 else
88 snprintf(buf, sizeof(buf), "%s/%s/%s",
89 e_module_dir_get(m), MODULE_ARCH, file);
90 handle = dlopen(buf, RTLD_NOW | RTLD_LOCAL); 82 handle = dlopen(buf, RTLD_NOW | RTLD_LOCAL);
91 if (handle) 83 if (handle)
92 { 84 {