summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--data/Makefile.am2
-rw-r--r--m4/efl_binary.m425
-rw-r--r--src/Makefile_Edje.am2
-rw-r--r--src/examples/edje/Makefile.am2
-rw-r--r--src/examples/evas/Makefile.am2
6 files changed, 31 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index f659706..4610cfc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,6 +97,8 @@ AC_ARG_WITH([dbus-services],
97 [dbusservicedir=$withval]) 97 [dbusservicedir=$withval])
98AC_SUBST(dbusservicedir) 98AC_SUBST(dbusservicedir)
99 99
100EFL_WITH_BIN([edje], [edje-cc])
101
100 102
101#### Default values 103#### Default values
102 104
diff --git a/data/Makefile.am b/data/Makefile.am
index 65205e4..3494457 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -62,7 +62,7 @@ edje/vim/syntax/edc.vim \
62edje/vim/syntax/embryo.vim 62edje/vim/syntax/embryo.vim
63 63
64# Helper for people using EDJ 64# Helper for people using EDJ
65EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc 65EDJE_CC = @edje_cc@
66EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@) 66EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
67EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@) 67EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
68EDJE_CC_FLAGS_VERBOSE_1 = -v 68EDJE_CC_FLAGS_VERBOSE_1 = -v
diff --git a/m4/efl_binary.m4 b/m4/efl_binary.m4
new file mode 100644
index 0000000..9165eef
--- /dev/null
+++ b/m4/efl_binary.m4
@@ -0,0 +1,25 @@
1
2
3dnl Usage: EFL_WITH_BIN(package, binary)
4dnl Call AC_SUBST(_binary) (_binary is the lowercase of binary, - being transformed into _ by default, or the value set by the user)
5
6AC_DEFUN([EFL_WITH_BIN],
7[
8
9m4_pushdef([DOWN], m4_translit([[$2]], [-A-Z], [_a-z]))dnl
10
11dnl configure option
12
13AC_ARG_WITH([bin-$2],
14 [AC_HELP_STRING([--with-bin-$2=PATH], [specify a specific path to ]DOWN[ @<:@default=]DOWN[@:>@])],
15 [_efl_with_binary=${withval}],
16 [_efl_with_binary="EFL_RUN_IN_TREE=1 $(top_builddir)/bin/$1/]DOWN")
17
18DOWN=${_efl_with_binary}
19AC_MSG_NOTICE(DOWN[ set to ${_efl_with_binary}])
20
21with_binary_[]m4_defn([DOWN])=${_efl_with_binary}
22
23AC_SUBST(DOWN)
24
25])
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 1908793..85143cb 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -212,7 +212,7 @@ tests/edje/edje_tests_helpers.h
212bin_SCRIPTS += bin/edje/edje_recc 212bin_SCRIPTS += bin/edje/edje_recc
213 213
214# Useful to other modules that generate EDJ 214# Useful to other modules that generate EDJ
215EDJE_CC = EFL_RUN_IN_TREE=1 $(builddir)/bin/edje/edje_cc${EXEEXT} 215EDJE_CC = @edje_cc@
216EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@) 216EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
217EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@) 217EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
218EDJE_CC_FLAGS_VERBOSE_1 = -v 218EDJE_CC_FLAGS_VERBOSE_1 = -v
diff --git a/src/examples/edje/Makefile.am b/src/examples/edje/Makefile.am
index a068d23..85c0409 100644
--- a/src/examples/edje/Makefile.am
+++ b/src/examples/edje/Makefile.am
@@ -1,6 +1,6 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc 3EDJE_CC = @edje_cc@
4EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@) 4EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
5EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@) 5EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
6EDJE_CC_FLAGS_VERBOSE_1 = -v 6EDJE_CC_FLAGS_VERBOSE_1 = -v
diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am
index 0a04858..b7ef676 100644
--- a/src/examples/evas/Makefile.am
+++ b/src/examples/evas/Makefile.am
@@ -1,6 +1,6 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc 3EDJE_CC = @edje_cc@
4EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@) 4EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
5EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@) 5EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
6EDJE_CC_FLAGS_VERBOSE_1 = -v 6EDJE_CC_FLAGS_VERBOSE_1 = -v