edje: work also when not cross compiling.
This commit is contained in:
parent
a1c24625dd
commit
1737dab7ec
|
@ -62,16 +62,7 @@ edje/vim/syntax/edc.vim \
|
||||||
edje/vim/syntax/embryo.vim
|
edje/vim/syntax/embryo.vim
|
||||||
|
|
||||||
# Helper for people using EDJ
|
# Helper for people using EDJ
|
||||||
EDJE_CC = @edje_cc@
|
include ../src/Makefile_Edje_Helper.am
|
||||||
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 " $@;
|
|
||||||
|
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
# Emotion
|
# Emotion
|
||||||
|
|
|
@ -7,19 +7,27 @@ AC_DEFUN([EFL_WITH_BIN],
|
||||||
[
|
[
|
||||||
|
|
||||||
m4_pushdef([DOWN], m4_translit([[$2]], [-A-Z], [_a-z]))dnl
|
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
|
dnl configure option
|
||||||
|
|
||||||
AC_ARG_WITH([bin-$2],
|
AC_ARG_WITH([bin-$2],
|
||||||
[AC_HELP_STRING([--with-bin-$2=PATH], [specify a specific path to ]DOWN[ @<:@default=]DOWN[@:>@])],
|
[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}
|
DOWN=${_efl_with_binary}
|
||||||
AC_MSG_NOTICE(DOWN[ set to ${_efl_with_binary}])
|
AC_MSG_NOTICE(DOWN[ set to ${_efl_with_binary}])
|
||||||
|
|
||||||
with_binary_[]m4_defn([DOWN])=${_efl_with_binary}
|
with_binary_[]m4_defn([DOWN])=${_efl_with_binary}
|
||||||
|
|
||||||
|
AM_CONDITIONAL(HAVE_[]UP, [test "${_efl_binary_define}" = "xyes"])
|
||||||
AC_SUBST(DOWN)
|
AC_SUBST(DOWN)
|
||||||
|
|
||||||
])
|
])
|
||||||
|
|
|
@ -212,15 +212,7 @@ tests/edje/edje_tests_helpers.h
|
||||||
bin_SCRIPTS += bin/edje/edje_recc
|
bin_SCRIPTS += bin/edje/edje_recc
|
||||||
|
|
||||||
# Useful to other modules that generate EDJ
|
# Useful to other modules that generate EDJ
|
||||||
EDJE_CC = @edje_cc@
|
include Makefile_Edje_Helper.am
|
||||||
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 " $@;
|
|
||||||
|
|
||||||
### Unit tests
|
### Unit tests
|
||||||
|
|
||||||
|
|
|
@ -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 " $@;
|
|
@ -1,14 +1,6 @@
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
EDJE_CC = @edje_cc@
|
include ../../Makefile_Edje_Helper.am
|
||||||
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 " $@;
|
|
||||||
|
|
||||||
EDJE_CODEGEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_codegen
|
EDJE_CODEGEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_codegen
|
||||||
EDJE_CODEGEN_FLAGS = --prefix=codegen_example
|
EDJE_CODEGEN_FLAGS = --prefix=codegen_example
|
||||||
|
|
|
@ -1,14 +1,6 @@
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
||||||
EDJE_CC = @edje_cc@
|
include ../../Makefile_Edje_Helper.am
|
||||||
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 " $@;
|
|
||||||
|
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src/lib/eina \
|
-I$(top_srcdir)/src/lib/eina \
|
||||||
|
|
Loading…
Reference in New Issue