aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel@osg.samsung.com>2018-02-12 20:57:30 +0100
committerMarcel Hollerbach <marcel@osg.samsung.com>2018-02-17 21:17:58 +0100
commite3603126788a734e9cc83c80e57693273c944941 (patch)
tree5e13360c214c59ea74de5020f0279301cd9b5b31
parentevas: use new bs static lib (diff)
downloadefl-e3603126788a734e9cc83c80e57693273c944941.tar.gz
edje: use new bs static lib
-rw-r--r--src/Makefile_Edje.am5
-rw-r--r--src/lib/edje/edje_edit.c24
2 files changed, 11 insertions, 18 deletions
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index cd16f24ee5..1179d5e92e 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -110,7 +110,10 @@ lib/edje/edje_part_swallow.c \
lib/edje/edje_part_table.c \
lib/edje/edje_part_box.c \
lib/edje/edje_part_text.c \
-lib/edje/edje_part_invalid.c
+lib/edje/edje_part_invalid.c \
+static_libs/buildsystem/buildsystem.h \
+static_libs/buildsystem/buildsystem_autotools.c
+
lib_edje_libedje_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
lib_edje_libedje_la_LIBADD = @EDJE_LIBS@ @EDJE_LUA_LIBS@
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 0d39dc0274..05336438d6 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -18,6 +18,8 @@
#include <Eo.h>
+#include "../../static_libs/buildsystem/buildsystem.h"
+
#ifdef MY_CLASS
# undef MY_CLASS
#endif
@@ -12470,23 +12472,11 @@ _edje_edit_embryo_rebuild(Edje_Edit *eed)
#else
# define BIN_EXT
#endif
-#ifdef NEED_RUN_IN_TREE
-#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
- if (getuid() == geteuid())
-#endif
- {
- if (getenv("EFL_RUN_IN_TREE"))
- {
- snprintf(embryo_cc_path, sizeof(embryo_cc_path),
- "%s/src/bin/embryo/embryo_cc" BIN_EXT,
- PACKAGE_BUILD_DIR);
- snprintf(inc_path, sizeof(inc_path),
- "%s/data/edje/include", PACKAGE_BUILD_DIR);
- if (!ecore_file_exists(embryo_cc_path))
- embryo_cc_path[0] = '\0';
- }
- }
-#endif
+
+ bs_binary_get(embryo_cc_path, sizeof(embryo_cc_path), "embryo", "embryo_cc");
+
+ bs_data_path_get(inc_path, sizeof(inc_path), "edje", "include");
+
if (embryo_cc_path[0] == '\0')
{