aboutsummaryrefslogtreecommitdiffstats
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
parenteeze: use new bs static lib (diff)
downloadefl-86b4af41c373a5b7d7f47770c05db1a787158e0d.tar.gz
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 = \
lib/elementary/efl_selection_manager_private.h \
lib/elementary/efl_selection.c \
lib/elementary/efl_ui_dnd.c \
+ static_libs/buildsystem/buildsystem.h \
+ static_libs/buildsystem/buildsystem_autotools.c \
$(NULL)
@@ -814,6 +816,8 @@ lib_elementary_libelementary_la_CPPFLAGS = \
-DPACKAGE_DATA_DIR=\"$(datadir)/elementary\" \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
-DLOCALE_DIR=\"$(localedir)\" \
-DICON_DIR=\"$(datadir)/icons\" \
-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 @@
#endif
#include <Elementary.h>
-
+#include "../../static_libs/buildsystem/buildsystem.h"
#include "elm_priv.h"
/* what are moodules in elementary for? for modularising behavior and features
@@ -135,8 +135,7 @@ _elm_module_load(Elm_Module *m)
#ifdef NEED_RUN_IN_TREE
if (getenv("EFL_RUN_IN_TREE"))
{
- snprintf(buf, sizeof(buf),
- ELM_TOP_BUILD_DIR "/src/modules/elementary/%s/.libs/module"EFL_SHARED_EXTENSION, m->name);
+ bs_mod_get(buf, sizeof(buf), "elementary", m->name);
}
else
#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 @@
#include <Elementary.h>
+#include "../../static_libs/buildsystem/buildsystem.h"
#include "elm_priv.h"
#include "elm_widget_web.h"
@@ -197,16 +198,10 @@ _elm_web_init(const char *engine)
{
char buf[PATH_MAX];
-#ifdef NEED_RUN_IN_TREE
- if (getenv("EFL_RUN_IN_TREE"))
- snprintf(buf, sizeof(buf),
- ELM_TOP_BUILD_DIR"/src/modules/web/%s/.libs/module"EFL_SHARED_EXTENSION,
- engine);
- else
-#endif
- snprintf(buf, sizeof(buf),
- "%s/elementary/modules/web/%s/%s/module"EFL_SHARED_EXTENSION,
- _elm_lib_dir, engine, MODULE_ARCH);
+ if (!bs_mod_get(buf, sizeof(buf), "elementary/web", engine))
+ snprintf(buf, sizeof(buf),
+ "%s/elementary/modules/web/%s/%s/module"EFL_SHARED_EXTENSION,
+ _elm_lib_dir, engine, MODULE_ARCH);
if (ewm.m)
{