From 1737dab7ec9d4f66c4c1fa221d128f78041b1175 Mon Sep 17 00:00:00 2001 From: Cedric Bail Date: Sun, 24 Mar 2013 23:41:44 +0900 Subject: [PATCH] edje: work also when not cross compiling. --- data/Makefile.am | 11 +---------- m4/efl_binary.m4 | 14 +++++++++++--- src/Makefile_Edje.am | 10 +--------- src/Makefile_Edje_Helper.am | 13 +++++++++++++ src/examples/edje/Makefile.am | 10 +--------- src/examples/evas/Makefile.am | 10 +--------- 6 files changed, 28 insertions(+), 40 deletions(-) create mode 100644 src/Makefile_Edje_Helper.am 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 \ edje/vim/syntax/embryo.vim # Helper for people using EDJ -EDJE_CC = @edje_cc@ -EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@) -EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@) -EDJE_CC_FLAGS_VERBOSE_1 = -v -EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -id $(srcdir) -fd $(srcdir) - -AM_V_EDJ = $(am__v_EDJ_@AM_V@) -am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@) -am__v_EDJ_0 = @echo " EDJ " $@; - +include ../src/Makefile_Edje_Helper.am ######################################################################## # 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], [ m4_pushdef([DOWN], m4_translit([[$2]], [-A-Z], [_a-z]))dnl - +m4_pushdef([UP], m4_translit([[$2]], [-a-z], [_A-Z]))dnl dnl configure option AC_ARG_WITH([bin-$2], [AC_HELP_STRING([--with-bin-$2=PATH], [specify a specific path to ]DOWN[ @<:@default=]DOWN[@:>@])], - [_efl_with_binary=${withval}], - [_efl_with_binary="EFL_RUN_IN_TREE=1 $(top_builddir)/bin/$1/]DOWN") + [ + _efl_with_binary=${withval} + _efl_binary_define="yes" + ], + [ + _efl_with_binary="" + _efl_binary_define="no" + ] +) DOWN=${_efl_with_binary} AC_MSG_NOTICE(DOWN[ set to ${_efl_with_binary}]) with_binary_[]m4_defn([DOWN])=${_efl_with_binary} +AM_CONDITIONAL(HAVE_[]UP, [test "${_efl_binary_define}" = "xyes"]) AC_SUBST(DOWN) ]) 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 bin_SCRIPTS += bin/edje/edje_recc # Useful to other modules that generate EDJ -EDJE_CC = @edje_cc@ -EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@) -EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@) -EDJE_CC_FLAGS_VERBOSE_1 = -v -EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -id $(srcdir) -fd $(srcdir) - -AM_V_EDJ = $(am__v_EDJ_@AM_V@) -am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@) -am__v_EDJ_0 = @echo " EDJ " $@; +include Makefile_Edje_Helper.am ### Unit tests 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 @@ +if HAVE_EDJE_CC +EDJE_CC = @edje_cc@ +else +EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc +endif +EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@) +EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@) +EDJE_CC_FLAGS_VERBOSE_1 = -v +EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -id $(srcdir) -fd $(srcdir) + +AM_V_EDJ = $(am__v_EDJ_@AM_V@) +am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@) +am__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 @@ MAINTAINERCLEANFILES = Makefile.in -EDJE_CC = @edje_cc@ -EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@) -EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@) -EDJE_CC_FLAGS_VERBOSE_1 = -v -EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -id $(srcdir) -fd $(srcdir) - -AM_V_EDJ = $(am__v_EDJ_@AM_V@) -am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@) -am__v_EDJ_0 = @echo " EDJ " $@; +include ../../Makefile_Edje_Helper.am EDJE_CODEGEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_codegen EDJE_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 @@ MAINTAINERCLEANFILES = Makefile.in -EDJE_CC = @edje_cc@ -EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@) -EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@) -EDJE_CC_FLAGS_VERBOSE_1 = -v -EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE) -id $(srcdir) -fd $(srcdir) - -AM_V_EDJ = $(am__v_EDJ_@AM_V@) -am__v_EDJ_ = $(am__v_EDJ_@AM_DEFAULT_V@) -am__v_EDJ_0 = @echo " EDJ " $@; +include ../../Makefile_Edje_Helper.am AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \