diff --git a/configure.ac b/configure.ac index d1d3507eb8..5ed6526c4c 100644 --- a/configure.ac +++ b/configure.ac @@ -147,6 +147,7 @@ efl_deprecated_option="no" EFL_WITH_BIN([edje], [edje-cc]) EFL_WITH_BIN([eolian], [eolian-gen]) EFL_WITH_BIN([eolian_cxx], [eolian-cxx]) +EFL_WITH_BIN([elua], [elua-bin]) #### Default values @@ -4646,6 +4647,10 @@ if test "x${with_binary_eolian_cxx}" != "x"; then echo " eolian_cxx....: ${with_binary_eolian_cxx}" fi +if test "x${with_binary_elua_bin}" != "x"; then +echo " elua..........: ${with_binary_elua_bin}" +fi + echo " " echo "Installation....: make install (as root if needed, with 'su' or 'sudo')" echo " prefix........: $prefix" diff --git a/src/Makefile.am b/src/Makefile.am index 7ccd43157c..86ac7d7158 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,6 +10,7 @@ EOLIAN_FLAGS = \ -I$(srcdir)/lib/edje \ -I$(srcdir)/lib/ecore_audio +ELUA_GEN_FLAGS = DIST_SUBDIRS = SUBDIRS = diff --git a/src/Makefile_Elua.am b/src/Makefile_Elua.am index faafc8f6d3..16b63f69f4 100644 --- a/src/Makefile_Elua.am +++ b/src/Makefile_Elua.am @@ -19,6 +19,9 @@ bin_elua_elua_LDADD = @ELUA_LIBS@ endif bin_elua_elua_DEPENDENCIES = @ELUA_INTERNAL_LIBS@ +### Helper for other modules using Elua +include Makefile_Elua_Helper.am + eluamodulesdir = $(datadir)/elua/modules eluamodules_DATA = \ diff --git a/src/Makefile_Elua_Helper.am b/src/Makefile_Elua_Helper.am new file mode 100644 index 0000000000..6807f268f4 --- /dev/null +++ b/src/Makefile_Elua_Helper.am @@ -0,0 +1,18 @@ +if HAVE_ELUA_BIN +ELUA_GEN = @elua_bin@ :lualian +_ELUA_GEN_DEP = @elua_bin@ +else +ELUA_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/elua/elua{EXEEXT} :lualian +_ELUA_GEN_DEP = bin/elua/elua${EXEEXT} +endif + +AM_V_ELUA = $(am__v_ELUA_@AM_V@) +am__v_ELUA_ = $(am__v_ELUA_@AM_DEFAULT_V@) +am__v_ELUA_0 = @echo " ELUA " $@; + +SUFFIXES += .lua + +$(top_builddir)/src/bindings/%.lua: %.eo ${_ELUA_GEN_DEP} + $(AM_V_ELUA)$(ELUA_GEN) $(ELUA_GEN_FLAGS) -o $@ $< + +CLEANFILES += $(BUILT_SOURCES)