this is still in progress, mostly the multisense stuff is pending. it seems that when we merge ecore_audio in edje the libremix and similar are gone, at least from Edje, and will be in ecore_audio itself (or pulseaudio). Changes: * __UNUSED__ to EINA_UNUSED * binaries (epp, embryo_cc, edje_cc) now consider EFL_RUN_IN_TREE and will assume the binaries are still not installed, running from build tree location (needs more testing, maybe doesn't work with srcdir != builddir, still doesn't solve cross compile builds) SVN revision: 82139devs/devilhorns/wayland_egl
Gustavo Sverzut Barbieri
11 years ago
@ -1,12 +1,28 @@ |
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
EXTRA_DIST =
|
||||
|
||||
########################################################################
|
||||
# Embryo
|
||||
embryofilesdir = $(datadir)/embryo/include
|
||||
embryofiles_DATA = embryo/default.inc
|
||||
|
||||
########################################################################
|
||||
# Evas
|
||||
evasfilesdir = $(datadir)/evas
|
||||
evasfiles_DATA = evas/checkme
|
||||
|
||||
########################################################################
|
||||
# Eo
|
||||
eofilesdir = $(datadir)/eo
|
||||
eofiles_DATA = eo/eo_step.py
|
||||
|
||||
EXTRA_DIST = embryo/default.inc evas/checkme eo/eo_step.py
|
||||
########################################################################
|
||||
# Edje
|
||||
edjefilesdir = $(datadir)/edje/include
|
||||
edjefiles_DATA = edje/include/edje.inc
|
||||
|
||||
mimedir = $(datadir)/mime/packages
|
||||
mime_DATA = edje/edje.xml
|
||||
|
||||
EXTRA_DIST += edje/edc.vim edje/edje-mode.el
|
||||
|
||||
@ -1,8 +1,7 @@ |
||||
/** |
||||
* @page Examples Examples |
||||
* |
||||
* Here is a page with examples. |
||||
* @page edje_examples Examples |
||||
* |
||||
* Examples: |
||||
* @li @ref Example_Edje_Basics |
||||
* @li @ref tutorial_edje_nested |
||||
* @li @ref tutorial_edje_swallow |
||||
|
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 9.1 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 5.9 KiB |
|
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 6.1 KiB |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 6.8 KiB |
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
@ -0,0 +1,26 @@ |
||||
dnl EFL_CHECK_LUA_5_1(EFL) |
||||
dnl checks for lua5.1 in pkg-config (multiple names) and -llua directly |
||||
dnl will call EFL_ADD_LIBS() or EFL_DEPEND_PKG() as required. |
||||
dnl this is a strict call and will abort if lua is not found |
||||
AC_DEFUN([EFL_CHECK_LUA_5_1], |
||||
[dnl |
||||
requirement_lua="" |
||||
PKG_CHECK_EXISTS([lua >= 5.1.0], [requirement_lua="lua >= 5.1.0"], |
||||
[PKG_CHECK_EXISTS([lua5.1 >= 5.1.0], [requirement_lua="lua5.1 >= 5.1.0"], |
||||
[PKG_CHECK_EXISTS([lua-5.1 >= 5.1.0], [requirement_lua="lua-5.1 >= 5.1.0"], |
||||
[PKG_CHECK_EXISTS([lua51 >= 5.1.0], [requirement_lua="lua51 >= 5.1.0"])])])]) |
||||
|
||||
if test "x${requirement_lua}" = "x"; then |
||||
AC_MSG_CHECKING([whether lua_newstate() is in liblua]) |
||||
AC_CHECK_LIB([lua], [lua_newstate], |
||||
[have_lua="yes" |
||||
EFL_ADD_LIBS([$1], [-llua])], |
||||
[have_lua="no"]) |
||||
AC_MSG_RESULT([${have_lua}]) |
||||
if test "${have_lua}" = "no"; then |
||||
AC_MSG_ERROR([Missing lua 5.1 support]) |
||||
fi |
||||
else |
||||
EFL_DEPEND_PKG([$1], [LUA], [${requirement_lua}]) |
||||
fi |
||||
]) |
||||
@ -0,0 +1,255 @@ |
||||
|
||||
### Library |
||||
|
||||
lib_LTLIBRARIES += lib/edje/libedje.la |
||||
|
||||
EDJE_COMMON_CPPFLAGS = \ |
||||
-I$(top_srcdir) \ |
||||
-I$(top_srcdir)/src/lib/eina \ |
||||
-I$(top_builddir)/src/lib/eina \ |
||||
-I$(top_srcdir)/src/lib/eo \ |
||||
-I$(top_builddir)/src/lib/eo \ |
||||
-I$(top_srcdir)/src/lib/eet \ |
||||
-I$(top_builddir)/src/lib/eet \ |
||||
-I$(top_srcdir)/src/lib/evas \ |
||||
-I$(top_builddir)/src/lib/evas \ |
||||
-I$(top_srcdir)/src/lib/ecore \ |
||||
-I$(top_builddir)/src/lib/ecore \ |
||||
-I$(top_srcdir)/src/lib/ecore_evas \ |
||||
-I$(top_builddir)/src/lib/ecore_evas \ |
||||
-I$(top_srcdir)/src/lib/ecore_file \ |
||||
-I$(top_builddir)/src/lib/ecore_file \ |
||||
-I$(top_srcdir)/src/lib/ecore_input \ |
||||
-I$(top_builddir)/src/lib/ecore_input \ |
||||
-I$(top_srcdir)/src/lib/ecore_imf \ |
||||
-I$(top_builddir)/src/lib/ecore_imf \ |
||||
-I$(top_srcdir)/src/lib/embryo \ |
||||
-I$(top_builddir)/src/lib/embryo \ |
||||
-I$(top_srcdir)/src/lib/eio \ |
||||
-I$(top_builddir)/src/lib/eio \ |
||||
-I$(top_srcdir)/src/lib/ephysics \ |
||||
-I$(top_builddir)/src/lib/ephysics \ |
||||
-I$(top_srcdir)/src/lib/edje \ |
||||
-I$(top_builddir)/src/lib/edje \ |
||||
-DPACKAGE_BIN_DIR=\"$(bindir)\" \ |
||||
-DPACKAGE_LIB_DIR=\"$(libdir)\" \ |
||||
-DPACKAGE_DATA_DIR=\"$(datadir)/edje\" \ |
||||
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \ |
||||
-DEFL_EDJE_BUILD \ |
||||
@EFL_COV_CFLAGS@ \ |
||||
@EDJE_CFLAGS@ \ |
||||
@USE_EVIL_CFLAGS@ |
||||
|
||||
EDJE_COMMON_LIBS = \ |
||||
lib/eina/libeina.la \ |
||||
lib/eo/libeo.la \ |
||||
lib/eet/libeet.la \ |
||||
lib/evas/libevas.la \ |
||||
lib/ecore/libecore.la \ |
||||
lib/ecore_evas/libecore_evas.la \ |
||||
lib/ecore_file/libecore_file.la \ |
||||
lib/ecore_input/libecore_input.la \ |
||||
lib/ecore_imf/libecore_imf.la \ |
||||
lib/ecore_imf/libecore_imf_evas.la \ |
||||
lib/embryo/libembryo.la \ |
||||
lib/eio/libeio.la \ |
||||
@USE_EVIL_LIBS@ \ |
||||
@EFL_COV_LIBS@ |
||||
|
||||
if HAVE_EPHYSICS |
||||
EDJE_COMMON_LIBS += lib/ephysics/libephysics.la |
||||
endif |
||||
|
||||
installed_edjemainheadersdir = $(includedir)/edje-@VMAJ@ |
||||
dist_installed_edjemainheaders_DATA = \ |
||||
lib/edje/Edje.h \ |
||||
lib/edje/Edje_Edit.h |
||||
|
||||
lib_edje_libedje_la_SOURCES = \ |
||||
lib/edje/edje_private.h \ |
||||
lib/edje/edje_container.h \ |
||||
lib/edje/edje_convert.h \ |
||||
lib/edje/edje_box_layout.c \ |
||||
lib/edje/edje_cache.c \ |
||||
lib/edje/edje_calc.c \ |
||||
lib/edje/edje_callbacks.c \ |
||||
lib/edje/edje_container.c \ |
||||
lib/edje/edje_data.c \ |
||||
lib/edje/edje_edit.c \ |
||||
lib/edje/edje_embryo.c \ |
||||
lib/edje/edje_entry.c \ |
||||
lib/edje/edje_external.c \ |
||||
lib/edje/edje_load.c \ |
||||
lib/edje/edje_lua.c \ |
||||
lib/edje/edje_lua2.c \ |
||||
lib/edje/edje_lua_script_only.c \ |
||||
lib/edje/edje_main.c \ |
||||
lib/edje/edje_match.c \ |
||||
lib/edje/edje_message_queue.c \ |
||||
lib/edje/edje_misc.c \ |
||||
lib/edje/edje_module.c \ |
||||
lib/edje/edje_multisense.c \ |
||||
lib/edje/edje_program.c \ |
||||
lib/edje/edje_script_only.c \ |
||||
lib/edje/edje_smart.c \ |
||||
lib/edje/edje_text.c \ |
||||
lib/edje/edje_textblock_styles.c \ |
||||
lib/edje/edje_util.c \ |
||||
lib/edje/edje_var.c |
||||
|
||||
lib_edje_libedje_la_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) |
||||
lib_edje_libedje_la_LIBADD = $(EDJE_COMMON_LIBS) @EDJE_LIBS@ |
||||
lib_edje_libedje_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ |
||||
|
||||
if ENABLE_MULTISENSE |
||||
# edjemoduleXXXdir = $(libdir)/edje/modules/ |
||||
# edjemoduleXXX_LTLIBRARIES = modules/edje/XXX/module.la |
||||
# |
||||
# modules_edje_XXX_module_la_SOURCES = modules/edje/XXX/XXX.c |
||||
# modules_edje_XXX_module_la_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) @XXX_LIBS@ |
||||
# modules_edje_XXX_module_la_LIBADD = $(EDJE_COMMON_USER_LIBADD) |
||||
# modules_edje_XXX_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ |
||||
# modules_edje_XXX_module_la_LIBTOOLFLAGS = --tag=disable-static |
||||
|
||||
# edjemodulemultisensefactorydir = $(libdir)/edje/modules/multisense_factory/$(MODULE_ARCH) |
||||
# edjemodulemultisensefactory_LTLIBRARIES = modules/edje/multisense_factory/module.la |
||||
# |
||||
# modules_edje_multisense_factory_module_la_SOURCES = \ |
||||
# modules/edje/multisense_factory/multisense_factory.c |
||||
# modules_edje_multisense_factory_module_la_CPPFLAGS = \ |
||||
# $(EDJE_COMMON_CPPFLAGS) \ |
||||
# @REMIX_CFLAGS@ |
||||
# modules_edje_multisense_factory_module_la_LIBADD = \ |
||||
# $(EDJE_COMMON_USER_LIBADD) \ |
||||
# @REMIX_LIBS@ |
||||
# modules_edje_multisense_factory_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ |
||||
# modules_edje_multisense_factory_module_la_LIBTOOLFLAGS = --tag=disable-static |
||||
|
||||
endif |
||||
|
||||
### Binary |
||||
|
||||
EDJE_COMMON_USER_LDADD = \ |
||||
$(EDJE_COMMON_LIBS) \ |
||||
lib/edje/libedje.la \ |
||||
@EDJE_LDFLAGS@ |
||||
|
||||
bin_PROGRAMS += \ |
||||
bin/edje/edje_cc \ |
||||
bin/edje/edje_decc \ |
||||
bin/edje/edje_player \ |
||||
bin/edje/edje_inspector \ |
||||
bin/edje/edje_external_inspector \ |
||||
bin/edje/edje_codegen \ |
||||
bin/edje/edje_pick \ |
||||
bin/edje/edje_watch |
||||
|
||||
bin_edje_edje_cc_SOURCES = \ |
||||
bin/edje/edje_multisense_convert.h \ |
||||
bin/edje/edje_cc.h \ |
||||
bin/edje/edje_cc.c \ |
||||
bin/edje/edje_cc_out.c \ |
||||
bin/edje/edje_cc_parse.c \ |
||||
bin/edje/edje_cc_mem.c \ |
||||
bin/edje/edje_cc_handlers.c \ |
||||
bin/edje/edje_cc_sources.c \ |
||||
bin/edje/edje_multisense_convert.c |
||||
bin_edje_edje_cc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) |
||||
bin_edje_edje_cc_LDADD = $(EDJE_COMMON_USER_LDADD) |
||||
|
||||
bin_edje_edje_decc_SOURCES = \ |
||||
bin/edje/edje_decc.c \ |
||||
bin/edje/edje_decc.h \ |
||||
bin/edje/edje_cc_mem.c \ |
||||
bin/edje/edje_cc_sources.c |
||||
bin_edje_edje_decc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) |
||||
bin_edje_edje_decc_LDADD = $(EDJE_COMMON_USER_LDADD) |
||||
|
||||
bin_edje_edje_player_SOURCES = bin/edje/edje_player.c |
||||
bin_edje_edje_player_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) |
||||
bin_edje_edje_player_LDADD = $(EDJE_COMMON_USER_LDADD) |
||||
|
||||
bin_edje_edje_inspector_SOURCES = bin/edje/edje_inspector.c |
||||
bin_edje_edje_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) |
||||
bin_edje_edje_inspector_LDADD = $(EDJE_COMMON_USER_LDADD) |
||||
|
||||
bin_edje_edje_external_inspector_SOURCES = bin/edje/edje_external_inspector.c |
||||
bin_edje_edje_external_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) |
||||
bin_edje_edje_external_inspector_LDADD = $(EDJE_COMMON_USER_LDADD) |
||||
|
||||
bin_edje_edje_codegen_SOURCES = bin/edje/edje_codegen.c |
||||
bin_edje_edje_codegen_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) |
||||
bin_edje_edje_codegen_LDADD = $(EDJE_COMMON_USER_LDADD) |
||||
|
||||
bin_edje_edje_pick_SOURCES = bin/edje/edje_pick.c |
||||
bin_edje_edje_pick_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) |
||||
bin_edje_edje_pick_LDADD = $(EDJE_COMMON_USER_LDADD) |
||||
|
||||
bin_edje_edje_watch_SOURCES = bin/edje/edje_watch.c |
||||
bin_edje_edje_watch_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) |
||||
bin_edje_edje_watch_LDADD = $(EDJE_COMMON_USER_LDADD) |
||||
|
||||
# EPP (Edje's CPP) |
||||
eppdir = $(libdir)/edje/utils |
||||
epp_PROGRAMS = bin/edje/epp/epp |
||||
bin_edje_epp_epp_SOURCES = \ |
||||
bin/edje/epp/cpplib.h \ |
||||
bin/edje/epp/cpphash.h \ |
||||
bin/edje/epp/cppalloc.c \ |
||||
bin/edje/epp/cpperror.c \ |
||||
bin/edje/epp/cppexp.c \ |
||||
bin/edje/epp/cpphash.c \ |
||||
bin/edje/epp/cpplib.c \ |
||||
bin/edje/epp/cppmain.c |
||||
|
||||
# Note: eina is included only because of EINA_UNUSED |
||||
bin_edje_epp_epp_CPPFLAGS = \ |
||||
-I$(top_builddir) \ |
||||
-I$(top_srcdir)/src/lib/eina \ |
||||
-I$(top_builddir)/src/lib/eina \ |
||||
$(CWARNFLAGS) \ |
||||
-DHAVE_CONFIG_H \ |
||||
-DHAVE_STRERROR \ |
||||
-DFATAL_EXIT_CODE=1 \ |
||||
-DSUCCESS_EXIT_CODE=0 \ |
||||
-DGCC_INCLUDE_DIR=\"/usr/include\" \ |
||||
-DGPLUSPLUS_INCLUDE_DIR=\"/usr/include\" \ |
||||
-DTOOL_INCLUDE_DIR=\"/usr/bin\" \ |
||||
-DHOST_BITS_PER_LONG=32 \ |
||||
-DBITS_PER_UNIT=8 \ |
||||
-DHOST_BITS_PER_INT=32 \ |
||||
-DBITS_PER_WORD=16 \ |
||||
-DTARGET_BELL=7 \ |
||||
-DTARGET_BS=8 \ |
||||
-DTARGET_FF=12 \ |
||||
-DTARGET_NEWLINE=10 \ |
||||
-DTARGET_CR=13 \ |
||||
-DTARGET_TAB=9 \ |
||||
-DTARGET_VT=11 |
||||
|
||||
# TODO: why keep these? |
||||
EXTRA_DIST += \ |
||||
bin/edje/edje_convert.h \ |
||||
bin/edje/edje_convert.c \ |
||||
bin/edje/edje_data_convert.c |
||||
|
||||
### Unit tests |
||||
|
||||
if EFL_ENABLE_TESTS |
||||
|
||||
check_PROGRAMS += tests/edje/edje_suite |
||||
|
||||
tests_edje_edje_suite_SOURCES = \ |
||||
tests/edje/edje_suite.c \ |
||||
tests/edje/edje_test_edje.c \ |
||||
tests/edje/edje_suite.h |
||||
|
||||
tests_edje_edje_suite_CPPFLAGS = \ |
||||
$(EDJE_COMMON_CPPFLAGS) \ |
||||
@CHECK_CFLAGS@ |
||||
|
||||
tests_edje_edje_suite_LDADD = \ |
||||
$(EDJE_COMMON_USER_LDADD) \ |
||||
@CHECK_LIBS@ |
||||
|
||||
endif |
||||