summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel@osg.samsung.com>2018-02-12 18:37:26 +0100
committerMarcel Hollerbach <marcel@osg.samsung.com>2018-02-17 21:17:58 +0100
commit86b4af41c373a5b7d7f47770c05db1a787158e0d (patch)
tree978dd351085581dfb134c0ece00c991d9b50cbfc
parent014df3d71051a2bf01a1fb93e293a0abbbe715df (diff)
elementary: use new bs static lib
-rw-r--r--src/Makefile_Elementary.am4
-rw-r--r--src/lib/elementary/elm_module.c5
-rw-r--r--src/lib/elementary/elm_web2.c15
3 files changed, 11 insertions, 13 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 676c127f81..87122c5803 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -791,6 +791,8 @@ lib_elementary_libelementary_la_SOURCES = \
791 lib/elementary/efl_selection_manager_private.h \ 791 lib/elementary/efl_selection_manager_private.h \
792 lib/elementary/efl_selection.c \ 792 lib/elementary/efl_selection.c \
793 lib/elementary/efl_ui_dnd.c \ 793 lib/elementary/efl_ui_dnd.c \
794 static_libs/buildsystem/buildsystem.h \
795 static_libs/buildsystem/buildsystem_autotools.c \
794 $(NULL) 796 $(NULL)
795 797
796 798
@@ -814,6 +816,8 @@ lib_elementary_libelementary_la_CPPFLAGS = \
814-DPACKAGE_DATA_DIR=\"$(datadir)/elementary\" \ 816-DPACKAGE_DATA_DIR=\"$(datadir)/elementary\" \
815-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 817-DPACKAGE_BIN_DIR=\"$(bindir)\" \
816-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 818-DPACKAGE_LIB_DIR=\"$(libdir)\" \
819-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
820-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
817-DLOCALE_DIR=\"$(localedir)\" \ 821-DLOCALE_DIR=\"$(localedir)\" \
818-DICON_DIR=\"$(datadir)/icons\" \ 822-DICON_DIR=\"$(datadir)/icons\" \
819-DELM_TOP_BUILD_DIR=\"$(top_builddir)\" \ 823-DELM_TOP_BUILD_DIR=\"$(top_builddir)\" \
diff --git a/src/lib/elementary/elm_module.c b/src/lib/elementary/elm_module.c
index 447c207060..2d38327c7c 100644
--- a/src/lib/elementary/elm_module.c
+++ b/src/lib/elementary/elm_module.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4 4
5#include <Elementary.h> 5#include <Elementary.h>
6 6#include "../../static_libs/buildsystem/buildsystem.h"
7#include "elm_priv.h" 7#include "elm_priv.h"
8 8
9/* what are moodules in elementary for? for modularising behavior and features 9/* what are moodules in elementary for? for modularising behavior and features
@@ -135,8 +135,7 @@ _elm_module_load(Elm_Module *m)
135#ifdef NEED_RUN_IN_TREE 135#ifdef NEED_RUN_IN_TREE
136 if (getenv("EFL_RUN_IN_TREE")) 136 if (getenv("EFL_RUN_IN_TREE"))
137 { 137 {
138 snprintf(buf, sizeof(buf), 138 bs_mod_get(buf, sizeof(buf), "elementary", m->name);
139 ELM_TOP_BUILD_DIR "/src/modules/elementary/%s/.libs/module"EFL_SHARED_EXTENSION, m->name);
140 } 139 }
141 else 140 else
142#endif 141#endif
diff --git a/src/lib/elementary/elm_web2.c b/src/lib/elementary/elm_web2.c
index eabe310d3b..58266fdeb3 100644
--- a/src/lib/elementary/elm_web2.c
+++ b/src/lib/elementary/elm_web2.c
@@ -6,6 +6,7 @@
6 6
7#include <Elementary.h> 7#include <Elementary.h>
8 8
9#include "../../static_libs/buildsystem/buildsystem.h"
9#include "elm_priv.h" 10#include "elm_priv.h"
10#include "elm_widget_web.h" 11#include "elm_widget_web.h"
11 12
@@ -197,16 +198,10 @@ _elm_web_init(const char *engine)
197{ 198{
198 char buf[PATH_MAX]; 199 char buf[PATH_MAX];
199 200
200#ifdef NEED_RUN_IN_TREE 201 if (!bs_mod_get(buf, sizeof(buf), "elementary/web", engine))
201 if (getenv("EFL_RUN_IN_TREE")) 202 snprintf(buf, sizeof(buf),
202 snprintf(buf, sizeof(buf), 203 "%s/elementary/modules/web/%s/%s/module"EFL_SHARED_EXTENSION,
203 ELM_TOP_BUILD_DIR"/src/modules/web/%s/.libs/module"EFL_SHARED_EXTENSION, 204 _elm_lib_dir, engine, MODULE_ARCH);
204 engine);
205 else
206#endif
207 snprintf(buf, sizeof(buf),
208 "%s/elementary/modules/web/%s/%s/module"EFL_SHARED_EXTENSION,
209 _elm_lib_dir, engine, MODULE_ARCH);
210 205
211 if (ewm.m) 206 if (ewm.m)
212 { 207 {