aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel@osg.samsung.com>2018-02-16 20:35:38 +0100
committerMarcel Hollerbach <marcel@osg.samsung.com>2018-02-17 21:17:58 +0100
commit64d671873432d2c99637f46963c16a0233e45746 (patch)
tree05082176a3146014b6c51733fb5e4c2c0d92f2b3
parentelementary: use new bs static lib (diff)
downloadefl-64d671873432d2c99637f46963c16a0233e45746.tar.gz
embryo:use new bs static lib
-rw-r--r--src/Makefile_Embryo.am5
-rw-r--r--src/bin/embryo/embryo_cc_sc1.c15
2 files changed, 8 insertions, 12 deletions
diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am
index c31fb10f1e..f5e187c8f2 100644
--- a/src/Makefile_Embryo.am
+++ b/src/Makefile_Embryo.am
@@ -44,12 +44,15 @@ bin/embryo/embryo_cc_scexpand.c \
bin/embryo/embryo_cc_sclist.c \
bin/embryo/embryo_cc_scvars.c \
bin/embryo/embryo_cc_prefix.c \
-bin/embryo/embryo_cc_prefix.h
+bin/embryo/embryo_cc_prefix.h \
+static_libs/buildsystem/buildsystem.h \
+static_libs/buildsystem/buildsystem_autotools.c
bin_embryo_embryo_cc_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
@EMBRYO_CFLAGS@
diff --git a/src/bin/embryo/embryo_cc_sc1.c b/src/bin/embryo/embryo_cc_sc1.c
index c3443dbc63..7c8283f0c9 100644
--- a/src/bin/embryo/embryo_cc_sc1.c
+++ b/src/bin/embryo/embryo_cc_sc1.c
@@ -44,6 +44,8 @@
#include "embryo_cc_sc.h"
#include "embryo_cc_prefix.h"
+#include "../../static_libs/buildsystem/buildsystem.h"
+
#define VERSION_STR "2.4"
#define VERSION_INT 240
@@ -568,22 +570,13 @@ static void
parseoptions(int argc, char **argv, char *iname, char *oname,
char *pname EINA_UNUSED, char *rname EINA_UNUSED)
{
- char str[PATH_MAX];
+ char str[PATH_MAX] = "";
int i, stack_size;
size_t len;
-#ifdef NEED_RUN_IN_TREE
- str[0] = '\0';
- if (getenv("EFL_RUN_IN_TREE"))
- {
- struct stat st;
- snprintf(str, sizeof(str), "%s/data/embryo", PACKAGE_SRC_DIR);
- if (stat(str, &st) != 0)
- str[0] = '\0';
- }
+ bs_data_path_get(str, sizeof(str), "embryo", "");
if (str[0] == '\0')
-#endif
snprintf(str, sizeof(str), "%s/include/", e_prefix_data_get());
/* use embryo include dir always */