forked from enlightenment/efl
eolian gen2: move to eolian gen (as the old one is gone)
This commit is contained in:
parent
4cc17ae28a
commit
9553fd9640
|
@ -157,7 +157,6 @@ efl_deprecated_option="no"
|
||||||
EFL_WITH_BIN([eet], [eet-eet])
|
EFL_WITH_BIN([eet], [eet-eet])
|
||||||
EFL_WITH_BIN([edje], [edje-cc])
|
EFL_WITH_BIN([edje], [edje-cc])
|
||||||
EFL_WITH_BIN([eolian], [eolian-gen])
|
EFL_WITH_BIN([eolian], [eolian-gen])
|
||||||
EFL_WITH_BIN([eolian2], [eolian-gen2])
|
|
||||||
EFL_WITH_BIN([eolian_cxx], [eolian-cxx])
|
EFL_WITH_BIN([eolian_cxx], [eolian-cxx])
|
||||||
EFL_WITH_BIN([eolian-js], [eolian-js])
|
EFL_WITH_BIN([eolian-js], [eolian-js])
|
||||||
EFL_WITH_BIN_SUFFIX([elua], [elua], [_bin])
|
EFL_WITH_BIN_SUFFIX([elua], [elua], [_bin])
|
||||||
|
|
|
@ -45,23 +45,23 @@ lib_eolian_libeolian_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
|
||||||
### Binary
|
### Binary
|
||||||
|
|
||||||
bin_PROGRAMS += \
|
bin_PROGRAMS += \
|
||||||
bin/eolian2/eolian_gen2
|
bin/eolian/eolian_gen
|
||||||
|
|
||||||
bin_eolian2_eolian_gen2_SOURCES = \
|
bin_eolian_eolian_gen_SOURCES = \
|
||||||
bin/eolian2/main.c \
|
bin/eolian/main.c \
|
||||||
bin/eolian2/main.h \
|
bin/eolian/main.h \
|
||||||
bin/eolian2/types.c \
|
bin/eolian/types.c \
|
||||||
bin/eolian2/types.h \
|
bin/eolian/types.h \
|
||||||
bin/eolian2/headers.c \
|
bin/eolian/headers.c \
|
||||||
bin/eolian2/headers.h \
|
bin/eolian/headers.h \
|
||||||
bin/eolian2/sources.c \
|
bin/eolian/sources.c \
|
||||||
bin/eolian2/sources.h \
|
bin/eolian/sources.h \
|
||||||
bin/eolian2/docs.c \
|
bin/eolian/docs.c \
|
||||||
bin/eolian2/docs.h
|
bin/eolian/docs.h
|
||||||
|
|
||||||
bin_eolian2_eolian_gen2_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EOLIAN_CFLAGS@
|
bin_eolian_eolian_gen_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EOLIAN_CFLAGS@
|
||||||
bin_eolian2_eolian_gen2_LDADD = @USE_EOLIAN_LIBS@
|
bin_eolian_eolian_gen_LDADD = @USE_EOLIAN_LIBS@
|
||||||
bin_eolian2_eolian_gen2_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@
|
bin_eolian_eolian_gen_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@
|
||||||
|
|
||||||
### Helper for other modules using Eolian
|
### Helper for other modules using Eolian
|
||||||
include Makefile_Eolian_Helper.am
|
include Makefile_Eolian_Helper.am
|
||||||
|
|
|
@ -2,8 +2,8 @@ if HAVE_EOLIAN_GEN
|
||||||
EOLIAN_GEN = @eolian_gen@
|
EOLIAN_GEN = @eolian_gen@
|
||||||
_EOLIAN_GEN_DEP = @eolian_gen@
|
_EOLIAN_GEN_DEP = @eolian_gen@
|
||||||
else
|
else
|
||||||
EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian2/eolian_gen2${EXEEXT}
|
EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian/eolian_gen${EXEEXT}
|
||||||
_EOLIAN_GEN_DEP = bin/eolian2/eolian_gen2${EXEEXT}
|
_EOLIAN_GEN_DEP = bin/eolian/eolian_gen${EXEEXT}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include $(top_srcdir)/src/Makefile_Eolian_Files_Helper.am
|
include $(top_srcdir)/src/Makefile_Eolian_Files_Helper.am
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
/eolian_gen
|
|
@ -89,7 +89,7 @@ _eolian_gen_execute(const char *eo_filename, const char *options, const char *ou
|
||||||
if (getenv("EFL_RUN_IN_TREE"))
|
if (getenv("EFL_RUN_IN_TREE"))
|
||||||
{
|
{
|
||||||
snprintf(eolian_gen_path, sizeof(eolian_gen_path),
|
snprintf(eolian_gen_path, sizeof(eolian_gen_path),
|
||||||
"%s/src/bin/eolian2/eolian_gen2%s",
|
"%s/src/bin/eolian/eolian_gen%s",
|
||||||
PACKAGE_BUILD_DIR, EXEEXT);
|
PACKAGE_BUILD_DIR, EXEEXT);
|
||||||
}
|
}
|
||||||
if (eolian_gen_path[0] == '\0')
|
if (eolian_gen_path[0] == '\0')
|
||||||
|
|
Loading…
Reference in New Issue