summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@free.fr>2013-03-24 23:41:44 +0900
committerCedric Bail <cedric.bail@free.fr>2013-03-24 23:44:04 +0900
commit1737dab7ec9d4f66c4c1fa221d128f78041b1175 (patch)
treed781d9a2c1e697e1960a4271e1c5e679a334ddec
parenta1c24625dd47c431c69df15fba3d843b61707ee0 (diff)
edje: work also when not cross compiling.
-rw-r--r--data/Makefile.am11
-rw-r--r--m4/efl_binary.m414
-rw-r--r--src/Makefile_Edje.am10
-rw-r--r--src/Makefile_Edje_Helper.am13
-rw-r--r--src/examples/edje/Makefile.am10
-rw-r--r--src/examples/evas/Makefile.am10
6 files changed, 28 insertions, 40 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 3494457329..2c10028532 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -62,16 +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 = @edje_cc@ 65include ../src/Makefile_Edje_Helper.am
66EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
67EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
68EDJE_CC_FLAGS_VERBOSE_1 = -v
69EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -id $(srcdir) -fd $(srcdir)
70
71AM_V_EDJ = $(am__v_EDJ_@AM_V@)
72am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@)
73am__v_EDJ_0 = @echo " EDJ " $@;
74
75 66
76######################################################################## 67########################################################################
77# Emotion 68# Emotion
diff --git a/m4/efl_binary.m4 b/m4/efl_binary.m4
index 9165eef64f..79d6a193b2 100644
--- a/m4/efl_binary.m4
+++ b/m4/efl_binary.m4
@@ -7,19 +7,27 @@ AC_DEFUN([EFL_WITH_BIN],
7[ 7[
8 8
9m4_pushdef([DOWN], m4_translit([[$2]], [-A-Z], [_a-z]))dnl 9m4_pushdef([DOWN], m4_translit([[$2]], [-A-Z], [_a-z]))dnl
10 10m4_pushdef([UP], m4_translit([[$2]], [-a-z], [_A-Z]))dnl
11dnl configure option 11dnl configure option
12 12
13AC_ARG_WITH([bin-$2], 13AC_ARG_WITH([bin-$2],
14 [AC_HELP_STRING([--with-bin-$2=PATH], [specify a specific path to ]DOWN[ @<:@default=]DOWN[@:>@])], 14 [AC_HELP_STRING([--with-bin-$2=PATH], [specify a specific path to ]DOWN[ @<:@default=]DOWN[@:>@])],
15 [_efl_with_binary=${withval}], 15 [
16 [_efl_with_binary="EFL_RUN_IN_TREE=1 $(top_builddir)/bin/$1/]DOWN") 16 _efl_with_binary=${withval}
17 _efl_binary_define="yes"
18 ],
19 [
20 _efl_with_binary=""
21 _efl_binary_define="no"
22 ]
23)
17 24
18DOWN=${_efl_with_binary} 25DOWN=${_efl_with_binary}
19AC_MSG_NOTICE(DOWN[ set to ${_efl_with_binary}]) 26AC_MSG_NOTICE(DOWN[ set to ${_efl_with_binary}])
20 27
21with_binary_[]m4_defn([DOWN])=${_efl_with_binary} 28with_binary_[]m4_defn([DOWN])=${_efl_with_binary}
22 29
30AM_CONDITIONAL(HAVE_[]UP, [test "${_efl_binary_define}" = "xyes"])
23AC_SUBST(DOWN) 31AC_SUBST(DOWN)
24 32
25]) 33])
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 85143cb91b..718c710295 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -212,15 +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 = @edje_cc@ 215include Makefile_Edje_Helper.am
216EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
217EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
218EDJE_CC_FLAGS_VERBOSE_1 = -v
219EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -id $(srcdir) -fd $(srcdir)
220
221AM_V_EDJ = $(am__v_EDJ_@AM_V@)
222am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@)
223am__v_EDJ_0 = @echo " EDJ " $@;
224 216
225### Unit tests 217### Unit tests
226 218
diff --git a/src/Makefile_Edje_Helper.am b/src/Makefile_Edje_Helper.am
new file mode 100644
index 0000000000..cc7ee4ad4d
--- /dev/null
+++ b/src/Makefile_Edje_Helper.am
@@ -0,0 +1,13 @@
1if HAVE_EDJE_CC
2EDJE_CC = @edje_cc@
3else
4EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc
5endif
6EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
7EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
8EDJE_CC_FLAGS_VERBOSE_1 = -v
9EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -id $(srcdir) -fd $(srcdir)
10
11AM_V_EDJ = $(am__v_EDJ_@AM_V@)
12am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@)
13am__v_EDJ_0 = @echo " EDJ " $@;
diff --git a/src/examples/edje/Makefile.am b/src/examples/edje/Makefile.am
index 85c0409f61..f62e53499c 100644
--- a/src/examples/edje/Makefile.am
+++ b/src/examples/edje/Makefile.am
@@ -1,14 +1,6 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3EDJE_CC = @edje_cc@ 3include ../../Makefile_Edje_Helper.am
4EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
5EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
6EDJE_CC_FLAGS_VERBOSE_1 = -v
7EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -id $(srcdir) -fd $(srcdir)
8
9AM_V_EDJ = $(am__v_EDJ_@AM_V@)
10am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@)
11am__v_EDJ_0 = @echo " EDJ " $@;
12 4
13EDJE_CODEGEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_codegen 5EDJE_CODEGEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_codegen
14EDJE_CODEGEN_FLAGS = --prefix=codegen_example 6EDJE_CODEGEN_FLAGS = --prefix=codegen_example
diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am
index b7ef676e3d..55cf44e9a0 100644
--- a/src/examples/evas/Makefile.am
+++ b/src/examples/evas/Makefile.am
@@ -1,14 +1,6 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3EDJE_CC = @edje_cc@ 3include ../../Makefile_Edje_Helper.am
4EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
5EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
6EDJE_CC_FLAGS_VERBOSE_1 = -v
7EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -id $(srcdir) -fd $(srcdir)
8
9AM_V_EDJ = $(am__v_EDJ_@AM_V@)
10am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@)
11am__v_EDJ_0 = @echo " EDJ " $@;
12 4
13AM_CPPFLAGS = \ 5AM_CPPFLAGS = \
14-I$(top_srcdir)/src/lib/eina \ 6-I$(top_srcdir)/src/lib/eina \